s/ja_JP/WNN_LANG/

Fix default LIBDIR(${LOCALBASE}/share/wnn) in wnn/config.h.

8 files changed, 82 insertions, 78 deletions

diff --git a/misc/freewnn-common/Makefile b/misc/freewnn-common/Makefile
index 95320675906..79583f363c9 100644
--- a/misc/freewnn-common/Makefile
+++ b/misc/freewnn-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/08/27 04:36:32 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 1999/09/03 04:24:08 sakamoto Exp $
 #
 
 DISTNAME=	FreeWnn-1.10
@@ -24,7 +24,7 @@ WNNOWNER?=	wnn
 DICT_DIR?=	/var/dict
 SEDSCRIPT+=	-e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|'
 SEDSCRIPT+=	-e 's|([CK]*WNNJLIBSRC)/\(lib[ck]*wnn.a\)|{PREFIX}/lib/\1|'
-SEDSCRIPT+=	-e 's|\([JCKT]*WNNDICDIR = \).*|\1${DICT_DIR}/wnn/ja_JP|'
+SEDSCRIPT+=	-e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${DICT_DIR}/wnn/$$(\1WNNLANG)|'
 INSTALL_FILE=	${WRKDIR}/INSTALL
 INSTALL_SRC=	${FILESDIR}/INSTALL
 PLIST_TMP=	${PKGDIR}/PLIST
@@ -64,6 +64,10 @@ post-patch:
 		${SED} -e 's|\(MANPATH = .*\)|\1/ja_JP.EUC|'		\
 			$$file.orig2 > $$file;				\
 	done
+	@(cd ${WRKSRC}/Wnn/include;				\
+		${MV} config.h config.h.orig;			\
+		${SED} -e 's|^\(\#define	LIBDIR		"\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \
+			config.h.orig > config.h)
 
 .if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
 post-build:
@@ -77,6 +81,7 @@ post-build:
 	@${ECHO} "fi" >> ${STARTUP_SCRIPT_SRC}
 	@${SED} -e 's|$${DICT_DIR}|${DICT_DIR}|'		\
 		-e 's|$${PREFIX}|${PREFIX}|'			\
+		-e 's|$${WNN_LANG}|${WNN_LANG}|'		\
 		${PLIST_TMP} > ${PLIST_SRC}
 	@${ECHO} ${STARTUP_SCRIPT} >> ${PLIST_SRC}
 
@@ -84,6 +89,8 @@ pre-install:
 	@${SETENV} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@${LN} -s ${DICT_DIR}/wnn/${WNN_LANG} \
+		${PREFIX}/share/wnn/${WNN_LANG}/dic
 	@${INSTALL_SCRIPT} ${STARTUP_SCRIPT_SRC} ${PREFIX}/${STARTUP_SCRIPT}
 .endif
 
diff --git a/misc/freewnn-common/files/patch-sum b/misc/freewnn-common/files/patch-sum
index 8f8086eaae2..2256fc7aa6a 100644
--- a/misc/freewnn-common/files/patch-sum
+++ b/misc/freewnn-common/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/03 04:24:09 sakamoto Exp $
 
-MD5 (patch-aa) = 79a25dfa42971a4775d631adc1d03b6a
-MD5 (patch-ab) = 73b24af3542e59e04a151ee83d85546f
-MD5 (patch-ac) = d437b281bc7e8bbf9d16f9ddaa40b9fb
-MD5 (patch-ad) = ae64abc2ae44ed25119b31be1696d8e3
-MD5 (patch-ae) = 61db35c709df6d6e11b470aab0cfdd06
-MD5 (patch-af) = eaa17922a7ede776983985f3012336ea
+MD5 (patch-aa) = 3363529ba220134fea834a0644be2f68
+MD5 (patch-ab) = c6e17882427bfb85565a0309c3ea3843
+MD5 (patch-ac) = fbe155f5f55d43a779778a37907c17be
+MD5 (patch-ad) = e9f90767f596c6bd19aea8deb29d8c45
+MD5 (patch-ae) = 92f6fb369826fcc6b8dc2766d5b8e5dd
+MD5 (patch-af) = 9451325f12bc8a98aa2fff5267035292
diff --git a/misc/freewnn-common/patches/patch-aa b/misc/freewnn-common/patches/patch-aa
index b249e4012d6..b846576cad6 100644
--- a/misc/freewnn-common/patches/patch-aa
+++ b/misc/freewnn-common/patches/patch-aa
@@ -1,37 +1,51 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./Wnn/Makefile.in.orig	Tue Mar 23 21:10:52 1999
-+++ ./Wnn/Makefile.in	Wed Jul 28 11:53:13 1999
-@@ -611,25 +611,18 @@
++++ ./Wnn/Makefile.in	Thu Sep  2 19:21:52 1999
+@@ -611,6 +611,4 @@
  # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 -WNNOWNER= wnn
 -
-+.if (${WNN_TARGET} == "SERVER")
  JSERVERDIR = jserver
--
- PUBDICDIR = pubdic
--
- WNNCONSDIR = wnncons
--
- WNNJUTILDIR = jutil
--
--WNNCLIENTSDIR = conv
--
--JLIBDIR = include romkan jlib
--
-+WNNMANDIR = man/2.env man/4.cmd man/6.jutil
- WNNENVDIR = ld
--
+ 
+@@ -629,9 +627,15 @@
  JDDIR = jd
--
+ 
 -WNNMANDIR = man
 -
+ JLIBV3DIR = jlib.V3
+ 
+-SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR)         $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
++.if (${WNN_TARGET} == "SERVER")
++WNNMANDIR = man/2.env man/4.cmd man/6.jutil
++SUBDIRS_INST = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICDIR) $(WNNCONSDIR)			 $(WNNMANDIR)
++SUBDIRS = $(JDDIR) $(SUBDIRS_INST)
 +.else
