Fix ELF rpath.

Install Japanese manual instead of English manual.
default locale is ja_JP.eucJP.

6 files changed, 113 insertions, 94 deletions

diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 9d1425368b9..e56b169a524 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/27 04:06:57 sakamoto Exp $
 #
 
 DISTNAME=	Canna35b2
@@ -31,6 +31,11 @@ post-patch:
 	@${SED}	-e 's|\(SUBDIRS = lib canna\).*\( misc\)|\1 cmd/forcpp cmd/kpdic dic/phono\2|' \
 		-e 's|\(SGSDIR = \).*|\1 lib canna dic/phono misc doc|'	\
 		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
+.for f in forcpp kpdic
+	@${MV} ${WRKSRC}/cmd/${f}/Imakefile ${WRKSRC}/cmd/${f}/Imakefile.orig
+	@${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \
+		> ${WRKSRC}/cmd/${f}/Imakefile
+.endfor
 
 do-configure:
 	@(cd ${WRKSRC}; ${XMKMF})
diff --git a/japanese/canna-lib/files/patch-sum b/japanese/canna-lib/files/patch-sum
index f5db48a80bc..5a3c9e5971b 100644
--- a/japanese/canna-lib/files/patch-sum
+++ b/japanese/canna-lib/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 
-MD5 (patch-aa) = 778bfbe6751d74b7b0940262374e4ee2
+MD5 (patch-aa) = 1880dca969f71e08cbf8ddf1f8bc9ee0
 MD5 (patch-ab) = 9c308687cdc856ed489713dc2e929014
 MD5 (patch-ac) = a1fd7fea8cc51e12336ab061a6e2a838
diff --git a/japanese/canna-lib/patches/patch-aa b/japanese/canna-lib/patches/patch-aa
index 73919da2f95..ed1c5bfa8f5 100644
--- a/japanese/canna-lib/patches/patch-aa
+++ b/japanese/canna-lib/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 
---- ./Canna.conf.orig	Thu Nov 28 19:27:01 1996
-+++ ./Canna.conf	Fri Jul 30 19:19:27 1999
-@@ -129,12 +129,12 @@
+--- 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.2 1999/08/27 04:06:58 sakamoto Exp $
   */
  
 -cannaBinDir = /usr/local/canna/bin
@@ -14,7 +15,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
 +cannaBinDir = ${PREFIX}/bin
 +cannaSrvDir = ${PREFIX}/sbin
 +cannaLibDir = ${PREFIX}/share/canna
-+cannaManDir = ${PREFIX}/man
++cannaManDir = ${PREFIX}/man/ja_JP.EUC
 +cannaIncDir = ${PREFIX}/include/canna
 +libCannaDir = ${PREFIX}/lib
  
@@ -22,8 +23,9 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
 +ErrDir  = ${CANNA_SPOOL}
  
  wcharDefinition = -DCANNA_WCHAR
-@@ -142,6 +142,6 @@
- JapaneseLocale = japanese
+ Wlib =
+-JapaneseLocale = japanese
++JapaneseLocale = ja_JP.eucJP
  
 -cannaOwner = bin
 -cannaGroup = bin
@@ -31,28 +33,33 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 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
-@@ -168,5 +168,5 @@
- 
- /* 日本語マニュアルを使わないのであればコメントアウト */
--#define JAPANESEMAN
-+/* #define JAPANESEMAN */
- 
- /* locale ディレクトリを持っている場合は以下を記述する */
-@@ -205,5 +205,5 @@
- #define UseInstalledLibCanna NO
+     と指定してください。また、FreeBSD を利用する場合は、
+@@ -201,10 +201,9 @@
+  * インストール済みの共有ライブラリを用いて Canna の
+  * コマンド類をリンクする時は、次を YES にしてくだい。
+  */
+-/* #define UseInstalledLibCanna YES */
+-#define UseInstalledLibCanna NO
++#define UseInstalledLibCanna YES
  
 -DicDir   = $(cannaLibDir)/dic
 +DicDir   = ${DICT_DIR}/canna
  
  #ifdef NeXT
-@@ -243,13 +243,13 @@
+ #define NO_X_ENV
+@@ -239,18 +238,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)
@@ -67,10 +74,16 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
  #endif
  # endif
 -       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
