diff options
| -rw-r--r-- | editors/apel-emacs/Makefile | 29 | ||||
| -rw-r--r-- | editors/apel-emacs/distinfo | 2 | ||||
| -rw-r--r-- | editors/apel-emacs/pkg-plist | 10 | ||||
| -rw-r--r-- | editors/apel-emacs20/Makefile | 6 | ||||
| -rw-r--r-- | editors/apel-emacs20/pkg-plist | 85 | ||||
| -rw-r--r-- | editors/apel-mule/Makefile | 8 | ||||
| -rw-r--r-- | editors/apel-mule/pkg-plist | 10 | ||||
| -rw-r--r-- | editors/apel-xemacs/Makefile | 7 | ||||
| -rw-r--r-- | editors/apel-xemacs/pkg-plist | 10 | ||||
| -rw-r--r-- | editors/apel-xemacs20/pkg-plist | 10 | ||||
| -rw-r--r-- | editors/apel-xemacs21-mule/Makefile | 12 | ||||
| -rw-r--r-- | editors/apel-xemacs21-mule/pkg-plist | 6 | ||||
| -rw-r--r-- | editors/apel/Makefile | 29 | ||||
| -rw-r--r-- | editors/apel/distinfo | 2 | ||||
| -rw-r--r-- | editors/apel/pkg-plist.emacs19 | 10 | ||||
| -rw-r--r-- | editors/apel/pkg-plist.emacs20 | 85 | ||||
| -rw-r--r-- | editors/apel/pkg-plist.emacs21 | 85 | ||||
| -rw-r--r-- | editors/apel/pkg-plist.mule | 10 | ||||
| -rw-r--r-- | editors/apel/pkg-plist.xemacs21-mule | 6 |
19 files changed, 210 insertions, 212 deletions
diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile index 4739dd821463..9e8f45366158 100644 --- a/editors/apel-emacs/Makefile +++ b/editors/apel-emacs/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTNAME= apel-${EMACS_PORT} +PORTNAME= apel-${EMACS_PORT_NAME} PORTVERSION= ${APEL_VER} CATEGORIES= editors elisp MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \ @@ -15,7 +15,7 @@ DISTNAME= apel-${APEL_VER} MAINTAINER?= shige@FreeBSD.org # distfile version -APEL_VER= 9.23 +APEL_VER= 10.2 # setupel filename APEL_SETUPEL= apel-setupel.el # document install directory by install-doc target @@ -26,27 +26,16 @@ PORTCLASS?= master # emacs port setup .if (${PORTCLASS} == "master") -EMACS_NAME= emacs -EMACS_PORT= emacs -EMACS_VER= 19.34 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +EMACS_PORT_NAME= emacs # emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif +.include <bsd.port.pre.mk> + # target name for make build ALL_TARGET?= elc -.if defined(EMACS_PORT) -EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common -.else -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.endif - # depends on custom: emacs-19.34 or mule-19.34 .if (${EMACS_VER} == "19.34") BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT} @@ -66,12 +55,6 @@ PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL} MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} -.else -.BEGIN: - @${ECHO} "Error: Bad port." - @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER." - @${FALSE} -.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -132,4 +115,4 @@ manifest-install: @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/editors/apel-emacs/distinfo b/editors/apel-emacs/distinfo index 0d9372286a87..b7c7bc5cc9a9 100644 --- a/editors/apel-emacs/distinfo +++ b/editors/apel-emacs/distinfo @@ -1 +1 @@ -MD5 (apel-9.23.tar.gz) = 22c1e3f4195dbc52f6fc0d072536c2dc +MD5 (apel-10.2.tar.gz) = 91c99095a1be84fc05753fab31a8f7a1 diff --git a/editors/apel-emacs/pkg-plist b/editors/apel-emacs/pkg-plist index bc826dc97665..d4a0c8b4d376 100644 --- a/editors/apel-emacs/pkg-plist +++ b/editors/apel-emacs/pkg-plist @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -22,6 +22,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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 @@ -36,6 +38,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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 diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile index dd2842b8a084..4062df0cbbb8 100644 --- a/editors/apel-emacs20/Makefile +++ b/editors/apel-emacs20/Makefile @@ -13,11 +13,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup -EMACS_NAME= emacs -EMACS_PORT= emacs20 -EMACS_VER= 20.6 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +EMACS_PORT_NAME= emacs20 # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/apel-emacs20/pkg-plist b/editors/apel-emacs20/pkg-plist index 296db5f55dac..fdddc2c7fd1c 100644 --- a/editors/apel-emacs20/pkg-plist +++ b/editors/apel-emacs20/pkg-plist @@ -3,53 +3,54 @@ %%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%%/%%EMACS_VER%%/site-lisp/emu/broken.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/inv-19.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%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/pccl-20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-20.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/pcustom.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/apel -@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu +@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu %%APELDOCDIR%%/ChangeLog %%APELDOCDIR%%/README.en %%APELDOCDIR%%/README.ja diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile index 440172bcf444..1353f8dc98b1 100644 --- a/editors/apel-mule/Makefile +++ b/editors/apel-mule/Makefile @@ -13,14 +13,8 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup -EMACS_NAME= mule -EMACS_PORT= mule -EMACS_VER= 19.34 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +EMACS_PORT_NAME= mule -# RUN_DEPENDS port name's suffix is '-common'. -HAVE_COMMON_PORT= YES # emacs requires *-setupel.el REQUIRE_SETUPEL= YES diff --git a/editors/apel-mule/pkg-plist b/editors/apel-mule/pkg-plist index 4c87ee8b15bc..5b05db856349 100644 --- a/editors/apel-mule/pkg-plist +++ b/editors/apel-mule/pkg-plist @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -24,6 +24,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pccl-om.el @@ -40,6 +42,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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 diff --git a/editors/apel-xemacs/Makefile b/editors/apel-xemacs/Makefile index d5e7eff43b1a..2c1dc16aec9d 100644 --- a/editors/apel-xemacs/Makefile +++ b/editors/apel-xemacs/Makefile @@ -13,12 +13,7 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup -EMACS_NAME= xemacs -EMACS_PORT= xemacs -EMACS_VER= 19.16 -EMACS_LIBDIR= lib/${EMACS_NAME} -# xemacs-19.16 has no version specific site-lisp directories. -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR} +EMACS_PORT_NAME= xemacs # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/apel-xemacs/pkg-plist b/editors/apel-xemacs/pkg-plist index fc37fa39c0d5..15e04ee95eb8 100644 --- a/editors/apel-xemacs/pkg-plist +++ b/editors/apel-xemacs/pkg-plist @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -21,6 +21,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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 @@ -37,6 +39,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el diff --git a/editors/apel-xemacs20/pkg-plist b/editors/apel-xemacs20/pkg-plist index 93ca39659317..1f1eccee7e26 100644 --- a/editors/apel-xemacs20/pkg-plist +++ b/editors/apel-xemacs20/pkg-plist @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -22,6 +22,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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 @@ -38,6 +40,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile index 2a3c3bf5d5db..530d7b531629 100644 --- a/editors/apel-xemacs21-mule/Makefile +++ b/editors/apel-xemacs21-mule/Makefile @@ -13,22 +13,18 @@ PORTCLASS= slave MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup -EMACS_NAME= xemacs -EMACS_PORT= xemacs21-mule -EMACS_VER= 21.1.9 -EMACS_CMD= ${PREFIX}/bin/${EMACS_PORT} -EMACS_LIBDIR= lib/${EMACS_NAME} +EMACS_PORT_NAME= xemacs21-mule EMACS_PACKAGESDIR= ${EMACS_LIBDIR}/site-packages # packages-subdirectories which this port requires EMACS_PACKAGES_SUBDIRS= lisp pkginfo +SCRIPTS_ENV+= EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} +PLIST_SUB+= EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} + # how to install ALL_TARGET= package INSTALL_TARGET= install-package -# RUN_DEPENDS port name's suffix is '-common'. -HAVE_COMMON_PORT= YES - # use pkg/* files in ${.CURDIR} PKGDIR= ${.CURDIR}/pkg diff --git a/editors/apel-xemacs21-mule/pkg-plist b/editors/apel-xemacs21-mule/pkg-plist index e3507b4f37ee..c2038d6f4a35 100644 --- a/editors/apel-xemacs21-mule/pkg-plist +++ b/editors/apel-xemacs21-mule/pkg-plist @@ -7,6 +7,8 @@ %%EMACS_PACKAGESDIR%%/lisp/apel/alist.elc %%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.el %%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.el +%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.elc %%EMACS_PACKAGESDIR%%/lisp/apel/broken.el %%EMACS_PACKAGESDIR%%/lisp/apel/broken.elc %%EMACS_PACKAGESDIR%%/lisp/apel/calist.el @@ -57,6 +59,10 @@ %%EMACS_PACKAGESDIR%%/lisp/apel/poem.elc %%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.el %%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/product.el +%%EMACS_PACKAGESDIR%%/lisp/apel/product.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/pym.el +%%EMACS_PACKAGESDIR%%/lisp/apel/pym.elc %%EMACS_PACKAGESDIR%%/lisp/apel/richtext.el %%EMACS_PACKAGESDIR%%/lisp/apel/richtext.elc %%EMACS_PACKAGESDIR%%/lisp/apel/static.el diff --git a/editors/apel/Makefile b/editors/apel/Makefile index 4739dd821463..9e8f45366158 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTNAME= apel-${EMACS_PORT} +PORTNAME= apel-${EMACS_PORT_NAME} PORTVERSION= ${APEL_VER} CATEGORIES= editors elisp MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \ @@ -15,7 +15,7 @@ DISTNAME= apel-${APEL_VER} MAINTAINER?= shige@FreeBSD.org # distfile version -APEL_VER= 9.23 +APEL_VER= 10.2 # setupel filename APEL_SETUPEL= apel-setupel.el # document install directory by install-doc target @@ -26,27 +26,16 @@ PORTCLASS?= master # emacs port setup .if (${PORTCLASS} == "master") -EMACS_NAME= emacs -EMACS_PORT= emacs -EMACS_VER= 19.34 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER} +EMACS_PORT_NAME= emacs # emacs requires *-setupel.el REQUIRE_SETUPEL= YES .endif +.include <bsd.port.pre.mk> + # target name for make build ALL_TARGET?= elc -.if defined(EMACS_PORT) -EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} -BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES") -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common -.else -RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} -.endif - # depends on custom: emacs-19.34 or mule-19.34 .if (${EMACS_VER} == "19.34") BUILD_DEPENDS+= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT} @@ -66,12 +55,6 @@ PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL} MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} -.else -.BEGIN: - @${ECHO} "Error: Bad port." - @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER." - @${FALSE} -.endif pre-configure: .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES") @@ -132,4 +115,4 @@ manifest-install: @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/editors/apel/distinfo b/editors/apel/distinfo index 0d9372286a87..b7c7bc5cc9a9 100644 --- a/editors/apel/distinfo +++ b/editors/apel/distinfo @@ -1 +1 @@ -MD5 (apel-9.23.tar.gz) = 22c1e3f4195dbc52f6fc0d072536c2dc +MD5 (apel-10.2.tar.gz) = 91c99095a1be84fc05753fab31a8f7a1 diff --git a/editors/apel/pkg-plist.emacs19 b/editors/apel/pkg-plist.emacs19 index bc826dc97665..d4a0c8b4d376 100644 --- a/editors/apel/pkg-plist.emacs19 +++ b/editors/apel/pkg-plist.emacs19 @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -22,6 +22,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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 @@ -36,6 +38,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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 diff --git a/editors/apel/pkg-plist.emacs20 b/editors/apel/pkg-plist.emacs20 index 296db5f55dac..fdddc2c7fd1c 100644 --- a/editors/apel/pkg-plist.emacs20 +++ b/editors/apel/pkg-plist.emacs20 @@ -3,53 +3,54 @@ %%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%%/%%EMACS_VER%%/site-lisp/emu/broken.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/inv-19.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%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/pccl-20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-20.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/pcustom.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/apel -@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu +@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu %%APELDOCDIR%%/ChangeLog %%APELDOCDIR%%/README.en %%APELDOCDIR%%/README.ja diff --git a/editors/apel/pkg-plist.emacs21 b/editors/apel/pkg-plist.emacs21 index 296db5f55dac..fdddc2c7fd1c 100644 --- a/editors/apel/pkg-plist.emacs21 +++ b/editors/apel/pkg-plist.emacs21 @@ -3,53 +3,54 @@ %%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%%/%%EMACS_VER%%/site-lisp/emu/broken.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el -%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/inv-19.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%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/pccl-20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-20.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/pcustom.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.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-e20.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc @dirrm %%EMACS_LIBDIR%%/site-lisp/apel -@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu +@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu %%APELDOCDIR%%/ChangeLog %%APELDOCDIR%%/README.en %%APELDOCDIR%%/README.ja diff --git a/editors/apel/pkg-plist.mule b/editors/apel/pkg-plist.mule index 4c87ee8b15bc..5b05db856349 100644 --- a/editors/apel/pkg-plist.mule +++ b/editors/apel/pkg-plist.mule @@ -6,10 +6,10 @@ %%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/apel-ver.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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 @@ -24,6 +24,8 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pccl-om.el @@ -40,6 +42,10 @@ %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.el %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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 diff --git a/editors/apel/pkg-plist.xemacs21-mule b/editors/apel/pkg-plist.xemacs21-mule index e3507b4f37ee..c2038d6f4a35 100644 --- a/editors/apel/pkg-plist.xemacs21-mule +++ b/editors/apel/pkg-plist.xemacs21-mule @@ -7,6 +7,8 @@ %%EMACS_PACKAGESDIR%%/lisp/apel/alist.elc %%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.el %%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.el +%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.elc %%EMACS_PACKAGESDIR%%/lisp/apel/broken.el %%EMACS_PACKAGESDIR%%/lisp/apel/broken.elc %%EMACS_PACKAGESDIR%%/lisp/apel/calist.el @@ -57,6 +59,10 @@ %%EMACS_PACKAGESDIR%%/lisp/apel/poem.elc %%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.el %%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/product.el +%%EMACS_PACKAGESDIR%%/lisp/apel/product.elc +%%EMACS_PACKAGESDIR%%/lisp/apel/pym.el +%%EMACS_PACKAGESDIR%%/lisp/apel/pym.elc %%EMACS_PACKAGESDIR%%/lisp/apel/richtext.el %%EMACS_PACKAGESDIR%%/lisp/apel/richtext.elc %%EMACS_PACKAGESDIR%%/lisp/apel/static.el |