-+WNNCLIENTSDIR = conv
 +WNNMANDIR = man/3.libwnn
-+JLIBDIR = include romkan jlib
- JLIBV3DIR = jlib.V3
++SUBDIRS_INST = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
++SUBDIRS = $(SUBDIRS_INST)
 +.endif
  
- SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR)         $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
+ all::
+@@ -699,5 +703,5 @@
+ 	@for flag in ${MAKEFLAGS} ''; do \
+ 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
+-	for i in $(SUBDIRS) ;\
++	for i in $(SUBDIRS_INST) ;\
+ 	do \
+ 	echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+@@ -709,5 +713,5 @@
+ 	@for flag in ${MAKEFLAGS} ''; do \
+ 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
+-	for i in $(SUBDIRS) ;\
++	for i in $(SUBDIRS_INST) ;\
+ 	do \
+ 	echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
+@@ -719,5 +723,5 @@
+ 	@for flag in ${MAKEFLAGS} ''; do \
+ 	case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
+-	for i in $(SUBDIRS) ;\
++	for i in $(SUBDIRS_INST) ;\
+ 	do \
+ 	echo "installing link kit" "in $(CURRENT_DIR)/$$i..."; \
diff --git a/misc/freewnn-common/patches/patch-ab b/misc/freewnn-common/patches/patch-ab
index 1121cbf6e13..7f1de7cd432 100644
--- a/misc/freewnn-common/patches/patch-ab
+++ b/misc/freewnn-common/patches/patch-ab
@@ -1,33 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-ab,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./cWnn/Makefile.in.orig	Tue Mar 23 21:13:41 1999
-+++ ./cWnn/Makefile.in	Wed Jul 28 11:29:10 1999
-@@ -621,23 +621,16 @@
++++ ./cWnn/Makefile.in	Thu Sep  2 19:26:52 1999
+@@ -621,6 +621,4 @@
  # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 -WNNOWNER = wnn
 -
