* Add Wnn7's clients (jvim, jvim3, kinput2, mule) and a library for

Wnn7 clients (Wnn7-lib). Notice the latter is modified from Wnn6-lib
by me and is not released from the Product company of Wnn7 (Omron
Software Co., Ltd).

* Modify master ports of the above ports according to adding these.

* [ports/editors/mule/pkg-descr] My English in pkg-descr was corrected
Submitted by: imp

8 files changed, 151 insertions, 43 deletions

diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 2b4ac13c31db..0b1f2db13362 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	head files and libraries of Wnn6
-# Date created:		11 July 1997
+# New ports collection makefile for:	head files and libraries of Wnn7
+# Date created:		01/07/16
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	Wnn6-lib
+PORTNAME=	Wnn7-lib
 PORTVERSION=	98.10.28
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 .endif
 
 WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
-DOCDIR=		${PREFIX}/share/doc/ja-Wnn6-lib
+DOCDIR=		${PREFIX}/share/doc/ja-Wnn7-lib
 
 INSTALLS_SHLIB=	yes
 
@@ -32,11 +32,11 @@ do-build:
 
 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
+	${LN} -sf libwnn6_for_wnn7.so.1.0 ${PREFIX}/lib/libwnn6_for_wnn7.so
 .endif
-	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a
-	@${MKDIR} ${PREFIX}/include/wnn6/wnn
-	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn6/wnn
+	${LN} -sf libwnn6_for_wnn7_fromsrc.a ${PREFIX}/lib/libwnn6_for_wnn7.a
+	@${MKDIR} ${PREFIX}/include/wnn7/wnn
+	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn7/wnn
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-aa b/japanese/Wnn7-lib/files/patch-wnn7-aa
new file mode 100644
index 000000000000..bc2a5469d0fc
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-wnn7-aa
@@ -0,0 +1,15 @@
+--- Wnn/include/config.h.orig	Wed Oct 28 13:36:24 1998
++++ Wnn/include/config.h	Wed Jul 18 17:03:05 2001
+@@ -140,7 +140,11 @@
+ #define _CONFIG_H_
+ 
+ #ifndef	LIBDIR
+-#define	LIBDIR		"/usr/local/lib/wnn6"
++#define	LIBDIR		"/usr/lib/wnn7"
++#endif	/* LIBDIR */
++
++#ifndef	SHARDIR
++#define	SHARDIR		"/usr/share/wnn7"
+ #endif	/* LIBDIR */
+ 
+ #ifdef TAIWANESE
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ab b/japanese/Wnn7-lib/files/patch-wnn7-ab
new file mode 100644
index 000000000000..12ba70b5fb81
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-wnn7-ab
@@ -0,0 +1,20 @@
+--- config/Project.tmpl.~1~	Wed Oct 28 13:36:36 1998
++++ config/Project.tmpl	Mon Jul 16 02:54:32 2001
+@@ -507,7 +507,7 @@
+ #endif
+ 
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/local/lib/wnn6
++#define WnnWnnDir	/usr/lib/wnn7
+ #endif
+ 
+ 
+@@ -563,7 +563,7 @@
+    WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir
+     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
+      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
+-        WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a
++        WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a
+      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
+ 
+         CWNNTOP = $(IMTOP)/cWnn
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ac b/japanese/Wnn7-lib/files/patch-wnn7-ac
new file mode 100644
index 000000000000..63a197fbaa3f
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-wnn7-ac
@@ -0,0 +1,20 @@
+--- config/X11.tmpl.~1~	Wed Oct 28 13:36:37 1998
++++ config/X11.tmpl	Mon Jul 16 02:54:53 2001
+@@ -507,7 +507,7 @@
+ #endif
+ 
+ #ifndef WnnWnnDir
+-#define WnnWnnDir	/usr/local/lib/wnn6
++#define WnnWnnDir	/usr/lib/wnn7
+ #endif
+ 
+ 
+@@ -563,7 +563,7 @@
+    WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir
+     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
+      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
+-        WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a
++        WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a
+      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
+ 
+         CWNNTOP = $(IMTOP)/cWnn
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ad b/japanese/Wnn7-lib/files/patch-wnn7-ad
new file mode 100644
index 000000000000..3843e87fd0f1
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-wnn7-ad
@@ -0,0 +1,39 @@
+--- Wnn/jlib/Imakefile.~1~	Mon Jul 16 02:58:38 2001
++++ Wnn/jlib/Imakefile	Mon Jul 16 03:04:20 2001
+@@ -74,9 +74,9 @@
+ LibraryObjectRule()
+ 
+ #if DoSharedLib
+-AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV))
++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a libwnn6_for_wnn7.so.$(SOWNN6LIBREV))
+ #else
+-AllTarget($(OBJS) libwnn6_fromsrc.a)
++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a)
+ #endif
+ 
+ 
+@@ -90,19 +90,19 @@
+ 
+ 
+ #if DoSharedLib
+-SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.)
++SharedLibraryTarget(wnn6_for_wnn7,$(SOWNN6LIBREV),$(OBJS),.,.)
+ #endif
+ 
+-UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..)
+-LintLibraryTarget(wnn6_fromsrc,$(SRCS))
++UnsharedLibraryTarget(wnn6_for_wnn7_fromsrc,$(UNSHAREDOBJS),unshared,..)
++LintLibraryTarget(wnn6_for_wnn7_fromsrc,$(SRCS))
+ 
+ instlib:: install
+ 
+ #if DoSharedLib
+-InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR))
++InstallSharedLibrary(wnn6_for_wnn7,$(SOWNN6LIBREV),$(WNNLIBDIR))
+ #endif
+ 
+-InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR))
++InstallLibrary(wnn6_for_wnn7_fromsrc,$(WNNLIBDIR))
+ 
+ #if ProfileLibJlib
+ ProfiledLibraryTarget(wnn,$(OBJS))
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ae b/japanese/Wnn7-lib/files/patch-wnn7-ae
new file mode 100644
index 000000000000..f253bc3d6694
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-wnn7-ae
@@ -0,0 +1,14 @@
+--- Wnn/jlib/js.c.orig	Wed Oct 28 13:36:31 1998
++++ Wnn/jlib/js.c	Wed Jul 18 17:14:31 2001
+@@ -953,8 +953,9 @@
+  LockMutex(&msg_lock);
+  if (wnn_msg_cat == NULL){
+     char nlspath[64];
+-    strcpy(nlspath, LIBDIR);
+-    strcat(nlspath, "/%L/%N");
++    strcpy(nlspath, SHARDIR);
++    strcat(nlspath, "/msg");
++    strcat(nlspath, "/%N");
+     wnn_msg_cat = msg_open("libwnn.msg", nlspath, lang, NULL);
+     if(wnn_msg_cat == NULL){
+ 	fprintf(stderr, "libwnn: Can't open message file for libwnn.a\n");
diff --git a/japanese/Wnn7-lib/pkg-descr b/japanese/Wnn7-lib/pkg-descr
index f77e390aeb2b..45db3ac4d6e3 100644
--- a/japanese/Wnn7-lib/pkg-descr
+++ b/japanese/Wnn7-lib/pkg-descr
@@ -1,14 +1,14 @@
 This port has include files (e.g. wnn/commonhd.h) and a library file
-(e.g. libwnn.a) to build Wnn6 clients. The files are compiled from
+(e.g. libwnn.a) to build Wnn7 clients. The files are compiled from
 sources Wnn6-SDK-sources.tar.gz which you can get in
 
 WWW: http://www.omronsoft.co.jp
 
 The license of the sources is in
 
-/usr/local/share/doc/ja-Wnn6-lib/README
+/usr/local/share/doc/ja-Wnn7-lib/README
 
-By the way, you must buy the server of Wnn6, whose name is jserver,
+By the way, you must buy the server of Wnn7, whose name is jserver,
 from Omron Software Co., Ltd.
 
 +------------------------------------------+
@@ -18,8 +18,8 @@ from Omron Software Co., Ltd.
 | FAX:     +81-44-246-6011                 |
 +------------------------------------------+
 
-Wnn6 is one of Japanese input methods. 'Wnn6 for Linux/FreeBSD' is
-supported an only Japanese method. However, Wnn4.2 which is free is
+Wnn7 is one of Japanese input methods. 'Wnn7 for Linux/BSD' is
+supported an only Japanese method. However, FreeWnn which is free is
 supported Chinese and Korean ones, too.
 
 - S. Taoka
diff --git a/japanese/Wnn7-lib/pkg-plist b/japanese/Wnn7-lib/pkg-plist
index c147ac847f29..e5a66b3a4d0e 100644
--- a/japanese/Wnn7-lib/pkg-plist
+++ b/japanese/Wnn7-lib/pkg-plist
@@ -1,30 +1,30 @@
-include/wnn6/wnn/commonhd.h
-include/wnn6/wnn/config.h
-include/wnn6/wnn/copyright.h
-include/wnn6/wnn/cplib.h
-include/wnn6/wnn/demcom.h
-include/wnn6/wnn/dslib.h
-include/wnn6/wnn/fi_jdata.h
-include/wnn6/wnn/hinsi_file.h
-include/wnn6/wnn/jd_sock.h
-include/wnn6/wnn/jdata.h
-include/wnn6/wnn/jh.h
-include/wnn6/wnn/jlib.h
-include/wnn6/wnn/jllib.h
-include/wnn6/wnn/jslib.h
-include/wnn6/wnn/msg.h
-include/wnn6/wnn/mt_jlib.h
-include/wnn6/wnn/mt_jserver.h
-include/wnn6/wnn/rk_spclval.h
-include/wnn6/wnn/serverdefs.h
-include/wnn6/wnn/wnn_os.h
-include/wnn6/wnn/wnn_string.h
-include/wnn6/wnn/wnnerror.h
-@dirrm include/wnn6/wnn
-@dirrm include/wnn6
-lib/libwnn6_fromsrc.a
-lib/libwnn6.a
-lib/libwnn6.so
-lib/libwnn6.so.1
-share/doc/ja-Wnn6-lib/README
-@dirrm share/doc/ja-Wnn6-lib
+include/wnn7/wnn/commonhd.h
+include/wnn7/wnn/config.h
+include/wnn7/wnn/copyright.h
+include/wnn7/wnn/cplib.h
+include/wnn7/wnn/demcom.h
+include/wnn7/wnn/dslib.h
+include/wnn7/wnn/fi_jdata.h
+include/wnn7/wnn/hinsi_file.h
+include/wnn7/wnn/jd_sock.h
+include/wnn7/wnn/jdata.h
+include/wnn7/wnn/jh.h
+include/wnn7/wnn/jlib.h
+include/wnn7/wnn/jllib.h
+include/wnn7/wnn/jslib.h
+include/wnn7/wnn/msg.h
+include/wnn7/wnn/mt_jlib.h
+include/wnn7/wnn/mt_jserver.h
+include/wnn7/wnn/rk_spclval.h
+include/wnn7/wnn/serverdefs.h
+include/wnn7/wnn/wnn_os.h
+include/wnn7/wnn/wnn_string.h
+include/wnn7/wnn/wnnerror.h
+@dirrm include/wnn7/wnn
+@dirrm include/wnn7
+lib/libwnn6_for_wnn7_fromsrc.a
+lib/libwnn6_for_wnn7.a
+lib/libwnn6_for_wnn7.so
+lib/libwnn6_for_wnn7.so.1
+share/doc/ja-Wnn7-lib/README
+@dirrm share/doc/ja-Wnn7-lib