diff options
| -rw-r--r-- | japanese/canuum/files/patch-sum | 4 | ||||
| -rw-r--r-- | japanese/canuum/patches/patch-aa | 24 |
2 files changed, 10 insertions, 18 deletions
diff --git a/japanese/canuum/files/patch-sum b/japanese/canuum/files/patch-sum index 2cf82e27752..852abd16200 100644 --- a/japanese/canuum/files/patch-sum +++ b/japanese/canuum/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 1999/09/07 18:57:10 hubertf Exp $ +$NetBSD: patch-sum,v 1.3 1999/12/08 09:16:26 rh Exp $ -MD5 (patch-aa) = 174951816057bc4b99f51eff8988d8b9 +MD5 (patch-aa) = bbe4250e8861d59df765e9ce128d3be3 MD5 (patch-ac) = 01c5c1cfb063dfaf4d6f31d28b734490 MD5 (patch-ae) = 89d71a62de97ec53f6d8dc2af0ab6b9d MD5 (patch-af) = 9cb91bea1ee13f95adee8bfcd4627e66 diff --git a/japanese/canuum/patches/patch-aa b/japanese/canuum/patches/patch-aa index 59ee04dd7a6..742cd8b7d3e 100644 --- a/japanese/canuum/patches/patch-aa +++ b/japanese/canuum/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ +$NetBSD: patch-aa,v 1.2 1999/12/08 09:16:26 rh Exp $ ---- Canna.conf.orig Thu Nov 28 19:27:01 1996 -+++ Canna.conf Fri Aug 27 10:04:28 1999 -@@ -128,27 +128,27 @@ - * $Id: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ +--- Canna.conf.orig Thu Nov 28 11:27:01 1996 ++++ Canna.conf Wed Dec 8 10:14:38 1999 +@@ -129,19 +129,19 @@ */ -cannaBinDir = /usr/local/canna/bin @@ -33,16 +32,14 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ +cannaGroup = ${CANNAGROUP} cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) - +@@ -149,5 +149,5 @@ pointerIntegerDef = -cannaDsoRev = 1 +cannaDsoRev = 1.0 /* SunOS 4.x をお使いの方で shared object を利用する場合には cannaDsoRev = 1.1 - と指定してください。また、FreeBSD を利用する場合は、 -@@ -201,10 +201,9 @@ - * インストール済みの共有ライブラリを用いて Canna の +@@ -202,8 +202,7 @@ * コマンド類をリンクする時は、次を YES にしてくだい。 */ -/* #define UseInstalledLibCanna YES */ @@ -53,9 +50,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ +DicDir = ${DICT_DIR}/canna #ifdef NeXT - #define NO_X_ENV -@@ -239,18 +238,18 @@ - DEPCANNALIB = $(libCannaDir)/libcanna.a +@@ -240,16 +239,16 @@ #endif # endif - CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) @@ -77,9 +72,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ + CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) #endif /* UseInstalledLibCanna */ - #if UseInstalledLibCanna -@@ -259,14 +258,14 @@ - # else +@@ -260,12 +259,12 @@ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a # endif - CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) @@ -96,4 +89,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $ + CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) #endif /* UseInstalledLibCanna */ - /* |