Updated XEmacs-mule to 21.1.6

(1) Add the following ports for XEmacs packages (by repository-copy).

ports/editors/xemacs-base-packages
ports/editors/xemacs-mule-base-packages
ports/editors/xemacs-mule-sumo-packages
ports/editors/xemacs-sumo-packages

The last two ports are for japanese.

PR:		13386
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

(2) Add the following ports for XEmacs packages for mule (by repository-copy).

ports/japanese/xemacs-sumo
ports/japanese/xemacs-sumo-canna
ports/japanese/xemacs-sumo-canna+wnn4
ports/japanese/xemacs-sumo-canna+wnn6
ports/japanese/xemacs-sumo-wnn4
ports/japanese/xemacs-sumo-wnn6

PR:		13387
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

(3) Modified the following ports in order to update to 21.1.6.

ports/japanese/xemacs
ports/japanese/xemacs-canna
ports/japanese/xemacs-canna+wnn4
ports/japanese/xemacs-canna+wnn6
ports/japanese/xemacs-wnn4
ports/japanese/xemacs-wnn6
ports/editors/xemacs-mule
ports/editors/xemacs-mule-common

PR:		13390
Submitted by:	maintainer, KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

3 files changed, 81 insertions, 109 deletions

diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index e09993c2e37f..8c621a071448 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -1,36 +1,38 @@
 # New ports collection makefile for:	XEmacs
-# Version required:	20.4
+# Version required:	21.1.6
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xemacs-20.4
-PKGNAME?=	xemacs-mule-20.4
+DISTNAME=	xemacs-${VERSION}
+PKGNAME=	${LANGPREFIX}xemacs${PKGNAMEEXT}-${VERSION}
 CATEGORIES?=	editors
-MASTER_SITES=	ftp://unipro.jsys.co.jp/pub/editor/xemacs/20.4/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
-		ftp://ftp.xemacs.org/pub/xemacs-20.4/ \
-		ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \
+MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/xemacs/${FTP_DIR}/ \
+		ftp://ftp.xemacs.org/pub/xemacs/${FTP_DIR}/ \
+		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${FTP_DIR}/ \
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${FTP_DIR}/ \
 		ftp://ftp.jpl.org/pub/elisp/
-DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
-		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \
+DISTFILES=	xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
+		xemacs-${VERSION}-info.tar.gz \
 		ps-print-jp.el.gz
+DIST_SUBDIR=	xemacs
 
 MAINTAINER?=	kiri@kiri.toba-cmt.ac.jp
 
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
+BUILD_DEPENDS=	${BUILD_DEP_LIST}
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		compface.1:${PORTSDIR}/mail/faces \
+		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		${LIB_INPUT_METHOD}
-RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/lisp/x11/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common
+RUN_DEPENDS=	${RUN_DEP_LIST}
 
-EXTRACT_ONLY=	xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \
-		xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz
-WRKSRC=		${WRKDIR}/xemacs-20.4
+EXTRACT_ONLY=	xemacs-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
+		xemacs-${VERSION}-info.tar.gz
+WRKSRC=		${WRKDIR}/xemacs-${VERSION}
 PATCHDIR=	${.CURDIR}/../../editors/xemacs-mule-common/patches
 FILESDIR=	${.CURDIR}/../../editors/xemacs-mule-common/files
 SCRIPTDIR=	${.CURDIR}/../../editors/xemacs-mule-common/scripts
@@ -38,71 +40,53 @@ INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	\
-		--with-clash-detection \
-		--lockdir=/var/run/emacs/lock \
-		--with-x11 \
+MAKE_ENV=	LANG=C
+CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
+CONFIGURE_ARGS=	--with-x11 \
+		--with-xim=no \
 		--with-mule \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--site-libraries='${SITE_LIBRARIES}' \
 		--site-includes='${SITE_INCLUDES}' \
-		--sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
+		--with-xface \
+		--with-xpm \
+		--with-sound=native \
+		--with-site-lisp \
+		--with-pop \
+		--with-xfs \
+		--with-menubars=lucid \
+		--with-scrollbars=lucid \
+		--with-dialogs=athena \
+		--with-jpeg \
+		--with-png \
+		--with-tiff \
 		--infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
-		${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS}
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-
+		--with-clash-detection \
+		--lockdir=/var/run/emacs/lock \
+		${WITH_INPUT_METHOD}
 STRIP=
-
 INSTALL_TARGET=	install-arch-dep
-
-PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR}
-
-PKGLDIR=	${.CURDIR}/../../editors/xemacs-mule/pkg
-XEMACS_DIR=	xemacs-20.4
-
-.if defined(WNN4)
-SITE_INCLUDES=		${X11BASE}/include
-SITE_LIBRARIES=		${X11BASE}/lib
-.endif
+PLIST?=		${PKGLDIR}/PLIST
+PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR}
+
+
+MAJOR_VERSION=		21.1
+VERSION=		21.1.6
+EMACS_CMD=		xemacs-${VERSION}
+XEMACS_DIR=		xemacs-${VERSION}
+FTP_DIR=		xemacs-${MAJOR_VERSION}
+ARCH_SUBDIR=		${MACHINE_ARCH}--freebsd
+PKGNAMEEXT?=		-mule
+PKGLDIR=		${.CURDIR}/../../editors/xemacs-mule/pkg
 SITE_INCLUDES+=		${PREFIX}/include
 SITE_LIBRARIES+=	${PREFIX}/lib
