freebsd-ports/japanese/canuum/files/patch-aa

--- Canna.conf.orig	Wed Apr 12 22:15:03 1995
+++ Canna.conf	Fri Jan 22 13:48:26 1999
@@ -115,18 +115,18 @@
  */
 
-cannaBinDir = /usr/local/canna/bin
-cannaSrvDir = /usr/local/canna/bin
-cannaLibDir = /usr/local/canna/lib
-cannaManDir = /usr/local/canna/man
-cannaIncDir = /usr/local/canna/include/canna
-libCannaDir = /usr/lib
+cannaBinDir = ${PREFIX}/bin
+cannaSrvDir = ${PREFIX}/sbin
+cannaLibDir = ${PREFIX}/lib/canna
+cannaManDir = ${PREFIX}/man
+cannaIncDir = ${PREFIX}/include/canna
+libCannaDir = ${PREFIX}/lib
 
-ErrDir  = /usr/spool/canna
-LockDir = /usr/spool/canna/lock
+ErrDir  = /var/log
+LockDir = /var/run/canna
 
 wcharDefinition = -DCANNA_WCHAR
-Wlib =
-JapaneseLocale = japanese
+Wlib = -lxpg4
+JapaneseLocale = ja_JP.EUC
 
 cannaOwner = bin
 cannaGroup = bin
@@ -135,7 +135,7 @@
 
 pointerIntegerDef =
 
-cannaDsoRev = 1
+cannaDsoRev = 1.0
 sharedLibExtension = so.$(cannaDsoRev)
 
 /* <20>ʲ<EFBFBD><CAB2>Σ<EFBFBD><CEA3>Ĥ<EFBFBD> root <20>ˤʤ<CBA4><CAA4>ʤ<EFBFBD><CAA4>ǥ<EFBFBD><C7A5>󥹥ȡ<F3A5B9A5><C8A1>뤹<EFBFBD><EBA4B9><EFBFBD>ΤǤ<CEA4><C7A4><EFBFBD><EFBFBD><EFBFBD> echo <20><>
@@ -148,7 +148,7 @@
 #define JAPANESEMAN
 
 /* locale <20>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>äƤ<C3A4><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰʲ<CFB0><CAB2>򵭽Ҥ<F2B5ADBD><D2A4><EFBFBD> */
-/* #define LOCALE_DIR /usr/lib/locale */
+#define LOCALE_DIR /usr/share/locale
 
 /* <20><><EFBFBD>󥸥󥹥<F3A5B8A5><F3A5B9A5>å<EFBFBD><C3A5><EFBFBD>ǽ<EFBFBD><C7BD><EFBFBD>Ȥ<EFBFBD><C8A4>ΤǤ<CEA4><C7A4><EFBFBD><EFBFBD>Х<EFBFBD><D0A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>Ϥ<EFBFBD><CFA4><EFBFBD> */
 /* #define engineSwitch */
@@ -174,11 +174,11 @@
  * <20><><EFBFBD>󥹥ȡ<F3A5B9A5><C8A1><EFBFBD><EFBFBD>Ѥߤζ<DFA4>ͭ<EFBFBD>饤<EFBFBD>֥<EFBFBD><D6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD> Canna <20><>
  * <20><><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1><EFBFBD><EFBFBD><EFBFBD> YES <20>ˤ<EFBFBD><CBA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
  */
-/* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
+/*#define UseInstalledLibCanna NO */
 
 DicDir   = $(cannaLibDir)/dic
-LockFile = .CANNALOCK
+LockFile = Canna.pid
 
 #ifdef NeXT
 #define NO_X_ENV
@@ -311,13 +311,13 @@
 #endif
 #define InstallLibManPageAliases(file,destdir,aliases)			@@\
 install.man::								@@\
-        @(TMP=/tmp/tmp.$$$$; \						@@\
-        $(RM) $${TMP}; \						@@\
-        echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
-        for i in aliases; do (set -x; \					@@\
-        $(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
-        done; \								@@\
-        $(RM) $${TMP})
+	@(TMP=/tmp/tmp.$$$$; \						@@\
+	$(RM) $${TMP}; \						@@\
+	echo .so `basename destdir/man$(LIBMANSUFFIX)`/file.$(LIBMANSUFFIX) > $${TMP}; \	@@\
+	for i in aliases; do (set -x; \					@@\
+	$(INSTALL) -c $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/man$(LIBMANSUFFIX)/$$i.$(LIBMANSUFFIX)); \ @@\
+	done; \								@@\
+	$(RM) $${TMP})
 #ifndef MakeDirectoriesLong
 #define MakeDirectoriesLong(step,dirs,owner,group)			@@\
 step::									@@\