diff options
Diffstat (limited to 'inputmethod/canuum/patches/patch-aa')
| -rw-r--r-- | inputmethod/canuum/patches/patch-aa | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/inputmethod/canuum/patches/patch-aa b/inputmethod/canuum/patches/patch-aa index 3e96615edfd..8c133748d21 100644 --- a/inputmethod/canuum/patches/patch-aa +++ b/inputmethod/canuum/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 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 @@ - */ +--- Canna.conf- Fri Dec 1 00:31:14 2000 ++++ Canna.conf Fri Dec 1 00:31:36 2000 +@@ -130,10 +130,14 @@ -cannaBinDir = /usr/local/canna/bin -cannaSrvDir = /usr/local/canna/bin @@ -11,17 +10,22 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $ -cannaManDir = /usr/local/canna/man -cannaIncDir = /usr/local/canna/include/canna -libCannaDir = /usr/lib +- +-ErrDir = /usr/spool/canna +cannaBinDir = ${PREFIX}/bin +cannaSrvDir = ${PREFIX}/sbin +cannaLibDir = ${PREFIX}/share/canna +cannaManDir = ${PREFIX}/man/ja_JP.EUC +cannaIncDir = ${PREFIX}/include/canna +libCannaDir = ${PREFIX}/lib - --ErrDir = /usr/spool/canna ++ +ErrDir = ${CANNA_SPOOL} ++ ++/* INET6 related stuff */ ++INET6_DEFS = ${INET6} ++INET6_LIBS = #-L/usr/local/v6/lib -linet6 - wcharDefinition = -DCANNA_WCHAR +@@ -141,6 +145,6 @@ Wlib = -JapaneseLocale = japanese +JapaneseLocale = ja_JP.eucJP @@ -31,27 +35,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $ +cannaOwner = ${CANNAOWNER} +cannaGroup = ${CANNAGROUP} - cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) -@@ -149,5 +149,5 @@ - pointerIntegerDef = +@@ -150,3 +154,3 @@ -cannaDsoRev = 1 +cannaDsoRev = 1.0 /* SunOS 4.x をお使いの方で shared object を利用する場合には - cannaDsoRev = 1.1 -@@ -202,8 +202,7 @@ - * コマンド類をリンクする時は、次を YES にしてくだい。 +@@ -203,6 +207,5 @@ */ -/* #define UseInstalledLibCanna YES */ -#define UseInstalledLibCanna NO +#define UseInstalledLibCanna YES --DicDir = $(cannaLibDir)/dic -+DicDir = ${DICT_DIR}/canna + DicDir = $(cannaLibDir)/dic - #ifdef NeXT -@@ -240,16 +239,16 @@ - #endif +@@ -241,14 +244,14 @@ # endif - CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) + CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) @@ -71,9 +68,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $ - CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB) + CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) #endif /* UseInstalledLibCanna */ - -@@ -260,12 +259,12 @@ - DEPCANNALIB16 = $(libCannaDir)/libcanna16.a +@@ -261,10 +264,10 @@ # endif - CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) + CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) @@ -88,4 +83,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $ - CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB) + CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) #endif /* UseInstalledLibCanna */ - |