4 files changed, 24 insertions, 6 deletions

diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 7a2a4be8bbfe..4c3b780a5e0a 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 f4aa16540e62..e0bf6ba11318 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 df743dad018c..f5b3afbb48d9 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 03ace5a64cff..d592fb56994b 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)