5 files changed, 9 insertions, 12 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index df4f5451e306..4a980085f6ac 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/apel/ \
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	A Portable Emacs Library for emacs21
+COMMENT?=	A Portable Emacs Library for emacs
 
 # distfile version
 APEL_VER=	10.7
@@ -24,7 +24,6 @@ APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 # emacs port setup
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 DESCR=		${PKGDIR}/pkg-descr
 
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index f98e7ad9affc..84e2ce1b3de1 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	FLIM, message representation or encoding elisp library for emacs21
+COMMENT?=	FLIM, message representation or encoding elisp library for emacs
 
 PORTCLASS?=	master
 
@@ -29,7 +29,6 @@ FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 PORTCLASS?=	master
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 3eabee752185..4b103776e0b7 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	SEMI, Library of MIME feature for GNU Emacs for emacs21
+COMMENT?=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 PORTCLASS?=	master
 
@@ -30,7 +30,6 @@ SEMI_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 SEMI_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 4ccc0ec61eed..01b48448a6fc 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Yet another message interface on Emacsen
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
+
+.include <bsd.port.pre.mk>
 
 MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}
 .if (${EMACS_PORT_NAME} == "emacs21")
@@ -43,8 +44,6 @@ RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORT
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-WL-MK ${PATCHDIR}/extra-patch-elmo:elmo-version.el
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if exists(${EMACS_W3M_LISP_FILE})
 BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
 RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index f7aaa7b0d30c..0fa7824963c2 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -13,10 +13,9 @@ MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT?=	Simple front-end to w3m for emacs21
+COMMENT?=	Simple front-end to w3m for emacs
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
 			--with-lispdir=${PREFIX}/${LISPDIR} \
@@ -49,6 +48,8 @@ WITHOUT_OCTET_VIEWER=	yes
 SHIMBUN=	""
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22")
 FLIM_PORT=	${PORTSDIR}/editors/flim
 SEMI_PORT=	${PORTSDIR}/editors/semi
@@ -114,4 +115,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>