Tue May 20 18:53:17 2008 UTC ()
Honour PKGMANDIR


(tnn)
diff -r1.7 -r1.8 pkgsrc/inputmethod/canna/distinfo
diff -r1.2 -r1.3 pkgsrc/inputmethod/canna/patches/patch-aa
cvs diff -r1.7 -r1.8 pkgsrc/inputmethod/canna/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/canna/distinfo 2005/12/30 15:16:21 1.7
+++ pkgsrc/inputmethod/canna/distinfo 2008/05/20 18:53:17 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.7 2005/12/30 15:16:21 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2008/05/20 18:53:17 tnn Exp $
2 2
3SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168 3SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
4RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d 4RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
5Size (Canna36p4.tar.gz) = 1455672 bytes 5Size (Canna36p4.tar.gz) = 1455672 bytes
6SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40 6SHA1 (patch-aa) = 6bb6da1cc2a458ebbcfe09fe19a371d7e8aea7da
7SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9 7SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
8SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4 8SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
9SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c 9SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
10SHA1 (patch-ae) = 9e8de536052d76d8aeeab2d443dc42450ae53947 10SHA1 (patch-ae) = 9e8de536052d76d8aeeab2d443dc42450ae53947
11SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10 11SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
12SHA1 (patch-ag) = cb435e54334ead8dba6a9ac9f14368d69d6e3a7c 12SHA1 (patch-ag) = cb435e54334ead8dba6a9ac9f14368d69d6e3a7c
13SHA1 (patch-ah) = 5d2f01fa4810dafa7a83d02edaec36fc274173fe 13SHA1 (patch-ah) = 5d2f01fa4810dafa7a83d02edaec36fc274173fe
14SHA1 (patch-ai) = b44d683b2c1d489746f1174f8ae6d06ddca66a59 14SHA1 (patch-ai) = b44d683b2c1d489746f1174f8ae6d06ddca66a59
15SHA1 (patch-aj) = 30d19c8ef9c1129e5214cb9a8a1d8b2b636b0361 15SHA1 (patch-aj) = 30d19c8ef9c1129e5214cb9a8a1d8b2b636b0361
16SHA1 (patch-ak) = 18b408344b8b617142ced8804990e87b7ae27f56 16SHA1 (patch-ak) = 18b408344b8b617142ced8804990e87b7ae27f56
17SHA1 (patch-al) = f6025d6fb7a3247ef44b0a50ae13b67ef3dad2d9 17SHA1 (patch-al) = f6025d6fb7a3247ef44b0a50ae13b67ef3dad2d9
18SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f 18SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f
19SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823 19SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/canna/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/canna/patches/Attic/patch-aa 2003/07/31 13:04:40 1.2
+++ pkgsrc/inputmethod/canna/patches/Attic/patch-aa 2008/05/20 18:53:17 1.3
@@ -1,101 +1,110 @@ @@ -1,101 +1,110 @@
1$NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ 1$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $
2 2
3--- Canna.conf.orig Sat Jan 25 17:47:47 2003 3--- Canna.conf.orig 2003-09-22 12:27:12.000000000 +0200
4+++ Canna.conf 4+++ Canna.conf
5@@ -133,18 +133,18 @@ 5@@ -133,18 +133,18 @@
6 /* rootにならずにインストールする時はこれを定義して下さい */ 6 /* rootにならずにインストールする時はこれを定義して下さい */
7 /* #define InstallAsUser */ 7 /* #define InstallAsUser */
8 /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */ 8 /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
9-#define ObsoleteInstallDir 9-#define ObsoleteInstallDir
10+/* #define ObsoleteInstallDir */ 10+/* #define ObsoleteInstallDir */
11 #ifdef InstallAsUser 11 #ifdef InstallAsUser
12 # define DefCannaPrefix $(HOME)/canna 12 # define DefCannaPrefix $(HOME)/canna
13 # define DefErrDir $(cannaPrefix)/log 13 # define DefErrDir $(cannaPrefix)/log
14 # define DefLibCannaDir $(cannaExecPrefix)/lib 14 # define DefLibCannaDir $(cannaExecPrefix)/lib
15 #else  15 #else
16-# define DefCannaPrefix /usr/local/canna 16-# define DefCannaPrefix /usr/local/canna
17+# define DefCannaPrefix ${PREFIX} 17+# define DefCannaPrefix ${PREFIX}
18 # ifdef ObsoleteInstallDir 18 # ifdef ObsoleteInstallDir
19 # define DefErrDir /usr/spool/canna 19 # define DefErrDir /usr/spool/canna
20 # define DefLibCannaDir /usr/lib 20 # define DefLibCannaDir /usr/lib
21 # else 21 # else
22-# define DefErrDir /var/log 22-# define DefErrDir /var/log
23+# define DefErrDir ${CANNA_SPOOL} 23+# define DefErrDir ${CANNA_SPOOL}
24 # define DefLibCannaDir $(cannaExecPrefix)/lib 24 # define DefLibCannaDir $(cannaExecPrefix)/lib
25 # endif 25 # endif
26 #endif 26 #endif
27@@ -173,10 +173,10 @@ 27@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna
 28 XCOMM cannaLibDir = /var/db/canna
 29 cannaLibDir = DefCannaLibDir
 30 XCOMM cannaManDir = $(cannaPrefix)/share/man
 31-cannaManDir = $(cannaPrefix)/man
 32+cannaManDir = $(cannaPrefix)/$(PKGMANDIR)
 33 cannaIncDir = $(cannaPrefix)/include/canna
 34
 35 libCannaDir = DefLibCannaDir
 36@@ -173,10 +173,10 @@ ErrDir = DefErrDir
