4 files changed, 38 insertions, 69 deletions

diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index a76ecc50905d..2ed83bd513bc 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wemi-${EMACS_PORT}
+PORTNAME=	wemi
 PORTVERSION=	${WEMI_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/wemi/
-DISTNAME=	wemi-${WEMI_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
 
@@ -22,63 +22,32 @@ WEMI_VER=	1.13.7
 WEMI_SETUPEL=	wemi-setupel.el
 # document install directory by install-doc target
 WEMIDOCDIR?=	share/doc/semi
-FLIM_COOKIE=	flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE=	semi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
-WEMI_COOKIE=	wemi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
+FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
+WEMI_COOKIE=	wemi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
-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
 # whether emacs requires *-setupel.el
-REQUIRE_SETUPEL=  YES
+REQUIRE_SETUPEL=	YES
 .endif
 
 # 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(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.endif
-SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		TARGETS="${WEMI_SETUPEL}"
-PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+=	TARGETS="${WEMI_SETUPEL}"
+PLIST_SUB+=	WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
 		SEMI_COOKIE=${SEMI_COOKIE} WEMI_COOKIE=${WEMI_COOKIE}
-MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-.endif
-# depends on apel (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=   ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.endif
+
+.if defined(EMACS_PORT_NAME)
 # depends on flim
-BUILD_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+=	${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+	@${ECHO} "You must define EMACS_PORT_NAME."
 	@${FALSE}
 .endif
 
@@ -119,9 +88,9 @@ pre-install:
 .endif
 
 post-install:
-	@${MKDIR} -p ${PREFIX}/share/semi
-	@${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
-	@${TOUCH} ${PREFIX}/share/semi/${WEMI_COOKIE}
+	@${MKDIR} -p ${LOCALBASE}/share/semi
+	@${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
+	@${TOUCH} ${LOCALBASE}/share/semi/${WEMI_COOKIE}
 .if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
 	@${MAKE} setupel-install
 .endif
@@ -147,7 +116,7 @@ info-build:
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
 		${MAKEINFO} $${i} || ${TRUE} ; \
 	done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
@@ -161,7 +130,7 @@ info-build-by-emacs:
 	for i in mime-ui-en.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
 	done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -175,38 +144,38 @@ pkg-el-copy:
 
 pkg-el-install:
 	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+	${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
 	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
-		${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
 	fi)
 
 mkdir-site-packages:
 	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-		${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+		${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
 	done)
 
 doc-install:
-	@${MKDIR} ${PREFIX}/${WEMIDOCDIR}
+	@${MKDIR} ${LOCALBASE}/${WEMIDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${WEMIDOCDIR}/ ; \
+		${INSTALL_DATA} $${i} ${LOCALBASE}/${WEMIDOCDIR}/ ; \
 	done)
 
 setupel-install:
 	@${INSTALL_DATA} ${WRKDIR}/${WEMI_SETUPEL} \
-		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+		${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 
 info-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
-		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+		install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
 	done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
-		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+		install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
 	done)
 .endif
 
@@ -214,12 +183,12 @@ info-package-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+			${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
 	done ; \
-	${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+	${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+			${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
 	done)
 
 manifest-install:
@@ -227,6 +196,6 @@ manifest-install:
 	@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+		${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
 
 .include <bsd.port.post.mk>
diff --git a/editors/wemi-emacs-current/files/wemi-setupel.el.in b/editors/wemi-emacs-current/files/wemi-setupel.el.in
index 0affa03ed64d..e7b324fe6497 100644
--- a/editors/wemi-emacs-current/files/wemi-setupel.el.in
+++ b/editors/wemi-emacs-current/files/wemi-setupel.el.in
@@ -3,6 +3,6 @@
 ;;                                            --  by shige@FreeBSD.ORG
 
 (setq load-path (append '(
-	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
  ) load-path))
 (provide 'wemi-setupel)
diff --git a/editors/wemi-emacs-current/pkg-descr b/editors/wemi-emacs-current/pkg-descr
index b6288fb1c74a..c30705076724 100644
--- a/editors/wemi-emacs-current/pkg-descr
+++ b/editors/wemi-emacs-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for emacs.
   MUAs.  They are released as separated packages.
 
   WEMI is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/semi/	--- WEMI
+	${LOCALBASE}/share/emacs/site-lisp/semi/	--- WEMI
 
 *** Caution!! ***
 
diff --git a/editors/wemi-emacs-current/scripts/configure b/editors/wemi-emacs-current/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/wemi-emacs-current/scripts/configure
+++ b/editors/wemi-emacs-current/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
 	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-		-e "s;@@PREFIX@@;${PREFIX};g" \
+		-e "s;@@LOCALBASE@@;${LOCALBASE};g" \
 		-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
 		-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
 		-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \