3 files changed, 21 insertions, 8 deletions

diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile
index ede04f158415..e9b458d95a10 100644
--- a/editors/wemi-xemacs21-mule/Makefile
+++ b/editors/wemi-xemacs21-mule/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	wemi for xemacs-mule
-# Version required:	1.8.6
+# Version required:	1.13.4
 # Date created:		25 July 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -24,7 +24,15 @@ ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
-HAVE_COMMON_PORT=	YES
+HAS_COMMON_PORT=	YES
+
+# whether emacs has mule feature
+HAS_MULE=		YES
+
+# whether building info files by emacs or makeinfo
+BUILD_INFO_BY_EMACS=	YES
+# texinfo packages
+BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/texinfo/texinfo.el:${PORTSDIR}/editors/xemacs-sumo-packages
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs21-mule/pkg-descr b/editors/wemi-xemacs21-mule/pkg-descr
index 8f32e408d2ff..3562a77221c1 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-mule.
+WEMI, Library of MIME feature for GNU Emacs for xemacs.
 
   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.
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
   MUAs.  They are released as separated packages.
 
   WEMI is installed the following directory tree:
-	${PREFIX}/lib/xemacs/xemacs-packages/lisp/semi/	--- WEMI
+	${PREFIX}/lib/xemacs/site-lisp/semi/	--- WEMI
 
 *** Caution!! ***
 
diff --git a/editors/wemi-xemacs21-mule/pkg-plist b/editors/wemi-xemacs21-mule/pkg-plist
index 081c51f45c29..f5952e5f6124 100644
--- a/editors/wemi-xemacs21-mule/pkg-plist
+++ b/editors/wemi-xemacs21-mule/pkg-plist
@@ -10,23 +10,25 @@
 %%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el
+@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-text.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-text.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el
+@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el
 %%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.elc
 %%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.el
@@ -39,3 +41,6 @@
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-en.texi
 %%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
 @dirrm %%EMACS_PACKAGESDIR%%/man/semi
+share/semi/%%SEMI_COOKIE%%
+share/semi/%%WEMI_COOKIE%%
+@unexec /bin/rmdir %D/share/semi || true