1 files changed, 0 insertions, 113 deletions
diff --git a/inputmethod/canuum/patches/patch-aa b/inputmethod/canuum/patches/patch-aa
deleted file mode 100644
index 637b3942281..00000000000
--- a/inputmethod/canuum/patches/patch-aa
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/04/19 03:51:26 uebayasi Exp $
---- Canna.conf.orig	Thu Dec  5 22:25:03 2002
-+++ Canna.conf	Thu Dec  5 22:51:29 2002
-@@ -132,11 +132,11 @@
- 
- /* rootにならずにインストールする時はこれを定義して下さい */
- /* #define InstallAsUser */
--cannaPrefix = /usr/local/canna
-+cannaPrefix = ${PREFIX}
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
--cannaSrvDir = $(cannaExecPrefix)/bin
--cannaLibDir = $(cannaPrefix)/lib
-+cannaSrvDir = $(cannaExecPrefix)/sbin
-+cannaLibDir = $(cannaPrefix)/share/canna
- cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
- 
-@@ -144,17 +144,19 @@
- libCannaDir = $(cannaExecPrefix)/lib
- ErrDir  = $(cannaExecPrefix)/log
- #else
--libCannaDir = /usr/lib
--ErrDir  = /usr/spool/canna
-+libCannaDir = $(cannaPrefix)/lib
-+ErrDir  = ${CANNA_SPOOL}
- #endif
- 
-+INET6_DEFS = ${INET6}
-+
- /* 次の3行は変更しないでください */
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
--JapaneseLocale = japanese
-+JapaneseLocale = ja_JP.eucJP
- 
--cannaOwner = bin
--cannaGroup = bin
-+cannaOwner = ${CANNAOWNER}
-+cannaGroup = ${CANNAGROUP}
- 
- #ifdef InstallAsUser
- cannaOwnerGroup =
-@@ -164,7 +166,7 @@
- 
- pointerIntegerDef =
- 
--cannaDsoRev = 1
-+cannaDsoRev = 1.0
-     /* SunOS 4.x をお使いの方で shared object を利用する場合には
-             cannaDsoRev = 1.1
-     と指定してください。また、FreeBSD を利用する場合は、
-@@ -229,7 +231,7 @@
-  * コマンド類をリンクする時は、次を YES にしてくだい。
-  */
- /* #define UseInstalledLibCanna YES */
--#define UseInstalledLibCanna NO
-+#define UseInstalledLibCanna YES
- 
- DicDir   = $(cannaLibDir)/dic
- 
-@@ -274,18 +276,18 @@
-     DEPCANNALIB = $(libCannaDir)/libcanna.a
- #endif
- # endif
--       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
-+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
- #else /* ! UseInstalledLibCanna */
- # if DoSharedLib
--    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
-+    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
- # else
- #ifdef __EMX__
--    DEPCANNALIB = $(CANNASRC)/canna.a
-+    DEPCANNALIB = $(libCannaDir)/canna.a
- #else
--    DEPCANNALIB = $(CANNASRC)/libcanna.a
-+    DEPCANNALIB = $(libCannaDir)/libcanna.a
- #endif
- # endif
--       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
-+       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
- #endif /* UseInstalledLibCanna */
- 
- #if UseInstalledLibCanna
-@@ -294,14 +296,14 @@
- # else
-     DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
- # endif
--       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
-+       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
- #else /* ! UseInstalledLibCanna */
- # if DoSharedLib
--    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
-+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
- # else
--    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
-+    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
- # endif
--       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
-+       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
- #endif /* UseInstalledLibCanna */
- 
- /*
-@@ -318,7 +320,7 @@
-      SCRIPTS_DEFINES = 
- 
- #ifdef JAPANESEMAN
--JMNLOCALE = ja
-+JMNLOCALE = ja_JP.EUC
- #endif
- 
- /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */