* 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

2 files changed, 49 insertions, 21 deletions

diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 525f9d0d25c4..a2bc624c9863 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -7,6 +7,8 @@
 
 PORTNAME=	mule
 PORTVERSION=	${MULE_VERSION}
+PKGNAMESUFFIX=	${INPUT_METHOD}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
 		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
@@ -57,33 +59,52 @@ STRIP=
 INSTALL_TARGET=	install-arch-dep
 
 .if defined(CANNA)
+INPUT_METHOD+=		canna
 LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 WITH_INPUT_METHOD+=	--with-canna --with-canna-libraries=${PREFIX}/lib \
 			--with-canna-includes=${PREFIX}/include
 .endif
-.if defined(SJ3)
-BUILD_INPUT_METHOD+=	sj3serv:${PORTSDIR}/japanese/sj3
-WITH_INPUT_METHOD+=	--with-sj3
-.endif
 .if defined(FREEWNN)
+INPUT_METHOD+=		freewnn
 LIB_INPUT_METHOD+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 WITH_INPUT_METHOD+=	--with-wnn4 --with-wnn-libraries=${LOCALBASE}/lib \
 			--with-wnn-includes=${LOCALBASE}/include/wnn
 .elif defined(CFREEWNN)
+INPUT_METHOD+=		freewnn
 LIB_INPUT_METHOD+=	cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib
 WITH_INPUT_METHOD+=	--with-wnn4 --with-cwnn4 --with-wnn-libraries=${LOCALBASE}/lib \
 			--with-wnn-includes=${LOCALBASE}/include/cwnn
 .elif defined(KFREEWNN)
+INPUT_METHOD+=		freewnn
 LIB_INPUT_METHOD+=	kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
 WITH_INPUT_METHOD+=	--with-wnn4 --with-kwnn4 --with-wnn-libraries=${LOCALBASE}/lib \
 			--with-wnn-includes=${LOCALBASE}/include/kwnn
-.elif defined(WNN6)
+.endif
+.if defined(SJ3)
+INPUT_METHOD+=		sj3
+BUILD_INPUT_METHOD+=	sj3serv:${PORTSDIR}/japanese/sj3
+WITH_INPUT_METHOD+=	--with-sj3
+.endif
+.if !defined(FREEWNN) && !defined(CFREEWNN) && !defined(KFREEWNN)
+.if defined(WNN6)
+INPUT_METHOD+=		wnn6
 LIB_INPUT_METHOD+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 WITH_INPUT_METHOD+=	--with-wnn6 --with-wnn-libraries=${LOCALBASE}/lib \
 			--with-wnn-includes=${LOCALBASE}/include/wnn6/wnn
+.elif defined(WNN7)
+INPUT_METHOD+=		wnn7
+LIB_INPUT_METHOD+=	wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
+WITH_INPUT_METHOD+=	--with-wnn6=-lwnn6_for_wnn7 --with-wnn-libraries=${LOCALBASE}/lib \
+			--with-wnn-includes=${LOCALBASE}/include/wnn7/wnn
+.endif
 .endif
 COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
 ELC_DIR=	../lisp
+# Make a value of INPUT_METHOD
+.if defined(INPUT_METHOD)
+INPUT_METHOD!=	${ECHO} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
+.endif
+
 
 WITH_DIALOGS=	--with-x-toolkit
 
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index 579f0a8fba5e..cdd4ec27949f 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/pkg-descr
@@ -1,24 +1,31 @@
-This is a package containing only the executables for mule-2.3, a
-multilingual editor based on emacs-19.34.
+This package contains only the executables for mule-2.3, a multilingual
+editor based on emacs-19.34.
 
-You should install a package, mule-common-2.3, containing emacs lisp
+You should install the mule-common-2.3 package containing emacs lisp
 files, info pages, and so on (except executables) for mule-2.3.
 
-This package is not built with any particular language support.  If
-you want a built-in input method, look into the mule ports in
-language- specific directories.
+It supports the following input methods: jeonkak, hangul for
+Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+${LOCALBASE}/lib/mule/site-lisp/site-start.el).
 
-This package and the package, mule-common-2.3 are designed *not* to
-clobber any existing emacs installation.  In particular, the
-executables and man pages of etags/ctags are not installed, and the
-info pages that come with the original emacs don't get installed too.
-The Japanese version is build to install everything, by the way.
+This package and the package, mule-common-2.3, *will* clobber any
+existing emacs installation.  In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs get installed too.
 
-A "dir" file is supplied in the
-${PORTSDIR}/editors/mule-common/files/ subdirectory of the
-ports package.  Copy it into your /usr/local/info to read mule info
-pages, but also make sure you also add everything that may have been
-added to that file!
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd.  If
+someone has a solution to this, please tell me.
+
+A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
+applied in this port.
 
 - S. Taoka
 taoka@FreeBSD.org