[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

textproc/chasen-base (chasen-base-2.3.3nb1)



>                                            千葉市中央区長洲
>                                                    藤原  誠
とてもささいなことではあるのですが、ちょっと不思議なことがあ
りまして、何か御存知の方がいらっしゃったら、教えて下さい。

Mac OS X (10.4.2) の上で bootstrap を使って chasen-base を作る
時のことです。
 chasen-2.3.3.20031024.patch
を当てようとすると、ChangeLog で rej すると言うのです。
┌─────────────────────────────────
│harry:/usr/pkgsrc/textproc/chasen-base makoto$ bmake clean && bmake
│===> Cleaning for chasen-base-2.3.3nb1
│===> *** No /usr/pkgsrc/distfiles/pkg-vulnerabilities file found,
│===> *** skipping vulnerability checks. To fix, install
│===> *** the pkgsrc/security/audit-packages package and run
│===> *** '/usr/pkg/sbin/download-vulnerability-list'.
│=> Checksum SHA1 OK for chasen-2.3.3.tar.gz.
│=> Checksum RMD160 OK for chasen-2.3.3.tar.gz.
│=> Checksum SHA1 OK for chasen-2.3.3.20030821.patch.
│=> Checksum RMD160 OK for chasen-2.3.3.20030821.patch.
│=> Checksum SHA1 OK for chasen-2.3.3.20030822.patch.
│=> Checksum RMD160 OK for chasen-2.3.3.20030822.patch.
│=> Checksum SHA1 OK for chasen-2.3.3.20031024.patch.
│=> Checksum RMD160 OK for chasen-2.3.3.20031024.patch.
│===> Extracting for chasen-base-2.3.3nb1
│===> Required installed package darts>=0.2: darts-0.2 found
│===> Required installed package libtool-base>=1.5.18nb1: libtool-base-1.5.18nb4 found
│===> Patching for chasen-base-2.3.3nb1
│===> Applying distribution patches for chasen-base-2.3.3nb1
│1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej
│Patch chasen-2.3.3.20031024.patch failed
│*** Error code 1
│
│Stop.
│bmake: stopped in /usr/pkgsrc/textproc/chasen-base
│*** Error code 1
└─────────────────────────────────
確かに良く見ると、reject する方が自然の気がします。そこで、
distfiles/chasen-2.3.3.20030828.patch を仮に作って
distinfo を直しておくと通過します。

ところが、例えば NetBSD/macppc では、そのようなことは言われず、
元のままで何事もなく通過してしまいます。

OS X: 10.4.2
harry:/usr/pkgsrc/textproc/chasen-base makoto$ patch --version
patch 2.5.8

NetBSD/macppc
ttypa:makoto@mini  21:05:43/050813(~)> patch --version
Patch version 2.0, patch level 12u8

さて ... ? (どう直すのでしょう)
---
(藤原)
Index: Makefile
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/textproc/chasen-base/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	13 Feb 2005 16:41:59 -0000	1.10
+++ Makefile	13 Aug 2005 11:46:38 -0000
@@ -9,6 +9,7 @@
 
 PATCHFILES=		chasen-2.3.3.20030821.patch \
 			chasen-2.3.3.20030822.patch \
+			chasen-2.3.3.20030828.patch \
 			chasen-2.3.3.20031024.patch
 PATCH_SITES=		${MASTER_SITES}
 
Index: distinfo
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/textproc/chasen-base/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	24 Feb 2005 14:48:40 -0000	1.6
+++ distinfo	13 Aug 2005 11:48:58 -0000
@@ -9,6 +9,9 @@
 SHA1 (chasen-2.3.3.20030822.patch) = 0728884dcdf6983a3e32774111e7996a43008722
 RMD160 (chasen-2.3.3.20030822.patch) = 30c2ff84ad8b68271fcd7656d9972e7392a806f5
 Size (chasen-2.3.3.20030822.patch) = 2007 bytes
+SHA1 (chasen-2.3.3.20030828.patch) = 9053a4f6ee966e0001120c43b8edf1da10ecf602
+RMD160 (chasen-2.3.3.20030828.patch) = 69c22e054653f0b60a89c3c0b133b687e174a83c
+Size (chasen-2.3.3.20030828.patch) = 343 bytes
 SHA1 (chasen-2.3.3.20031024.patch) = e53446124c219a883d39f627b243c1ebc241dfd8
 RMD160 (chasen-2.3.3.20031024.patch) = 4e22c03a8b5299957fd39ae12569aeb9bcf1d127
 Size (chasen-2.3.3.20031024.patch) = 1095 bytes

chasen-2.3.3.20030828.patch