Update to version 21.1.8.

PR:		14591
Submitted by:	maintainer

8 files changed, 104 insertions, 50 deletions

diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index fa9b7f8df6f0..5227c587ac51 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	XEmacs with Canna and Wnn4
-# Version required:	21.1.6
+# Version required:	21.1.8
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -9,7 +9,4 @@
 CANNA=		yes
 WNN4=		yes
 
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
-
-.include	"${MASTERDIR}/Makefile"
+.include	"${.CURDIR}/../xemacs-canna/Makefile"
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index 9c1fccebaf1f..007328b60dbe 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	XEmacs with Canna and Wnn6
-# Version required:	21.1.6
+# Version required:	21.1.8
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -9,7 +9,4 @@
 CANNA=		yes
 WNN6=		yes
 
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
-
-.include	"${MASTERDIR}/Makefile"
+.include	"${.CURDIR}/../xemacs-canna/Makefile"
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 20eb1192bf4e..d74fcfd20995 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -1,14 +1,73 @@
-# New ports collection makefile for:	XEmacs for Japanese with Canna
-# Version required:	21.1.6
+# New ports collection makefile for:	XEmacs for Japanese
+# Version required:	21.1.8
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-CANNA=		yes
+# This is the MASTER port of Japanese XEmacs slave ports(japanese/xemacs-*)
+# and provides `Architecture Dependent' parts of xemacs binary. 
+#
+# Caracteristic variables of XEmacs Mule ports family:
+#	MULE_COMMON       : COMMON port if defined
+#	PKGLDIR           : Local PKGDIR of MASTER port(editors/xemacs-mule/pkg)
+#	SITE_INCLUDES     : site include path(configure arguments)
+#	SITE_LIBRARIES    : site libraries path(configure arguments)
+#	WITH_INPUT_METHOD : input methods(configure arguments)
+#	LIB_INPUT_METHOD  : LIB_DEPENDS list of Input Methods
+#	BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
+
+CATEGORIES=	japanese editors
+
+JAPANESE=	yes
+MANLANG=	ja
+MAN1=		xemacs-ja.1
+DESCR_TMPL=	${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
+PLIST=		${PKGLDIR}/PLIST-ja
+
+LANGPREFIX=	ja-
+COMMENT=	${WRKDIR}/COMMENT
+DESCR=		${WRKDIR}/DESCR
+.if defined(CANNA) && defined(WNN4)
+PKGNAMEEXT=		-canna+wnn4
+SITE_INCLUDES=		${X11BASE}/include
+SITE_LIBRARIES=		${X11BASE}/lib
+WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
+BUILD_INPUT_METHOD=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn4 support.
+.elif defined(CANNA) && defined(WNN6)
+PKGNAMEEXT=		-canna+wnn6
+WITH_INPUT_METHOD=	--with-canna --with-wnn6
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
+BUILD_INPUT_METHOD=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support.
+.elif defined(WNN4)
+PKGNAMEEXT=		-wnn4
+SITE_INCLUDES=		${X11BASE}/include
+SITE_LIBRARIES=		${X11BASE}/lib
+WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
+BUILD_INPUT_METHOD=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn4 support.
+.elif defined(WNN6)
+PKGNAMEEXT=		-wnn6
+WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
+BUILD_INPUT_METHOD=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support.
+.else
+PKGNAMEEXT=		-canna
+WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Canna support.
+.endif
+
+post-configure::
+	@${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
 
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+post-install::
+	@${MKDIR} ${PREFIX}/man/ja/man1
+	@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1
+	@${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
 
-.include	"${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../editors/xemacs-mule/Makefile"
diff --git a/japanese/xemacs21-canna/files/DESCR.tmpl b/japanese/xemacs21-canna/files/DESCR.tmpl
new file mode 100644
index 000000000000..acba674b39a9
--- /dev/null
+++ b/japanese/xemacs21-canna/files/DESCR.tmpl
@@ -0,0 +1,31 @@
+This is a package containing only the executables for XEmacs with
+Mule(version %%XEMACS_VER%%), the next generation of Emacs.
+
+You need to install a package, xemacs-common-%%XEMACS_VER%%, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version %%XEMACS_VER%%).
+
+This package is built with Japanese support by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine. Each input method would be
+supported in following ports respectively:
+
+	japanese/xemacs-canna ........ SKK, SJ3, Canna
+	japanese/xemacs-canna+wnn4 ... SKK, SJ3, Canna, Wnn4
+	japanese/xemacs-canna+wnn6 ... SKK, SJ3, Canna, Wnn6
+	japanese/xemacs-wnn4 ......... SKK, SJ3, Wnn4
+	japanese/xemacs-wnn6 ......... SKK, SJ3, Wnn6
+
+If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
+in advance. SKK is supported as already builtin. Also it will
+support several input methods under leim. 
+
+This package and the package xemacs-common-%%XEMACS_VER%%, might 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 will be overwritten too.
+
+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.
+Or to avoid this problem, you could select prefix for top install
+directory. By default it is pointed to the usual place, /usr/local.
diff --git a/japanese/xemacs21-canna/pkg-comment b/japanese/xemacs21-canna/pkg-comment
deleted file mode 100644
index 2320690d5427..000000000000
--- a/japanese/xemacs21-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs text editor, with Canna, SJ3 and SKK support
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
deleted file mode 100644
index 3d9393e51f94..000000000000
--- a/japanese/xemacs21-canna/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-This is a package containing only the executables for xemacs-21.1.6, the
-next generation of Emacs.
-
-You need to install a package, xemacs-common-21.1.6, containing emacs
-lisp files, info pages, and so on (except executables) for
-xemacs-21.1.6.
-
-This package is built with Japanese support by using Canna or SJ3 as
-an external input engine. If you use with SJ3, you should be installed 
-sj3serv in advance. SKK is supported as already builtin. Also it will
-support several input methods under leim. 
-
-This package and the package xemacs-common-21.1.6, might 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 will be overwritten too.
-
-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.
-Or to avoid this problem, you could select prefix for top install
-directory. By default it is pointed to the usual place, /usr/local.
-
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
index 03d0cc8bf41d..29191d2045cc 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	XEmacs with Wnn4
-# Version required:	21.1.6
+# Version required:	21.1.8
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -8,7 +8,4 @@
 
 WNN4=		yes
 
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
-
-.include	"${MASTERDIR}/Makefile"
+.include	"${.CURDIR}/../xemacs-canna/Makefile"
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index 71a1ae3ac0bc..2d59d4aad1c5 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	XEmacs with Wnn6
-# Version required:	21.1.6
+# Version required:	21.1.8
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -8,7 +8,4 @@
 
 WNN6=		yes
 
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
-
-.include	"${MASTERDIR}/Makefile"
+.include	"${.CURDIR}/../xemacs-canna/Makefile"