Delete BROKEN mark.

Modify as a port which depends on *xemacs21-mule* ports.
Add target `xemacs-package'.

38 files changed, 202 insertions, 54 deletions

diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile
index d21a915..7be360d 100644
--- a/editors/flim-xemacs21-mule-current/Makefile
+++ b/editors/flim-xemacs21-mule-current/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim for xemacs-mule
+# New ports collection makefile for:	flim for xemacs21-mule
 # Version required:	1.13.2
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
+
+# xemacs package
+XEMACS_PKGNAME=	flim
+XEMACS_PKGVER=	1.13
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-en.info info/mime-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-xemacs21-mule-current/pkg-comment b/editors/flim-xemacs21-mule-current/pkg-comment
index f4aa165..e0bf6ba 100644
--- a/editors/flim-xemacs21-mule-current/pkg-comment
+++ b/editors/flim-xemacs21-mule-current/pkg-comment
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim-xemacs21-mule-current/pkg-descr b/editors/flim-xemacs21-mule-current/pkg-descr
index df743da..f5b3afb 100644
--- a/editors/flim-xemacs21-mule-current/pkg-descr
+++ b/editors/flim-xemacs21-mule-current/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule.
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
diff --git a/editors/flim-xemacs21-mule-current/pkg-plist b/editors/flim-xemacs21-mule-current/pkg-plist
index c37cfa1..ffa0287 100644
--- a/editors/flim-xemacs21-mule-current/pkg-plist
+++ b/editors/flim-xemacs21-mule-current/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.en
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
 %%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
@@ -54,4 +55,4 @@
 %%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/flim
 share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
+@unexec /bin/rmdir %D/share/flim||(echo "===>  Please ignore above error.";true)
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 7a2a4be..4c3b780 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim for xemacs-mule
+# New ports collection makefile for:	flim for xemacs21-mule
 # Version required:	1.12.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS=	info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
+
+# xemacs package
+XEMACS_PKGNAME=	flim
+XEMACS_PKGVER=	1.12
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-en.info info/mime-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-xemacs21-mule/pkg-comment b/editors/flim-xemacs21-mule/pkg-comment
index f4aa165..e0bf6ba 100644
--- a/editors/flim-xemacs21-mule/pkg-comment
+++ b/editors/flim-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim-xemacs21-mule/pkg-descr b/editors/flim-xemacs21-mule/pkg-descr
index df743da..f5b3afb 100644
--- a/editors/flim-xemacs21-mule/pkg-descr
+++ b/editors/flim-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule.
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
diff --git a/editors/flim-xemacs21-mule/pkg-plist b/editors/flim-xemacs21-mule/pkg-plist
index 03ace5a..d592fb5 100644
--- a/editors/flim-xemacs21-mule/pkg-plist
+++ b/editors/flim-xemacs21-mule/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.en
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
 %%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
@@ -52,4 +53,4 @@
 %%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/flim
 share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
+@unexec /bin/rmdir %D/share/flim||(echo "===>  Please ignore above error.";true)
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index d21a915..7be360d 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim for xemacs-mule
+# New ports collection makefile for:	flim for xemacs21-mule
 # Version required:	1.13.2
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.flim
+
+# xemacs package
+XEMACS_PKGNAME=	flim
+XEMACS_PKGVER=	1.13
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-en.info info/mime-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim113-xemacs21-mule/pkg-comment b/editors/flim113-xemacs21-mule/pkg-comment
index f4aa165..e0bf6ba 100644
--- a/editors/flim113-xemacs21-mule/pkg-comment
+++ b/editors/flim113-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim113-xemacs21-mule/pkg-descr b/editors/flim113-xemacs21-mule/pkg-descr
index df743da..f5b3afb 100644
--- a/editors/flim113-xemacs21-mule/pkg-descr
+++ b/editors/flim113-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule.
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
diff --git a/editors/flim113-xemacs21-mule/pkg-plist b/editors/flim113-xemacs21-mule/pkg-plist
index c37cfa1..ffa0287 100644
--- a/editors/flim113-xemacs21-mule/pkg-plist
+++ b/editors/flim113-xemacs21-mule/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.en
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
 %%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
@@ -54,4 +55,4 @@
 %%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/flim
 share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
+@unexec /bin/rmdir %D/share/flim||(echo "===>  Please ignore above error.";true)
diff --git a/editors/flim113/pkg-comment.xemacs21-mule b/editors/flim113/pkg-comment.xemacs21-mule
index f4aa165..e0bf6ba 100644
--- a/editors/flim113/pkg-comment.xemacs21-mule
+++ b/editors/flim113/pkg-comment.xemacs21-mule
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim113/pkg-descr.xemacs21-mule b/editors/flim113/pkg-descr.xemacs21-mule
index df743da..f5b3afb 100644
--- a/editors/flim113/pkg-descr.xemacs21-mule
+++ b/editors/flim113/pkg-descr.xemacs21-mule
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for xemacs-mule.
+FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
diff --git a/editors/flim113/pkg-plist.xemacs21-mule b/editors/flim113/pkg-plist.xemacs21-mule
index c37cfa1..ffa0287 100644
--- a/editors/flim113/pkg-plist.xemacs21-mule
+++ b/editors/flim113/pkg-plist.xemacs21-mule
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.en
 %%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
 %%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
@@ -54,4 +55,4 @@
 %%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/flim
 share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
+@unexec /bin/rmdir %D/share/flim||(echo "===>  Please ignore above error.";true)
diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile
index c978380..41069a4 100644
--- a/editors/semi-xemacs21-mule-current/Makefile
+++ b/editors/semi-xemacs21-mule-current/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	semi-current for xemacs-mule
+# New ports collection makefile for:	semi-current for xemacs21-mule
 # Version required:	1.13.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=	semi
+XEMACS_PKGVER=	1.18
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi-xemacs21-mule-current/pkg-comment b/editors/semi-xemacs21-mule-current/pkg-comment
index dbbb7df..cecdd81 100644
--- a/editors/semi-xemacs21-mule-current/pkg-comment
+++ b/editors/semi-xemacs21-mule-current/pkg-comment
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi-xemacs21-mule-current/pkg-descr b/editors/semi-xemacs21-mule-current/pkg-descr
index 3d37ba5..e2ac016 100644
--- a/editors/semi-xemacs21-mule-current/pkg-descr
+++ b/editors/semi-xemacs21-mule-current/pkg-descr
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
diff --git a/editors/semi-xemacs21-mule-current/pkg-plist b/editors/semi-xemacs21-mule-current/pkg-plist
index 1945079..287a423 100644
--- a/editors/semi-xemacs21-mule-current/pkg-plist
+++ b/editors/semi-xemacs21-mule-current/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -42,4 +43,4 @@
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index bca292a..b19be46 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	semi for xemacs-mule
+# New ports collection makefile for:	semi for xemacs21-mule
 # Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=	semi
+XEMACS_PKGVER=	1.13
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi-xemacs21-mule/pkg-comment b/editors/semi-xemacs21-mule/pkg-comment
index dbbb7df..cecdd81 100644
--- a/editors/semi-xemacs21-mule/pkg-comment
+++ b/editors/semi-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi-xemacs21-mule/pkg-descr b/editors/semi-xemacs21-mule/pkg-descr
index 3d37ba5..e2ac016 100644
--- a/editors/semi-xemacs21-mule/pkg-descr
+++ b/editors/semi-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
diff --git a/editors/semi-xemacs21-mule/pkg-plist b/editors/semi-xemacs21-mule/pkg-plist
index 1945079..287a423 100644
--- a/editors/semi-xemacs21-mule/pkg-plist
+++ b/editors/semi-xemacs21-mule/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -42,4 +43,4 @@
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index c978380..41069a4 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	semi-current for xemacs-mule
+# New ports collection makefile for:	semi-current for xemacs21-mule
 # Version required:	1.13.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=	semi
+XEMACS_PKGVER=	1.18
+#XEMACS_PKGVER!=	grep version ${.CURDIR}/../semi-emacs/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi113-xemacs21-mule/pkg-comment b/editors/semi113-xemacs21-mule/pkg-comment
index dbbb7df..cecdd81 100644
--- a/editors/semi113-xemacs21-mule/pkg-comment
+++ b/editors/semi113-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi113-xemacs21-mule/pkg-descr b/editors/semi113-xemacs21-mule/pkg-descr
index 3d37ba5..e2ac016 100644
--- a/editors/semi113-xemacs21-mule/pkg-descr
+++ b/editors/semi113-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
diff --git a/editors/semi113-xemacs21-mule/pkg-plist b/editors/semi113-xemacs21-mule/pkg-plist
index 1945079..287a423 100644
--- a/editors/semi113-xemacs21-mule/pkg-plist
+++ b/editors/semi113-xemacs21-mule/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -42,4 +43,4 @@
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
diff --git a/editors/semi113/pkg-comment.xemacs21-mule b/editors/semi113/pkg-comment.xemacs21-mule
index dbbb7df..cecdd81 100644
--- a/editors/semi113/pkg-comment.xemacs21-mule
+++ b/editors/semi113/pkg-comment.xemacs21-mule
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi113/pkg-descr.xemacs21-mule b/editors/semi113/pkg-descr.xemacs21-mule
index 3d37ba5..e2ac016 100644
--- a/editors/semi113/pkg-descr.xemacs21-mule
+++ b/editors/semi113/pkg-descr.xemacs21-mule
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
+SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
diff --git a/editors/semi113/pkg-plist.xemacs21-mule b/editors/semi113/pkg-plist.xemacs21-mule
index 1945079..287a423 100644
--- a/editors/semi113/pkg-plist.xemacs21-mule
+++ b/editors/semi113/pkg-plist.xemacs21-mule
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -42,4 +43,4 @@
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile
index 73a74f7..c8955cc 100644
--- a/editors/wemi-xemacs21-mule-current/Makefile
+++ b/editors/wemi-xemacs21-mule-current/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	wemi-current for xemacs-mule
+# New ports collection makefile for:	wemi-current for xemacs21-mule
 # Version required:	1.13.7
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,25 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=		semi
+XEMACS_PKGNAME_ALT=	wemi
+XEMACS_PKGVER=		1.18
+#XEMACS_PKGVER!=	grep version ${MASTERDIR}/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME_ALT}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 WEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/wemi-xemacs21-mule-current/pkg-comment b/editors/wemi-xemacs21-mule-current/pkg-comment
index 1478af0..4f98e9c 100644
--- a/editors/wemi-xemacs21-mule-current/pkg-comment
+++ b/editors/wemi-xemacs21-mule-current/pkg-comment
@@ -1 +1 @@
-WEMI, Library of MIME feature for GNU Emacs (branch of SEMI kernel package)
+WEMI, Library of MIME feature for xemacs21-mule (branch of SEMI kernel package)
diff --git a/editors/wemi-xemacs21-mule-current/pkg-descr b/editors/wemi-xemacs21-mule-current/pkg-descr
index 52c346c..6f27caa 100644
--- a/editors/wemi-xemacs21-mule-current/pkg-descr
+++ b/editors/wemi-xemacs21-mule-current/pkg-descr
@@ -1,4 +1,4 @@
-WEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
+WEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   WEMI is a branch of SEMI kernel package using widget.  It is a
   library to provide MIME feature for GNU Emacs based on SEMI API.
diff --git a/editors/wemi-xemacs21-mule-current/pkg-plist b/editors/wemi-xemacs21-mule-current/pkg-plist
index 3a823d2..ca1230c 100644
--- a/editors/wemi-xemacs21-mule-current/pkg-plist
+++ b/editors/wemi-xemacs21-mule-current/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -43,4 +44,4 @@
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
 share/semi/%%WEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile
index 16cc027..037253d 100644
--- a/editors/wemi-xemacs21-mule/Makefile
+++ b/editors/wemi-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	wemi for xemacs-mule
+# New ports collection makefile for:	wemi for xemacs21-mule
 # Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/site-packages
 # packages-subdirectories which this port requires
 EMACS_PACKAGES_SUBDIRS= info lisp man pkginfo
@@ -42,7 +42,25 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.semi
+
+# xemacs package
+XEMACS_PKGNAME=		semi
+XEMACS_PKGNAME_ALT=	wemi
+XEMACS_PKGVER=  	1.13
+#XEMACS_PKGVER!=	grep version ${MASTERDIR}/files/_pkg.el | \
+#		sed 's/.*:version \([0-9.]*\).*/\1/'
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME_ALT}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME} \
+			info/mime-ui-en.info info/mime-ui-ja.info \
+			man/${XEMACS_PKGNAME}
+
 # package documents
 WEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/wemi-xemacs21-mule/pkg-comment b/editors/wemi-xemacs21-mule/pkg-comment
index 1478af0..4f98e9c 100644
--- a/editors/wemi-xemacs21-mule/pkg-comment
+++ b/editors/wemi-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-WEMI, Library of MIME feature for GNU Emacs (branch of SEMI kernel package)
+WEMI, Library of MIME feature for xemacs21-mule (branch of SEMI kernel package)
diff --git a/editors/wemi-xemacs21-mule/pkg-descr b/editors/wemi-xemacs21-mule/pkg-descr
index 0a7fc9d..6f27caa 100644
--- a/editors/wemi-xemacs21-mule/pkg-descr
+++ b/editors/wemi-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-WEMI, Library of MIME feature for GNU Emacs for xemacs.
+WEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
 
   WEMI is a branch of SEMI kernel package using widget.  It is a
   library to provide MIME feature for GNU Emacs based on SEMI API.
diff --git a/editors/wemi-xemacs21-mule/pkg-plist b/editors/wemi-xemacs21-mule/pkg-plist
index f5952e5..673b2d4 100644
--- a/editors/wemi-xemacs21-mule/pkg-plist
+++ b/editors/wemi-xemacs21-mule/pkg-plist
@@ -3,6 +3,7 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/README.en
 %%EMACS_PACKAGESDIR%%/lisp/semi/TODO
 %%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
@@ -43,4 +44,4 @@
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
 share/semi/%%SEMI_COOKIE%%
 share/semi/%%WEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
+@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)