5 files changed, 10 insertions, 115 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index b4c075e8335d..105bcb21db36 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -30,15 +30,11 @@ SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
 SEMI_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 SEMI_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
-.if (${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
@@ -51,6 +47,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} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22")
+PLIST=		${PKGDIR}/pkg-plist.emacs20
+.endif
 # depends on flim
 BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
 RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
diff --git a/editors/semi/pkg-descr.emacs20 b/editors/semi/pkg-descr
index bfed386fd2b6..e1012d178150 100644
--- a/editors/semi/pkg-descr.emacs20
+++ b/editors/semi/pkg-descr
@@ -18,7 +18,4 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
   Notice that this package does not contain MIME extender for any
   MUAs.  They are released as separated packages.
 
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/20.7/site-lisp/semi/
-
 Ported by shige@FreeBSD.ORG
diff --git a/editors/semi/pkg-descr.emacs21 b/editors/semi/pkg-descr.emacs21
deleted file mode 100644
index 0d4a43539f78..000000000000
--- a/editors/semi/pkg-descr.emacs21
+++ /dev/null
@@ -1,24 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs21.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/21.3/site-lisp/semi/
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi/pkg-descr.xemacs21-mule b/editors/semi/pkg-descr.xemacs21-mule
deleted file mode 100644
index 06de7e1160c2..000000000000
--- a/editors/semi/pkg-descr.xemacs21-mule
+++ /dev/null
@@ -1,24 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
deleted file mode 100644
index a734e26fe32e..000000000000
--- a/editors/semi/pkg-plist.emacs21
+++ /dev/null
@@ -1,58 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
-@unexec /bin/rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
-@unexec /bin/rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el
-%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/README.ja
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-info/mime-ui-en.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true