Index: bsd.emacs.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.emacs.mk,v
retrieving revision 1.65
diff -u -r1.65 bsd.emacs.mk
--- bsd.emacs.mk	27 May 2007 17:43:21 -0000	1.65
+++ bsd.emacs.mk	24 Jun 2007 08:03:25 -0000
@@ -102,7 +102,7 @@
 EMACS_MAJOR_VER=	21
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
+EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs21
 EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
 EMACS_NO_SUBDIRSEL=	NO
@@ -115,6 +115,23 @@
 # Emacs-22.x
 .elif (${EMACS_PORT_NAME} == "emacs22")
 EMACS_NAME=		emacs
+EMACS_VER=		22.1
+EMACS_MAJOR_VER=	22
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
+EMACS_COMMON_PORT=	NO
+EMACS_HAS_MULE=		YES
+EMACS_NO_SUBDIRSEL=	NO
+.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+
+# Emacs-22.x (development version)
+.elif (${EMACS_PORT_NAME} == "emacs-devel")
+EMACS_NAME=		emacs
 EMACS_VER=		22.0.99
 EMACS_MAJOR_VER=	22
 EMACS_LIBDIR?=		share/${EMACS_NAME}