4 files changed, 1 insertions, 69 deletions

diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index 9ff5e65d92ec..dd14fe2aab41 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
+MASTERDIR=	${.CURDIR}/../../editors/semi
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi-emacs20/pkg-comment b/editors/semi-emacs20/pkg-comment
deleted file mode 100644
index 5fedc11e1f37..000000000000
--- a/editors/semi-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi-emacs20/pkg-descr b/editors/semi-emacs20/pkg-descr
deleted file mode 100644
index 62b014e02da6..000000000000
--- a/editors/semi-emacs20/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20.
-
-  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/site-lisp/semi/	--- SEMI
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-emacs20/pkg-plist b/editors/semi-emacs20/pkg-plist
deleted file mode 100644
index 0530ab62eb65..000000000000
--- a/editors/semi-emacs20/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %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-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true