-+       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
++       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
-@@ -263,9 +263,9 @@
+ #if UseInstalledLibCanna
+@@ -259,14 +258,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)
@@ -80,6 +93,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
 +    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
  # endif
 -       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
-+       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
++       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
  #endif /* UseInstalledLibCanna */
  
+ /*
diff --git a/japanese/canna-lib/pkg/PLIST b/japanese/canna-lib/pkg/PLIST
index 70db1e1d0a1..92a0bea753d 100644
--- a/japanese/canna-lib/pkg/PLIST
+++ b/japanese/canna-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 @cwd ${DICT_DIR}
 @cwd ${DICT_DIR}
 canna/default.cbp
@@ -28,48 +28,48 @@ lib/libcanna.a
 lib/libcanna.so.1.0
 lib/libcanna16.a
 lib/libcanna16.so.1.0
-man/man3/RkCloseRoma.3
-man/man3/RkCvtEuc.3
-man/man3/RkCvtHan.3
-man/man3/RkCvtHira.3
-man/man3/RkCvtKana.3
-man/man3/RkCvtRoma.3
-man/man3/RkCvtZen.3
-man/man3/RkDefineDic.3
-man/man3/RkDeleteDic.3
-man/man3/RkEndBun.3
-man/man3/RkEnlarge.3
-man/man3/RkFinalize.3
-man/man3/RkGetDicList.3
-man/man3/RkGetKanji.3
-man/man3/RkGetLex.3
-man/man3/RkGetStat.3
-man/man3/RkGetYomi.3
-man/man3/RkGoto.3
-man/man3/RkInitialize.3
-man/man3/RkIntro.3
-man/man3/RkLeft.3
-man/man3/RkMapPhonogram.3
-man/man3/RkMapRoma.3
-man/man3/RkMountD.3
-man/man3/RkNext.3
-man/man3/RkNfer.3
-man/man3/RkOpenRoma.3
-man/man3/RkPrev.3
-man/man3/RkRemountDic.3
-man/man3/RkResize.3
-man/man3/RkRgnBun.3
-man/man3/RkRight.3
-man/man3/RkShorten.3
-man/man3/RkStoreYomi.3
-man/man3/RkUnmountDic.3
-man/man3/RkXfer.3
-man/man3/XKanjiControl.3
-man/man3/XLookupKanjiString.3
-man/man3/cannalib.3
-man/man3/jrKanjiControl.3
-man/man3/jrKanjiString.3
-man/man3/uilib.3
+man/ja_JP.EUC/man3/RkCloseRoma.3
+man/ja_JP.EUC/man3/RkCvtEuc.3
+man/ja_JP.EUC/man3/RkCvtHan.3
+man/ja_JP.EUC/man3/RkCvtHira.3
+man/ja_JP.EUC/man3/RkCvtKana.3
+man/ja_JP.EUC/man3/RkCvtRoma.3
+man/ja_JP.EUC/man3/RkCvtZen.3
+man/ja_JP.EUC/man3/RkDefineDic.3
+man/ja_JP.EUC/man3/RkDeleteDic.3
+man/ja_JP.EUC/man3/RkEndBun.3
+man/ja_JP.EUC/man3/RkEnlarge.3
+man/ja_JP.EUC/man3/RkFinalize.3
+man/ja_JP.EUC/man3/RkGetDicList.3
+man/ja_JP.EUC/man3/RkGetKanji.3
+man/ja_JP.EUC/man3/RkGetLex.3
+man/ja_JP.EUC/man3/RkGetStat.3
+man/ja_JP.EUC/man3/RkGetYomi.3
+man/ja_JP.EUC/man3/RkGoto.3
+man/ja_JP.EUC/man3/RkInitialize.3
+man/ja_JP.EUC/man3/RkIntro.3
+man/ja_JP.EUC/man3/RkLeft.3
+man/ja_JP.EUC/man3/RkMapPhonogram.3
+man/ja_JP.EUC/man3/RkMapRoma.3
+man/ja_JP.EUC/man3/RkMountD.3
+man/ja_JP.EUC/man3/RkNext.3
+man/ja_JP.EUC/man3/RkNfer.3
+man/ja_JP.EUC/man3/RkOpenRoma.3
+man/ja_JP.EUC/man3/RkPrev.3
+man/ja_JP.EUC/man3/RkRemountDic.3
+man/ja_JP.EUC/man3/RkResize.3
+man/ja_JP.EUC/man3/RkRgnBun.3
+man/ja_JP.EUC/man3/RkRight.3
+man/ja_JP.EUC/man3/RkShorten.3
+man/ja_JP.EUC/man3/RkStoreYomi.3
+man/ja_JP.EUC/man3/RkUnmountDic.3
+man/ja_JP.EUC/man3/RkXfer.3
+man/ja_JP.EUC/man3/XKanjiControl.3
+man/ja_JP.EUC/man3/XLookupKanjiString.3
+man/ja_JP.EUC/man3/cannalib.3
+man/ja_JP.EUC/man3/jrKanjiControl.3
+man/ja_JP.EUC/man3/jrKanjiString.3
+man/ja_JP.EUC/man3/uilib.3
 share/canna/default.canna
 share/canna/engine.cf
 share/canna/sample/1.1.canna
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 10cec20ec38..4c59fffdc00 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/02 04:57:21 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/27 04:06:58 sakamoto Exp $
 
 DISTNAME=	Canna35b2
 PKGNAME=	Canna-server-3.5b2
@@ -38,10 +38,10 @@ INSTALL_TARGET=	instserver instclient
 
 post-patch:
 	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-		@${SED} -e 's|\(SUBDIRS = .*\) misc\(.*\)|\1\2|' \
-			-e 's|\(SERVERDIR = .*\) dic/phono\(.*\)|\1\2|' \
-			-e 's|\(CLIENTDIR = .*\) dic/phono misc|\1|' \
-			${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
+	@${SED} -e 's|\(SUBDIRS = .*\) misc\(.*\)|\1\2|' \
+		-e 's|\(SERVERDIR = .*\) dic/phono\(.*\)|\1\2|' \
+		-e 's|\(CLIENTDIR = .*\) dic/phono misc|\1|' \
+		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
diff --git a/japanese/canna-server/pkg/PLIST b/japanese/canna-server/pkg/PLIST
index 51e63aa9615..27113665790 100644
--- a/japanese/canna-server/pkg/PLIST
+++ b/japanese/canna-server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/02 04:57:21 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/27 04:06:59 sakamoto Exp $
 @cwd ${DICT_DIR}
 @cwd ${DICT_DIR}
 canna/canna/bushu.cld
@@ -41,27 +41,27 @@ bin/mkromdic
 bin/splitword
 bin/wtoc
 etc/rc.d/canna.sh
-man/man1/addwords.1
-man/man1/cannacheck.1
-man/man1/cannakill.1
-man/man1/cannaserver.1
-man/man1/cannastat.1
-man/man1/catdic.1
-man/man1/cpdic.1
-man/man1/cshost.1
-man/man1/ctow.1
-man/man1/delwords.1
-man/man1/dicar.1
-man/man1/dpbindic.1
-man/man1/dpromdic.1
-man/man1/lsdic.1
-man/man1/mkbindic.1
-man/man1/mkdic.1
-man/man1/mkromdic.1
-man/man1/mvdic.1
-man/man1/rmdic.1
-man/man1/splitword.1
-man/man1/wtoc.1
+man/ja_JP.EUC/man1/addwords.1
+man/ja_JP.EUC/man1/cannacheck.1
+man/ja_JP.EUC/man1/cannakill.1
+man/ja_JP.EUC/man1/cannaserver.1
+man/ja_JP.EUC/man1/cannastat.1
+man/ja_JP.EUC/man1/catdic.1
+man/ja_JP.EUC/man1/cpdic.1
+man/ja_JP.EUC/man1/cshost.1
+man/ja_JP.EUC/man1/ctow.1
+man/ja_JP.EUC/man1/delwords.1
+man/ja_JP.EUC/man1/dicar.1
+man/ja_JP.EUC/man1/dpbindic.1
+man/ja_JP.EUC/man1/dpromdic.1
+man/ja_JP.EUC/man1/lsdic.1
+man/ja_JP.EUC/man1/mkbindic.1
+man/ja_JP.EUC/man1/mkdic.1
+man/ja_JP.EUC/man1/mkromdic.1
+man/ja_JP.EUC/man1/mvdic.1
+man/ja_JP.EUC/man1/rmdic.1
+man/ja_JP.EUC/man1/splitword.1
+man/ja_JP.EUC/man1/wtoc.1
 sbin/cannaserver
 @exec mkdir ${CANNA_SPOOL}
 @exec chown ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}