9 files changed, 78 insertions, 81 deletions

diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index c3c97540f6ac..210bd83f7dec 100644
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bitmap-${EMACS_PORT_NAME}
+PORTNAME=	bitmap
 PORTVERSION=	${BITMAP_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/
 DISTNAME=	bitmap-mule-${BITMAP_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	shige@FreeBSD.org
 
@@ -24,29 +25,30 @@ EMACS_PORT_NAME=	emacs20
 # target name for make build
 ALL_TARGET=	elc
 
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME} \
-		uncompface:${PORTSDIR}/mail/faces
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME} \
-		${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		BITMAPDOCDIR=${BITMAPDOCDIR}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
+RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
+PLIST_SUB=	BITMAPDOCDIR=${BITMAPDOCDIR}
 
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+.else
+.BEGIN:
+	@${ECHO} "Error: Bad port."
+	@${ECHO} "You must define EMACS_PORT_NAME."
+	@${FALSE}
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
+	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/bitmap-emacs20/pkg-descr b/editors/bitmap-emacs20/pkg-descr
index 714d6a714511..9073ffc9d4db 100644
--- a/editors/bitmap-emacs20/pkg-descr
+++ b/editors/bitmap-emacs20/pkg-descr
@@ -13,6 +13,6 @@ Bitmap-mule, Package to use bitmap in Emacs20.
 	- vm-bitmap.el:		VM related functions for x-face-mule.el
 
   Bitmap-mule is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
+	${LOCALBASE}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
 
 --- Porting by shige <shige@FreeBSD.org>
diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile
index 2280907933d2..75a138051de1 100644
--- a/editors/bitmap-mule/Makefile
+++ b/editors/bitmap-mule/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bitmap-${EMACS_PORT_NAME}
+PORTNAME=	bitmap
 PORTVERSION=	${BITMAP_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/
-DISTNAME=	bitmap-mule-${BITMAP_VER}
+DISTNAME=	${PORTNAME}-mule-${BITMAP_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	shige@FreeBSD.org
 
@@ -22,32 +23,40 @@ BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 # mule-19.34
 EMACS_PORT_NAME=	mule
 
-.include <bsd.port.pre.mk>
 
 # target name for make build
 ALL_TARGET?=	elc
 
-BUILD_DEPENDS+=	uncompface:${PORTSDIR}/mail/faces
-RUN_DEPENDS+=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
-SCRIPTS_ENV+=	TARGETS=${BITMAP_SETUPEL}
-PLIST_SUB+=	BITMAP_SETUPEL=${BITMAP_SETUPEL} \
+BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
+RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
+SCRIPTS_ENV=	TARGETS=${BITMAP_SETUPEL}
+PLIST_SUB=	BITMAP_SETUPEL=${BITMAP_SETUPEL} \
 		BITMAPDOCDIR=${BITMAPDOCDIR}
 
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+.else
+.BEGIN:
+	@${ECHO} "Error: Bad port."
+	@${ECHO} "You must define EMACS_PORT_NAME."
+	@${FALSE}
+.endif
 
 pre-configure:
 	@${CP} ${FILESDIR}/${BITMAP_SETUPEL}.in ${WRKDIR}
 
 post-install:
 	@${INSTALL_DATA} ${WRKDIR}/${BITMAP_SETUPEL} \
-		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+		${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
+	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index c3c97540f6ac..210bd83f7dec 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bitmap-${EMACS_PORT_NAME}
+PORTNAME=	bitmap
 PORTVERSION=	${BITMAP_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/
 DISTNAME=	bitmap-mule-${BITMAP_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	shige@FreeBSD.org
 
@@ -24,29 +25,30 @@ EMACS_PORT_NAME=	emacs20
 # target name for make build
 ALL_TARGET=	elc
 
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME} \
-		uncompface:${PORTSDIR}/mail/faces
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME} \
-		${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		BITMAPDOCDIR=${BITMAPDOCDIR}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
+RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-font
+PLIST_SUB=	BITMAPDOCDIR=${BITMAPDOCDIR}
 
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+.else
+.BEGIN:
+	@${ECHO} "Error: Bad port."
+	@${ECHO} "You must define EMACS_PORT_NAME."
+	@${FALSE}
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${BITMAPDOCDIR}
+	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${BITMAPDOCDIR}/ ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${BITMAPDOCDIR}/ ; \
 	done)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/bitmap/pkg-descr.emacs20 b/editors/bitmap/pkg-descr.emacs20
index 714d6a714511..9073ffc9d4db 100644
--- a/editors/bitmap/pkg-descr.emacs20
+++ b/editors/bitmap/pkg-descr.emacs20
@@ -13,6 +13,6 @@ Bitmap-mule, Package to use bitmap in Emacs20.
 	- vm-bitmap.el:		VM related functions for x-face-mule.el
 
   Bitmap-mule is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
+	${LOCALBASE}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
 
 --- Porting by shige <shige@FreeBSD.org>
diff --git a/editors/custom-emacs/Makefile b/editors/custom-emacs/Makefile
index ea10d6836f85..13621382eea9 100644
--- a/editors/custom-emacs/Makefile
+++ b/editors/custom-emacs/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	custom-${EMACS_PORT}
+PORTNAME=	custom
 PORTVERSION=	${CUSTOM_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/ \
 		ftp://ftp.win.ne.jp/pub/word/elisp/
-DISTNAME=	custom-${CUSTOM_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
 
@@ -24,29 +24,17 @@ CUSTOM_ELS=	cus-edit.el cus-face.el custom.el \
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
-EMACS_NAME=	emacs
-EMACS_PORT=	emacs
-EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
-HAVE_COMMON_PORT= NO
+EMACS_PORT_NAME=	emacs
 .endif
 
-.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
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		CUSTOMDOCDIR=${CUSTOMDOCDIR}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
-.else
+PLIST_SUB=	CUSTOMDOCDIR=${CUSTOMDOCDIR}
+
+.include <bsd.port.pre.mk>
+
+.if !defined(EMACS_PORT_NAME)
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_PORT_NAME."
 	@${FALSE}
 .endif
 
@@ -54,15 +42,15 @@ MAKE_FLAGS=	EMACS=${EMACS_CMD}
 do-install:
 	@for i in ${CUSTOM_ELS} ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
+			${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
 		${INSTALL_DATA} ${WRKSRC}/$${i}c \
-			${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
+			${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/ ; \
 	done
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${CUSTOMDOCDIR}
+	@${MKDIR} ${LOCALBASE}/${CUSTOMDOCDIR}
 	@for i in ChangeLog TODO ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${CUSTOMDOCDIR} ; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${CUSTOMDOCDIR} ; \
 	done
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/custom-emacs/pkg-descr b/editors/custom-emacs/pkg-descr
index 4c959d14f619..3f89edd6be5e 100644
--- a/editors/custom-emacs/pkg-descr
+++ b/editors/custom-emacs/pkg-descr
@@ -19,7 +19,7 @@ How to use:
 	M-x customize
 
 Installed at:
-	${PREFIX}/share/emacs/19.34/site-lisp/
+	${LOCALBASE}/share/emacs/19.34/site-lisp/
 
 WWW: http://www.dina.kvl.dk/~abraham/custom/
 
diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile
index ef41f077304a..a6d38571c45e 100644
--- a/editors/custom-mule/Makefile
+++ b/editors/custom-mule/Makefile
@@ -13,11 +13,7 @@ PORTCLASS=	slave
 MASTERDIR=	${.CURDIR}/../../editors/custom-emacs
 
 # emacs port setup
-EMACS_NAME=	mule
-EMACS_PORT=	mule
-EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
-HAVE_COMMON_PORT= YES
+EMACS_PORT_NAME=	mule
 
 # pkg/* files but PLIST are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/custom-mule/pkg-descr b/editors/custom-mule/pkg-descr
index 3f18ff196108..45566db1770d 100644
--- a/editors/custom-mule/pkg-descr
+++ b/editors/custom-mule/pkg-descr
@@ -19,7 +19,7 @@ How to use:
 	M-x customize
 
 Installed at:
-	${PREFIX}/share/mule/19.34/site-lisp/
+	${LOCALBASE}/share/mule/19.34/site-lisp/
 
 WWW: http://www.dina.kvl.dk/~abraham/custom/