28 /* 次の3行は変更しないでください */ 37 /* 次の3行は変更しないでください */
29 wcharDefinition = -DCANNA_WCHAR 38 wcharDefinition = -DCANNA_WCHAR
30 Wlib = 39 Wlib =
31-JapaneseLocale = japanese 40-JapaneseLocale = japanese
32+JapaneseLocale = ja_JP.eucJP 41+JapaneseLocale = ja_JP.eucJP
33  42
34-cannaOwner = bin 43-cannaOwner = bin
35-cannaGroup = bin 44-cannaGroup = bin
36+cannaOwner = ${CANNA_USER} 45+cannaOwner = ${CANNA_USER}
37+cannaGroup = ${CANNA_GROUP} 46+cannaGroup = ${CANNA_GROUP}
38  47
39 #ifdef InstallAsUser 48 #ifdef InstallAsUser
40 cannaOwnerGroup = 49 cannaOwnerGroup =
41@@ -246,7 +246,7 @@ 50@@ -249,7 +249,7 @@ dontHaveRename = 0
42 * コマンド類をリンクする時は、次を YES にしてくだい。 51 * コマンド類をリンクする時は、次を YES にしてくだい。
43 */ 52 */
44 /* #define UseInstalledLibCanna YES */ 53 /* #define UseInstalledLibCanna YES */
45-#define UseInstalledLibCanna NO 54-#define UseInstalledLibCanna NO
46+#define UseInstalledLibCanna YES 55+#define UseInstalledLibCanna YES
47  56
48 DicDir = $(cannaLibDir)/dic 57 DicDir = $(cannaLibDir)/dic
49  58
50@@ -291,18 +291,18 @@ 59@@ -294,18 +294,18 @@ DicDir = $(cannaLibDir)/dic
51 DEPCANNALIB = $(libCannaDir)/libcanna.a 60 DEPCANNALIB = $(libCannaDir)/libcanna.a
52 #endif 61 #endif
53 # endif 62 # endif
54- CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) 63- CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
55+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) 64+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
56 #else /* ! UseInstalledLibCanna */ 65 #else /* ! UseInstalledLibCanna */
57 # if DoSharedLib 66 # if DoSharedLib
58- DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension) 67- DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
59+ DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension) 68+ DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
60 # else 69 # else
61 #ifdef __EMX__ 70 #ifdef __EMX__
62- DEPCANNALIB = $(CANNASRC)/canna.a 71- DEPCANNALIB = $(CANNASRC)/canna.a
63+ DEPCANNALIB = $(libCannaDir)/canna.a 72+ DEPCANNALIB = $(libCannaDir)/canna.a
64 #else 73 #else
65- DEPCANNALIB = $(CANNASRC)/libcanna.a 74- DEPCANNALIB = $(CANNASRC)/libcanna.a
66+ DEPCANNALIB = $(libCannaDir)/libcanna.a 75+ DEPCANNALIB = $(libCannaDir)/libcanna.a
67 #endif 76 #endif
68 # endif 77 # endif
69- CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB) 78- CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
70+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB) 79+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
71 #endif /* UseInstalledLibCanna */ 80 #endif /* UseInstalledLibCanna */
72  81
73 #if UseInstalledLibCanna 82 #if UseInstalledLibCanna
74@@ -311,14 +311,14 @@ 83@@ -314,14 +314,14 @@ DicDir = $(cannaLibDir)/dic
75 # else 84 # else
76 DEPCANNALIB16 = $(libCannaDir)/libcanna16.a 85 DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
77 # endif 86 # endif
78- CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) 87- CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
79+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) 88+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
80 #else /* ! UseInstalledLibCanna */ 89 #else /* ! UseInstalledLibCanna */
81 # if DoSharedLib 90 # if DoSharedLib
82- DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension) 91- DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
83+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension) 92+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
84 # else 93 # else
85- DEPCANNALIB16 = $(CANNASRC)/libcanna16.a 94- DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
86+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a 95+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
87 # endif 96 # endif
88- CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB) 97- CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
89+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB) 98+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
90 #endif /* UseInstalledLibCanna */ 99 #endif /* UseInstalledLibCanna */
91  100
92 /* 101 /*
93@@ -335,7 +335,7 @@ 102@@ -338,7 +338,7 @@ DicDir = $(cannaLibDir)/dic
94 SCRIPTS_DEFINES =  103 SCRIPTS_DEFINES =
95  104
96 #ifdef JAPANESEMAN 105 #ifdef JAPANESEMAN
97-JMNLOCALE = ja 106-JMNLOCALE = ja
98+JMNLOCALE = ja_JP.EUC 107+JMNLOCALE = ja_JP.EUC
99 #endif 108 #endif
100  109
101 /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */ 110 /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */