3 files changed, 91 insertions, 74 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index cfb84bd18f10..1c261b890b64 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -15,8 +15,10 @@ MAINTAINER?=	shige@FreeBSD.org
 
 # distfile version
 APEL_VER=	9.20
+# setupel filename
 APEL_SETUPEL=	apel-setupel.el
-APELDOCDIR=	share/doc/apel
+# document install directory by install-doc target
+APELDOCDIR?=	share/doc/apel
 
 # This is a master port.
 PORTCLASS?=	master
@@ -35,15 +37,6 @@ REQUIRE_SETUPEL=  YES
 # target name for make build
 ALL_TARGET?=	elc
 
-# if RUN_DEPENDS emacs port name has the suffix `-common'
-.if !defined(HAVE_COMMON_PORT)
-HAVE_COMMON_PORT=	NO
-.endif
-# if RUN_DEPENDS emacs needs setup elisp
-.if !defined(REQUIRE_SETUPEL)
-REQUIRE_SETUPEL=	NO
-.endif
-
 .if defined(EMACS_PORT)
 PKGNAME=	apel-${EMACS_PORT}-${APEL_VER}
 EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
@@ -60,11 +53,13 @@ BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDI
 RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		TARGETS="${APEL_SETUPEL}"
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
 MAKE_FLAGS+=	EMACS=${EMACS_CMD}
 .else
@@ -74,22 +69,40 @@ MAKE_FLAGS+=	EMACS=${EMACS_CMD}
 	@${FALSE}
 .endif
 
-.if (${REQUIRE_SETUPEL} == "YES")
 pre-configure:
+.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
 .endif
 
 post-install:
+.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
+	@${MAKE} setupel-install
+.endif
+.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
+	@${MAKE} manifest-install
+.endif
 .if !defined(NOPORTDOCS)
+	@${MAKE} doc-install
+.endif
+
+
+# install functions
+doc-install:
 	@${MKDIR} ${PREFIX}/${APELDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog README.* ; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/${APELDOCDIR}/ ; \
 	done)
-.endif
-.if (${REQUIRE_SETUPEL} == "YES")
+
+setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-.endif
+
+manifest-install:
+	@${RM} -f ${WRKDIR}/${MANIFEST}
+	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
+		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
+	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.mk>
diff --git a/editors/apel/pkg-descr.xemacs21-mule b/editors/apel/pkg-descr.xemacs21-mule
index fb523ef30389..fc6bfe11b126 100644
--- a/editors/apel/pkg-descr.xemacs21-mule
+++ b/editors/apel/pkg-descr.xemacs21-mule
@@ -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/pkg-plist.xemacs21-mule b/editors/apel/pkg-plist.xemacs21-mule
index d718bc196455..ef1fb4ef0112 100644
--- a/editors/apel/pkg-plist.xemacs21-mule
+++ b/editors/apel/pkg-plist.xemacs21-mule
@@ -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