4 files changed, 1 insertions, 69 deletions

diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index f7e7f52ddebb..ac192c9a0f15 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-emacs20/pkg-comment b/editors/flim-emacs20/pkg-comment
deleted file mode 100644
index 8517efff787a..000000000000
--- a/editors/flim-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim-emacs20/pkg-descr b/editors/flim-emacs20/pkg-descr
deleted file mode 100644
index 2f54be83c580..000000000000
--- a/editors/flim-emacs20/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20.
-
-  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/site-lisp/flim/	--- FLIM
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-emacs20/pkg-plist b/editors/flim-emacs20/pkg-plist
deleted file mode 100644
index 9b2f60c0d0e8..000000000000
--- a/editors/flim-emacs20/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
-%%FLIMDOCDIR%%/ChangeLog
-%%FLIMDOCDIR%%/NEWS
-%%FLIMDOCDIR%%/README.en
-%%FLIMDOCDIR%%/README.ja
-%%FLIMDOCDIR%%/VERSION
-@dirrm %%FLIMDOCDIR%%
-@unexec install-info --delete %D/info/mime-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-en.info
-info/mime-ja.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-@exec install-info %D/info/mime-ja.info %D/info/dir
-share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true