-.if defined(CANNA)
-LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
-WITH_INPUT_METHOD+=	--with-canna
-.endif
-.if defined(WNN4)
-BUILD_INPUT_METHOD+=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-WITH_INPUT_METHOD+=	--with-wnn
-.elif defined(WNN6)
-BUILD_INPUT_METHOD+=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
-WITH_INPUT_METHOD+=	--with-wnn6
-.endif
-.if !defined(WITH_INPUT_METHOD)
-WITH_INPUT_METHOD=	--with-wnn=no
-WITH_INPUT_METHOD+=	--with-wnn6=no
-WITH_INPUT_METHOD+=	--with-canna=no
-.endif
-
-WITH_WIDGETS=	--with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena
-MISC_OPTIONS=	--with-xface --with-xpm --with-sound=native --with-pop --with-xfs
-
-LANGUAGE?=
-.if (${LANGUAGE} == "Japanese")
-PLIST=	${PKGLDIR}/PLIST-ja
-.else
-PLIST=	${PKGLDIR}/PLIST
-.endif
+WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
+RUN_DEP_LIST+=		${PREFIX}/lib/${XEMACS_DIR}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common
 
 pre-build:
 	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
-.if (${LANGUAGE} == "Japanese")
-	@if [ -e ${WRKSRC}/lisp/packages/ps-print.elc ]; then \
-		${RM} -f ${WRKSRC}/lisp/packages/ps-print.elc; \
-	fi
-	@${GZCAT} ${DISTDIR}/ps-print-jp.el.gz > ${WRKSRC}/lisp/packages/ps-print.el
-.endif
 
 # for xemacs-mule-common in defining ${WRKDIRPREFIX}
 .if !exists(${WRKDIRPREFIX}${.CURDIR}/../../editors/xemacs-mule-common)
@@ -111,7 +95,7 @@ post-build:
 .endif
 
 post-install::
-.for file in b2m ctags etags gnuclient xemacs-20.4
+.for file in b2m ctags etags gnuclient xemacs-${VERSION}
 	@strip ${PREFIX}/bin/${file}
 .endfor
 	@if [ -f ${PKGDIR}/INSTALL ]; then \
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index d9ec6db3c6ac..8bccd2d70870 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -1,16 +1,16 @@
-This is a package containing only the executables for xemacs-20.4, the
+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-20.4, containing 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-20.4.
+xemacs-21.1.6.
 
 This package is not built with any particular language support.  If
 you want a built-in input method, look into the xemacs ports in
 language- specific directories.  Currently only Japanese (SKK,Canna, SJ3,
 Wnn4 and Wnn6) is available.
 
-This package and the package, xemacs-common-20.4 are designed *not* to 
+This package and the package, xemacs-common-21.1.6 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.
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index d65f9461868d..0ffe73da20b3 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -1,44 +1,32 @@
-bin/etags
-bin/ctags
 bin/b2m
+bin/ctags
+bin/etags
+bin/gnuattach
 bin/gnuclient
-bin/rcs-checkin
-bin/pstogif
-bin/install-sid
-bin/send-pr
 bin/gnudoit
-bin/gnuattach
-bin/xemacs-20.4
+bin/ootags
+bin/pstogif
+bin/rcs-checkin
+bin/xemacs-21.1.6
 @exec ln -sf %D/%F %B/xemacs
 @unexec rm %B/xemacs
-lib/%%XEMACS_DIR%%/i386--freebsd/make-path
-lib/%%XEMACS_DIR%%/i386--freebsd/wakeup
-lib/%%XEMACS_DIR%%/i386--freebsd/profile
-lib/%%XEMACS_DIR%%/i386--freebsd/make-docfile
-lib/%%XEMACS_DIR%%/i386--freebsd/digest-doc
-lib/%%XEMACS_DIR%%/i386--freebsd/sorted-doc
-lib/%%XEMACS_DIR%%/i386--freebsd/movemail
-lib/%%XEMACS_DIR%%/i386--freebsd/cvtmail
-lib/%%XEMACS_DIR%%/i386--freebsd/fakemail
-lib/%%XEMACS_DIR%%/i386--freebsd/yow
-lib/%%XEMACS_DIR%%/i386--freebsd/hexl
-lib/%%XEMACS_DIR%%/i386--freebsd/gnuserv
-lib/%%XEMACS_DIR%%/i386--freebsd/mmencode
-lib/%%XEMACS_DIR%%/i386--freebsd/rcs2log
-lib/%%XEMACS_DIR%%/i386--freebsd/vcdiff
-lib/%%XEMACS_DIR%%/i386--freebsd/gzip-el.sh
-lib/%%XEMACS_DIR%%/i386--freebsd/install-sid
-lib/%%XEMACS_DIR%%/i386--freebsd/send-pr
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-au
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-file
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-html
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-image
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-mpeg
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-plain
-lib/%%XEMACS_DIR%%/i386--freebsd/tm-ps
-lib/%%XEMACS_DIR%%/i386--freebsd/tmdecode
-lib/%%XEMACS_DIR%%/i386--freebsd/add-little-package.sh
-lib/%%XEMACS_DIR%%/i386--freebsd/add-big-package.sh
-lib/%%XEMACS_DIR%%/i386--freebsd/DOC
-lib/%%XEMACS_DIR%%/i386--freebsd/config.values
-@dirrm lib/%%XEMACS_DIR%%/i386--freebsd
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/DOC
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/add-big-package.sh
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/config.values
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/cvtmail
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/digest-doc
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/fakemail
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gnuserv
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/gzip-el.sh
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/hexl
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-docfile
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/make-path
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/mmencode
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/movemail
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/profile
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/rcs2log
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/sorted-doc
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/vcdiff
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/wakeup
+lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%/yow
+@dirrm lib/%%XEMACS_DIR%%/%%ARCH_SUBDIR%%