Update to 10.2.

Use EMACS_PORT_NAME and other related variables defined in bsd.emacs.mk.

3 files changed, 15 insertions, 26 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