-+.if (${WNN_TARGET} == "SERVER")
  JSERVERDIR = jserver
--
- WNNJUTILDIR = jutil
--
--WNNCLIENTSDIR = conv
--
--JLIBDIR = include etc romkan jlib
--
- CDICDIR = cdic
--
- TDICDIR = tdic
--
- CDDIR = cd
--
- TDDIR = td
--
+ 
+@@ -641,5 +639,9 @@
  WNNMANDIR = man
+ 
+-SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR)
++.if (${WNN_TARGET} == "SERVER")
++SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR)
 +.else
-+WNNCLIENTSDIR = conv
-+JLIBDIR = include etc romkan jlib
++SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR)
 +.endif
  
- SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR)
+ all::
diff --git a/misc/freewnn-common/patches/patch-ac b/misc/freewnn-common/patches/patch-ac
index ceae4f9a60b..d31e22c6a95 100644
--- a/misc/freewnn-common/patches/patch-ac
+++ b/misc/freewnn-common/patches/patch-ac
@@ -1,28 +1,22 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./kWnn/Makefile.in.orig	Tue Mar 23 21:14:47 1999
-+++ ./kWnn/Makefile.in	Wed Jul 28 11:29:10 1999
-@@ -621,17 +621,13 @@
++++ ./kWnn/Makefile.in	Thu Sep  2 19:29:22 1999
+@@ -621,6 +621,4 @@
  # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 -WNNOWNER = wnn
 -
-+.if (${WNN_TARGET} == "SERVER")
  JSERVERDIR = jserver
--
- WNNJUTILDIR = jutil
--
--WNNCLIENTSDIR = conv
--
--JLIBDIR = romkan jlib
--
- KDICDIR = kdic
--
--KDDIR = include kd
-+KDDIR = kd
+ 
+@@ -635,5 +633,9 @@
+ KDDIR = include kd
+ 
+-SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
++.if (${WNN_TARGET} == "SERVER")
++SUBDIRS = etc $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
 +.else
-+WNNCLIENTSDIR = conv
-+JLIBDIR = romkan jlib include
++SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR)
 +.endif
  
- SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) 	$(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
+ all::
diff --git a/misc/freewnn-common/patches/patch-ad b/misc/freewnn-common/patches/patch-ad
index d2de6b3dc05..1b442bc68b7 100644
--- a/misc/freewnn-common/patches/patch-ad
+++ b/misc/freewnn-common/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-ad,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./configure.in.orig	Tue Apr  6 12:12:19 1999
-+++ ./configure.in	Wed Jul 28 11:29:10 1999
++++ ./configure.in	Thu Sep  2 14:57:48 1999
 @@ -55,5 +55,5 @@
      fi
      ;;
diff --git a/misc/freewnn-common/patches/patch-ae b/misc/freewnn-common/patches/patch-ae
index f8c59723a30..f396319323f 100644
--- a/misc/freewnn-common/patches/patch-ae
+++ b/misc/freewnn-common/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-ae,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./configure.orig	Tue Apr  6 12:12:18 1999
-+++ ./configure	Wed Jul 28 11:29:10 1999
++++ ./configure	Thu Sep  2 14:57:48 1999
 @@ -705,5 +705,5 @@
      fi
      ;;
diff --git a/misc/freewnn-common/patches/patch-af b/misc/freewnn-common/patches/patch-af
index 34215822dc5..d47e64df0fc 100644
--- a/misc/freewnn-common/patches/patch-af
+++ b/misc/freewnn-common/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/08/02 05:45:01 sakamoto Exp $
+$NetBSD: patch-af,v 1.2 1999/09/03 04:24:10 sakamoto Exp $
 
 --- ./Makefile.in.orig	Tue Mar 23 21:10:39 1999
-+++ ./Makefile.in	Wed Jul 28 11:29:10 1999
++++ ./Makefile.in	Thu Sep  2 14:57:48 1999
 @@ -611,10 +611,4 @@
  # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.