4 files changed, 11 insertions, 35 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 034784f72b68..33a92700c2dc 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -28,15 +28,12 @@ FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 FLIM_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
-.if (${PORTCLASS} == "master")
+PORTCLASS?=	master
 USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-DEPPORT_SUFFIX=	
-.else
-DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
-.endif
+EMACS_PORT_NAME?=	emacs21
 
 EMACS_MASTERDIR_PKGFILES=YES
+DESCR=		${PKGDIR}/pkg-descr
 
 # target name for make build
 ALL_TARGET?=	elc
@@ -49,6 +46,14 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
+.if ${EMACS_PORT_NAME} == "emacs21"
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
+.endif
+.if (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22")
+PLIST=		${PKGDIR}/pkg-plist.emacs21
+.endif
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
diff --git a/editors/flim/pkg-descr.emacs20 b/editors/flim/pkg-descr
index 2066316ee504..724f868a1218 100644
--- a/editors/flim/pkg-descr.emacs20
+++ b/editors/flim/pkg-descr
@@ -7,7 +7,4 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
     - MIME library
     - mailcap parser and utility
 
-  FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
-
 Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-descr.emacs21 b/editors/flim/pkg-descr.emacs21
deleted file mode 100644
index 8fedb729f4db..000000000000
--- a/editors/flim/pkg-descr.emacs21
+++ /dev/null
@@ -1,13 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs21.
-
-  FLIM is a library to provide basic features about message
-  representation or encoding.  It consists of following
-  modules:
-    - STD 11 (RFC 822) parser and utility
-    - MIME library
-    - mailcap parser and utility
-
-  FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/21.3/site-lisp/flim/
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-descr.xemacs21-mule b/editors/flim/pkg-descr.xemacs21-mule
deleted file mode 100644
index 0979438f1b31..000000000000
--- a/editors/flim/pkg-descr.xemacs21-mule
+++ /dev/null
@@ -1,13 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
-
-  FLIM is a library to provide basic features about message
-  representation or encoding.  It consists of following
-  modules:
-    - STD 11 (RFC 822) parser and utility
-    - MIME library
-    - mailcap parser and utility
-
-  FLIM is installed the following directory tree:
-	${LOCALBASE}/share/xemacs/site-packages/lisp/flim/
-
-Ported by shige@FreeBSD.ORG