Update to version 21.1.8.

PR:		14591
Submitted by:	maintainer

4 files changed, 57 insertions, 70 deletions

diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 7d7c028fdd88..b226981feebd 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -1,47 +1,57 @@
 # New ports collection makefile for:	XEmacs
-# Version required:	21.1.6
+# Version required:	21.1.8
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xemacs-${VERSION}
-PKGNAME=	${LANGPREFIX}xemacs${PKGNAMEEXT}-${VERSION}
+# This is the MASTER port of XEmacs Mule 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
+
+DISTNAME=	xemacs-${XEMACS_VER}
+PKGNAME=	${LANGPREFIX}xemacs${PKGNAMEEXT}-${XEMACS_VER}
 CATEGORIES?=	editors
 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-${VERSION}.tar.gz xemacs-${VERSION}-elc.tar.gz \
-		xemacs-${VERSION}-info.tar.gz \
-		ps-print-jp.el.gz
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${FTP_DIR}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} \
+		${DISTNAME}-info${EXTRACT_SUFX}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER?=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-BUILD_DEPENDS=	${BUILD_DEP_LIST}
+.if !defined(MULE_COMMON)
+BUILD_DEPENDS=	${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
+		${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages \
+		${BUILD_INPUT_METHOD}
+RUN_DEPENDS=	${PREFIX}/lib/${XEMACS_DIR}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-mule-common \
+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
+		${PREFIX}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+.endif
 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/tiff \
 		${LIB_INPUT_METHOD}
-RUN_DEPENDS=	${RUN_DEP_LIST}
 
-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
-INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
-PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER}
 USE_AUTOCONF=	yes
+USE_XLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	--with-x11 \
+CONFIGURE_ARGS?=--with-x11 \
 		--with-xim=no \
 		--with-mule \
 		--x-includes=${X11BASE}/include \
@@ -64,23 +74,37 @@ CONFIGURE_ARGS=	--with-x11 \
 		--with-clash-detection \
 		--lockdir=/var/run/emacs/lock \
 		${WITH_INPUT_METHOD}
+MAKE_ENV=	LANG=C
+MAKE_ARGS=	prefix=${PREFIX}
+PATCHDIR=	${.CURDIR}/../../editors/xemacs-mule/patches
+FILESDIR=	${.CURDIR}/../../editors/xemacs-mule/files
+INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 STRIP=
-INSTALL_TARGET=	install-arch-dep
+INSTALL_TARGET?=install-arch-dep
+DESCR?=		${WRKDIR}/DESCR
 PLIST?=		${PKGLDIR}/PLIST
-PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR}
+PLIST_SUB?=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR} EMACS_CMD=${EMACS_CMD}
 
-MAJOR_VERSION=		21.1
-VERSION=		21.1.6
-EMACS_CMD=		xemacs-${VERSION}
-XEMACS_DIR=		xemacs-${VERSION}
-FTP_DIR=		xemacs-${MAJOR_VERSION}
+XEMACS_MAJVER=		21.1
+XEMACS_VER=		21.1.8
+EMACS_CMD=		xemacs-${XEMACS_VER}
+XEMACS_DIR=		xemacs-${XEMACS_VER}
+FTP_DIR=		xemacs-${XEMACS_MAJVER}
 ARCH_SUBDIR=		${MACHINE_ARCH}--freebsd
 PKGNAMEEXT?=		-mule
+DESCR_TMPL?=		${.CURDIR}/../xemacs-mule/files/DESCR.tmpl
+.if !defined(MULE_COMMON)
 PKGLDIR=		${.CURDIR}/../../editors/xemacs-mule/pkg
 SITE_INCLUDES+=		${PREFIX}/include
 SITE_LIBRARIES+=	${PREFIX}/lib
 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
+.endif
+
+.if !defined(MULE_COMMON)
+post-configure::
+	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+		${DESCR_TMPL} > ${DESCR}
 
 pre-build:
 	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
@@ -93,14 +117,11 @@ post-build:
 .endif
 
 post-install::
-.for file in b2m ctags etags gnuclient xemacs-${VERSION}
+.for file in b2m ctags etags gnuclient xemacs-${XEMACS_VER}
 	@strip ${PREFIX}/bin/${file}
 .endfor
-	@if [ -f ${PKGDIR}/INSTALL ]; then \
-		${SETENV} PKG_PREFIX=${PREFIX} \
-			${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
-	fi
 	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+.endif
 
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
diff --git a/editors/xemacs21-mule/pkg-comment b/editors/xemacs21-mule/pkg-comment
index 59b1a3dc5c60..2fb19845b5fc 100644
--- a/editors/xemacs21-mule/pkg-comment
+++ b/editors/xemacs21-mule/pkg-comment
@@ -1 +1 @@
-XEmacs text editor (Only the executables)
+XEmacs text editor with mule(Only the executables)
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
deleted file mode 100644
index 8bccd2d70870..000000000000
--- a/editors/xemacs21-mule/pkg-descr
+++ /dev/null
@@ -1,17 +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 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-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.
-The Japanese version is build to install everything, by the way.
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index 0ffe73da20b3..5ef8365ac8d2 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -7,26 +7,9 @@ bin/gnudoit
 bin/ootags
 bin/pstogif
 bin/rcs-checkin
-bin/xemacs-21.1.6
+bin/%%XEMACS_DIR%%
 @exec ln -sf %D/%F %B/xemacs
 @unexec rm %B/xemacs
 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%%