11 files changed, 241 insertions, 237 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index ffe0e4f2e6c9..ef75fc1caa11 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim-1.14.x for emacs20
+# New ports collection makefile for:	flim-1.14.x for emacs21
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -30,10 +30,14 @@ FLIM_LISPDIR=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
-# for emacs20
-EMACS_PORT_NAME=	emacs20
+EMACS_PORT_NAME=	emacs21
+DEPPORT_SUFFIX=	
+.else
+DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
 .endif
 
+EMACS_MASTERDIR_PKGFILES=YES
+
 # target name for make build
 ALL_TARGET?=	elc
 # environments
@@ -47,16 +51,12 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 .if defined(EMACS_PORT_NAME)
 # depends on apel (case of xemacs-21.x or later)
 .if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-.elif (${EMACS_PORT_NAME} == "xemacs") || (${EMACS_PORT_NAME} == "xemacs20")
-# depends on apel (case of xemacs-20.x or former)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 .else
-# depends on apel (case of other emacsen etc...)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+# depends on apel (case of gnu emacsen etc...)
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 .endif
 .else
 .BEGIN:
diff --git a/editors/flim/files/_pkg.el b/editors/flim/files/_pkg.el
index 7b3df375fb4d..06bed35ab245 100644
--- a/editors/flim/files/_pkg.el
+++ b/editors/flim/files/_pkg.el
@@ -1,4 +1,4 @@
 ;;;###autoload
 (package-provide 'flim
-                 :version 1.13
+                 :version 1.14
                  :type 'regular)
diff --git a/editors/flim/pkg-comment b/editors/flim/pkg-comment
deleted file mode 100644
index 4943f5883e60..000000000000
--- a/editors/flim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding elisp library for emacs20
diff --git a/editors/flim/pkg-comment.emacs21 b/editors/flim/pkg-comment.emacs21
index 4943f5883e60..5851798873a5 100644
--- a/editors/flim/pkg-comment.emacs21
+++ b/editors/flim/pkg-comment.emacs21
@@ -1 +1 @@
-FLIM, message representation or encoding elisp library for emacs20
+FLIM, message representation or encoding elisp library for emacs21
diff --git a/editors/flim/pkg-comment.xemacs21-mule b/editors/flim/pkg-comment.xemacs21-mule
new file mode 100644
index 000000000000..09a74248c87d
--- /dev/null
+++ b/editors/flim/pkg-comment.xemacs21-mule
@@ -0,0 +1 @@
+FLIM, message representation or encoding elisp library for xemacs21-mule
diff --git a/editors/flim/pkg-descr.emacs21 b/editors/flim/pkg-descr.emacs21
index 2066316ee504..2c709a6e7dc6 100644
--- a/editors/flim/pkg-descr.emacs21
+++ b/editors/flim/pkg-descr.emacs21
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs20.
+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
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/emacs/21.1/site-lisp/flim/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-descr b/editors/flim/pkg-descr.xemacs21-mule
index 2066316ee504..0979438f1b31 100644
--- a/editors/flim/pkg-descr
+++ b/editors/flim/pkg-descr.xemacs21-mule
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs20.
+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
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
+	${LOCALBASE}/share/xemacs/site-packages/lisp/flim/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
deleted file mode 100644
index d08499b49613..000000000000
--- a/editors/flim/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/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
-info/mime-en.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index d08499b49613..38cbcebb817a 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -1,72 +1,72 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtpmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtpmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index d08499b49613..532f66edaab5 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -1,72 +1,70 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/md5.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-conf.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/sha1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/smtpmail.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/flim
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtpmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtpmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim/pkg-plist.xemacs21-mule b/editors/flim/pkg-plist.xemacs21-mule
new file mode 100644
index 000000000000..c818f8059e8e
--- /dev/null
+++ b/editors/flim/pkg-plist.xemacs21-mule
@@ -0,0 +1,86 @@
+%%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/hex-util.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/hex-util.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-def.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-def.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-md5.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-md5.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-sha1.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/hmac-sha1.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/luna.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/luna.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/lunit.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/lunit.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/md5.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/md5.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/mime-conf.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime-conf.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/mmexternal.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmexternal.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmgeneric.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/qmtp.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/qmtp.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-cram.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-cram.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-digest.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl-digest.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sasl.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/std11.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/std11.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sha1-el.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sha1-el.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/sha1.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/sha1.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)