4 files changed, 2 insertions, 75 deletions

diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 575ac67e503f..b116bde1b74d 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ 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=	xemacs21-mule
@@ -30,15 +30,12 @@ BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 # package info manifest
 MANIFEST=	MANIFEST.flim
 
 # xemacs package
 XEMACS_PKGNAME=	flim
-XEMACS_PKGVER=	1.12
+XEMACS_PKGVER=	1.14
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
diff --git a/editors/flim-xemacs21-mule/pkg-comment b/editors/flim-xemacs21-mule/pkg-comment
deleted file mode 100644
index e0bf6ba11318..000000000000
--- a/editors/flim-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim-xemacs21-mule/pkg-descr b/editors/flim-xemacs21-mule/pkg-descr
deleted file mode 100644
index 725bff5240b3..000000000000
--- a/editors/flim-xemacs21-mule/pkg-descr
+++ /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}/lib/xemacs/site-packages/lisp/flim/	--- FLIM
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-xemacs21-mule/pkg-plist b/editors/flim-xemacs21-mule/pkg-plist
deleted file mode 100644
index d592fb56994b..000000000000
--- a/editors/flim-xemacs21-mule/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-%%EMACS_PACKAGESDIR%%/lisp/flim/ChangeLog
-%%EMACS_PACKAGESDIR%%/lisp/flim/NEWS
-%%EMACS_PACKAGESDIR%%/lisp/flim/README.en
-%%EMACS_PACKAGESDIR%%/lisp/flim/README.ja
-%%EMACS_PACKAGESDIR%%/lisp/flim/VERSION
-%%EMACS_PACKAGESDIR%%/lisp/flim/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-ccl.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-ccl.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-el.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q-ccl.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q-ccl.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mel.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mime.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/std11.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/std11.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtp.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtp.elc
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtpmail.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/smtpmail.elc
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/flim
-%%EMACS_PACKAGESDIR%%/info/mime-en.info
-%%EMACS_PACKAGESDIR%%/info/mime-ja.info
-%%EMACS_PACKAGESDIR%%/man/flim/mime-en.texi
-%%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
-@dirrm %%EMACS_PACKAGESDIR%%/man/flim
-share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim||(echo "===>  Please ignore above error.";true)