7 files changed, 39 insertions, 85 deletions

diff --git a/editors/psgml-emacs/Makefile b/editors/psgml-emacs/Makefile
index 153acc823fea..957b12e08ce2 100644
--- a/editors/psgml-emacs/Makefile
+++ b/editors/psgml-emacs/Makefile
@@ -5,58 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	psgml-${EMACS_PORT}
+PORTNAME=	psgml
 PORTVERSION=	${PSGML_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/sgml/
-DISTNAME=	psgml-${PSGML_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
 
 # distfile version
 PSGML_VER=		1.2.1
 PSGML_STARTUPEL=	psgml-startup.el
-CATALOG=		${PREFIX}/share/sgml/catalog
+CATALOG=		${LOCALBASE}/share/sgml/catalog
+
+SCRIPTS_ENV=		TARGETS="${PSGML_STARTUPEL}"
+PLIST_SUB=		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 
 # This is a master port.
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
-EMACS_NAME=	emacs
-EMACS_PORT=	emacs
-EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_PORT_NAME=	emacs
 .endif
 
-# if RUN_DEPENDS emacs port name has the suffix `-common'
-.if !defined(HAS_COMMON_PORT)
-HAS_COMMON_PORT=	NO
-.endif
+.include <bsd.port.pre.mk>
 
 #
 # emacs ports setup
 #
-.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
+.if defined(EMACS_PORT_NAME)
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
-		--infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--lispdir=${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/psgml \
+		--infodir=${LOCALBASE}/info
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
-SCRIPTS_ENV=	TARGETS="${PSGML_STARTUPEL}" \
-		EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 .else
 .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
 
@@ -68,9 +53,9 @@ RUN_DEPENDS+=	${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
 pre-configure:
 	(cd ${WRKSRC} ; \
 	  for i in psgml.el psgml.texi ; do \
-	      ${RM} -f $${i}.in ; \
-	      ${MV} $${i} $${i}.in ; \
-	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
+	      ${RM} -f $${i}.in; \
+	      ${MV} $${i} $${i}.in; \
+	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${LOCALBASE};g" > $${i}; \
 	  done)
 	${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
 
@@ -79,6 +64,6 @@ post-install:
 		${MAKE} install-info ; \
 	)
 	@${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${LOCALBASE}/${EMACS_LIBDIR}/site-lisp
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index 0eca963c251f..5de6e48cd0ae 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -13,10 +13,7 @@ PORTCLASS=	slave
 MASTERDIR=	${.CURDIR}/../psgml-emacs
 
 # emacs port setup
-EMACS_NAME=	emacs
-EMACS_PORT=	emacs20
-EMACS_VER=	20.7
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_PORT_NAME=	emacs20
 
 # pkg/* files are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/psgml-emacs20/pkg-descr b/editors/psgml-emacs20/pkg-descr
index e95327d78adc..b93c2dd44a1b 100644
--- a/editors/psgml-emacs20/pkg-descr
+++ b/editors/psgml-emacs20/pkg-descr
@@ -11,7 +11,7 @@ editing of attribute values in a separate window with information about
 types and defaults, and structure based editing.
 
   PSGML is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/psgml/
+	${LOCALBASE}/share/emacs/site-lisp/psgml/
 
 To use psgml, put the following setup into your ~/.emacs:
 
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 7b2f9c81e975..df3e378cee83 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -13,13 +13,7 @@ PORTCLASS=	slave
 MASTERDIR=	${.CURDIR}/../../editors/psgml-emacs
 
 # emacs port setup
-EMACS_NAME=	mule
-EMACS_PORT=	mule
-EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
-
-# whether emacs has a *-common port
-HAS_COMMON_PORT=	YES
+EMACS_PORT_NAME=	mule
 
 # pkg/* files are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/psgml-mule/pkg-descr b/editors/psgml-mule/pkg-descr
index e57a3f0c0a25..24ba7b629eeb 100644
--- a/editors/psgml-mule/pkg-descr
+++ b/editors/psgml-mule/pkg-descr
@@ -11,7 +11,7 @@ editing of attribute values in a separate window with information about
 types and defaults, and structure based editing.
 
   PSGML is installed the following directory tree:
-	${PREFIX}/share/mule/site-lisp/psgml/
+	${LOCALBASE}/share/mule/site-lisp/psgml/
 
 To use psgml, put the following setup into your ~/.emacs:
 
diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile
index e4a928e7ad30..61ae85600bd5 100644
--- a/editors/psgml-xemacs21-mule/Makefile
+++ b/editors/psgml-xemacs21-mule/Makefile
@@ -13,16 +13,9 @@ PORTCLASS=	slave
 MASTERDIR=	${.CURDIR}/../psgml-emacs
 
 # emacs port setup
-EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs21-mule
-EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
-EMACS_VER=	21.1.10
-EMACS_LIBDIR=	lib/xemacs
+EMACS_PORT_NAME=	xemacs21-mule
 
 # pkg/* files are used in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
-# whether emacs has a *-common port
-HAS_COMMON_PORT=	YES
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 153acc823fea..957b12e08ce2 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -5,58 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	psgml-${EMACS_PORT}
+PORTNAME=	psgml
 PORTVERSION=	${PSGML_VER}
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/sgml/
-DISTNAME=	psgml-${PSGML_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
 
 # distfile version
 PSGML_VER=		1.2.1
 PSGML_STARTUPEL=	psgml-startup.el
-CATALOG=		${PREFIX}/share/sgml/catalog
+CATALOG=		${LOCALBASE}/share/sgml/catalog
+
+SCRIPTS_ENV=		TARGETS="${PSGML_STARTUPEL}"
+PLIST_SUB=		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 
 # This is a master port.
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
-EMACS_NAME=	emacs
-EMACS_PORT=	emacs
-EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_PORT_NAME=	emacs
 .endif
 
-# if RUN_DEPENDS emacs port name has the suffix `-common'
-.if !defined(HAS_COMMON_PORT)
-HAS_COMMON_PORT=	NO
-.endif
+.include <bsd.port.pre.mk>
 
 #
 # emacs ports setup
 #
-.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
+.if defined(EMACS_PORT_NAME)
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/psgml \
-		--infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--lispdir=${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/psgml \
+		--infodir=${LOCALBASE}/info
 CONFIGURE_ENV=	EMACS=${EMACS_CMD}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
-SCRIPTS_ENV=	TARGETS="${PSGML_STARTUPEL}" \
-		EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 .else
 .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
 
@@ -68,9 +53,9 @@ RUN_DEPENDS+=	${CATALOG}:${PORTSDIR}/textproc/dtd-catalogs
 pre-configure:
 	(cd ${WRKSRC} ; \
 	  for i in psgml.el psgml.texi ; do \
-	      ${RM} -f $${i}.in ; \
-	      ${MV} $${i} $${i}.in ; \
-	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${PREFIX};g" > $${i} ; \
+	      ${RM} -f $${i}.in; \
+	      ${MV} $${i} $${i}.in; \
+	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${LOCALBASE};g" > $${i}; \
 	  done)
 	${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
 
@@ -79,6 +64,6 @@ post-install:
 		${MAKE} install-info ; \
 	)
 	@${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${LOCALBASE}/${EMACS_LIBDIR}/site-lisp
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>