Fix for xemacs-mule-21.1.6.

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

3 files changed, 72 insertions, 60 deletions

diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index 07cf5a4f8b9c..b0c6d8cd5de2 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -17,8 +17,11 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
 EMACS_VER=	21.1.6
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
+EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/${EMACS_NAME}-packages
+
+# how to install
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
@@ -26,4 +29,9 @@ HAVE_COMMON_PORT=	YES
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
+# package info manifest
+MANIFEST=	MANIFEST.apel
+# package documents
+APELDOCDIR=	${EMACS_PACKAGESDIR}/lisp/apel
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/apel-xemacs21-mule/pkg-descr b/editors/apel-xemacs21-mule/pkg-descr
index fb523ef30389..fc6bfe11b126 100644
--- a/editors/apel-xemacs21-mule/pkg-descr
+++ b/editors/apel-xemacs21-mule/pkg-descr
@@ -26,7 +26,6 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - static: utility for static evaluation
 
   APEL is installed the following directory tree:
-	${PREFIX}/lib/xemacs-20.4/site-lisp/apel/	--- apel
-	${PREFIX}/lib/xemacs-20.4/site-lisp/emu/	--- emu
+	${PREFIX}/lib/xemacs/xemacs-packages/lisp/apel/	--- apel & emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel-xemacs21-mule/pkg-plist b/editors/apel-xemacs21-mule/pkg-plist
index d718bc196455..ef1fb4ef0112 100644
--- a/editors/apel-xemacs21-mule/pkg-plist
+++ b/editors/apel-xemacs21-mule/pkg-plist
@@ -1,56 +1,61 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.el
-%%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-xemacs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-xemacs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-xm.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-xm.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20_2.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20_2.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe-xemacs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe-xemacs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-xm.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-xm.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
-%%APELDOCDIR%%/ChangeLog
-%%APELDOCDIR%%/README.en
-%%APELDOCDIR%%/README.ja
-@dirrm %%APELDOCDIR%%
+%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.apel
+%%EMACS_PACKAGESDIR%%/lisp/apel/ChangeLog
+%%EMACS_PACKAGESDIR%%/lisp/apel/README.en
+%%EMACS_PACKAGESDIR%%/lisp/apel/README.ja
+%%EMACS_PACKAGESDIR%%/lisp/apel/alist.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/alist.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/broken.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/broken.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/calist.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/calist.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/custom-load.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/emu.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/emu.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/filename.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/filename.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/install.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/install.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/inv-xemacs.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/inv-xemacs.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/invisible.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/invisible.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcharset.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcharset.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-20.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-20.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/path-util.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/path-util.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pccl-20.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pccl-20.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pccl.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pccl.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-20.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-20.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xfc.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xfc.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xm.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xm.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pces.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/pcustom.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/pcustom.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/poe-xemacs.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/poe-xemacs.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/poe.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/poe.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/poem.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/poem.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/richtext.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/richtext.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/static.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/static.elc
+@dirrm %%EMACS_PACKAGESDIR%%/lisp/apel