diff options
| -rw-r--r-- | inputmethod/canna/distinfo | 4 | ||||
| -rw-r--r-- | inputmethod/canna/patches/patch-aa | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo index 71798c52f49..1d115efbd5d 100644 --- a/inputmethod/canna/distinfo +++ b/inputmethod/canna/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2005/12/30 15:16:21 joerg Exp $ +$NetBSD: distinfo,v 1.8 2008/05/20 18:53:17 tnn Exp $ SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168 RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d Size (Canna36p4.tar.gz) = 1455672 bytes -SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40 +SHA1 (patch-aa) = 6bb6da1cc2a458ebbcfe09fe19a371d7e8aea7da SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9 SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4 SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c diff --git a/inputmethod/canna/patches/patch-aa b/inputmethod/canna/patches/patch-aa index 5b487bf621c..c4689b93a53 100644 --- a/inputmethod/canna/patches/patch-aa +++ b/inputmethod/canna/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ +$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $ ---- Canna.conf.orig Sat Jan 25 17:47:47 2003 +--- Canna.conf.orig 2003-09-22 12:27:12.000000000 +0200 +++ Canna.conf @@ -133,18 +133,18 @@ /* rootにならずにインストールする時はこれを定義して下さい */ @@ -24,7 +24,16 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ # define DefLibCannaDir $(cannaExecPrefix)/lib # endif #endif -@@ -173,10 +173,10 @@ +@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna + XCOMM cannaLibDir = /var/db/canna + cannaLibDir = DefCannaLibDir + XCOMM cannaManDir = $(cannaPrefix)/share/man +-cannaManDir = $(cannaPrefix)/man ++cannaManDir = $(cannaPrefix)/$(PKGMANDIR) + cannaIncDir = $(cannaPrefix)/include/canna + + libCannaDir = DefLibCannaDir +@@ -173,10 +173,10 @@ ErrDir = DefErrDir /* 次の3行は変更しないでください */ wcharDefinition = -DCANNA_WCHAR Wlib = @@ -38,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ #ifdef InstallAsUser cannaOwnerGroup = -@@ -246,7 +246,7 @@ +@@ -249,7 +249,7 @@ dontHaveRename = 0 * コマンド類をリンクする時は、次を YES にしてくだい。 */ /* #define UseInstalledLibCanna YES */ @@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ DicDir = $(cannaLibDir)/dic -@@ -291,18 +291,18 @@ +@@ -294,18 +294,18 @@ DicDir = $(cannaLibDir)/dic DEPCANNALIB = $(libCannaDir)/libcanna.a #endif # endif @@ -71,7 +80,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ #endif /* UseInstalledLibCanna */ #if UseInstalledLibCanna -@@ -311,14 +311,14 @@ +@@ -314,14 +314,14 @@ DicDir = $(cannaLibDir)/dic # else DEPCANNALIB16 = $(libCannaDir)/libcanna16.a # endif @@ -90,7 +99,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $ #endif /* UseInstalledLibCanna */ /* -@@ -335,7 +335,7 @@ +@@ -338,7 +338,7 @@ DicDir = $(cannaLibDir)/dic SCRIPTS_DEFINES = #ifdef JAPANESEMAN |