Fix for xemacs-21.1.6.

semi package should be compatible with xemacs-package on xemacs-21.x.

3 files changed, 52 insertions, 46 deletions

diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index 57afc342d732..ec5fee052d73 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -17,9 +17,11 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
 EMACS_VER=	21.1.6
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
-# xemacs-mule-21.1.6 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
+EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/${EMACS_NAME}-packages
+
+# how to make and install
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
@@ -27,4 +29,9 @@ HAVE_COMMON_PORT=	YES
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
+# package info manifest
+MANIFEST=	MANIFEST.semi
+# package documents
+SEMIDOCDIR=	${EMACS_PACKAGESDIR}/lisp/semi
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi-xemacs21-mule/pkg-descr b/editors/semi-xemacs21-mule/pkg-descr
index 33cd0e1cd755..042997f9b33d 100644
--- a/editors/semi-xemacs21-mule/pkg-descr
+++ b/editors/semi-xemacs21-mule/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs-mule.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${PREFIX}/lib/xemacs-20.4/site-lisp/semi/	--- SEMI
+	${PREFIX}/lib/xemacs/xemacs-packages/lisp/semi/	--- SEMI
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-xemacs21-mule/pkg-plist b/editors/semi-xemacs21-mule/pkg-plist
index b4b631429c13..081c51f45c29 100644
--- a/editors/semi-xemacs21-mule/pkg-plist
+++ b/editors/semi-xemacs21-mule/pkg-plist
@@ -1,42 +1,41 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-text.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
+%%EMACS_PACKAGESDIR%%/lisp/semi/ChangeLog
+%%EMACS_PACKAGESDIR%%/lisp/semi/NEWS
+%%EMACS_PACKAGESDIR%%/lisp/semi/README.en
+%%EMACS_PACKAGESDIR%%/lisp/semi/TODO
+%%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
+%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el
+%%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-view.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.elc
+%%EMACS_PACKAGESDIR%%/lisp/semi/signature.el
+%%EMACS_PACKAGESDIR%%/lisp/semi/signature.elc
+@dirrm %%EMACS_PACKAGESDIR%%/lisp/semi
+%%EMACS_PACKAGESDIR%%/info/mime-ui-en.info
+%%EMACS_PACKAGESDIR%%/info/mime-ui-ja.info
+%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-en.texi
+%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
+@dirrm %%EMACS_PACKAGESDIR%%/man/semi