12 files changed, 195 insertions, 198 deletions

diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 671bfac34cff..7ba272737ff0 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	flim-1.13.x for emacs
+# New ports collection makefile for:	flim-1.13.x for emacs21
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -29,16 +29,18 @@ FLIM_SETUPEL=	flim-setupel.el
 FLIMDOCDIR?=	share/doc/flim
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 # flim lispdir
-FLIM_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+FLIM_LISPDIR?=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 FLIM_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
-# for emacs
-EMACS_PORT_NAME=	emacs
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+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
@@ -54,16 +56,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_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 .endif
 .else
 .BEGIN:
@@ -78,7 +76,7 @@ BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
 .endif
 
 pre-configure:
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
 	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
 .endif
 
@@ -111,7 +109,7 @@ post-install:
 # install package-cookie
 	@${MKDIR} ${LOCALBASE}/share/flim
 	@${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
diff --git a/editors/flim113/pkg-comment.emacs19 b/editors/flim113/pkg-comment.emacs19
index 04c6e5a8a792..b6d146a48cab 100644
--- a/editors/flim113/pkg-comment.emacs19
+++ b/editors/flim113/pkg-comment.emacs19
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs19
diff --git a/editors/flim113/pkg-comment b/editors/flim113/pkg-comment.emacs21
index 04c6e5a8a792..6b774373623e 100644
--- a/editors/flim113/pkg-comment
+++ b/editors/flim113/pkg-comment.emacs21
@@ -1 +1 @@
-FLIM, message representation or encoding emacs lisp library for emacs
+FLIM, message representation or encoding emacs lisp library for emacs21
diff --git a/editors/flim113/pkg-descr.emacs19 b/editors/flim113/pkg-descr.emacs19
index bb84f58126d8..27e9f9628d98 100644
--- a/editors/flim113/pkg-descr.emacs19
+++ b/editors/flim113/pkg-descr.emacs19
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+FLIM, message representation or encoding emacs lisp library for emacs19.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/
+	${LOCALBASE}/share/emacs/19.34/site-lisp/flim/
 
 To use flim, put the following setup into your ~/.emacs:
 
diff --git a/editors/flim113/pkg-descr.emacs20 b/editors/flim113/pkg-descr.emacs20
index c227a5dc068e..2066316ee504 100644
--- a/editors/flim113/pkg-descr.emacs20
+++ b/editors/flim113/pkg-descr.emacs20
@@ -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/site-lisp/flim/
+	${LOCALBASE}/share/emacs/20.7/site-lisp/flim/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr b/editors/flim113/pkg-descr.emacs21
index bb84f58126d8..2c709a6e7dc6 100644
--- a/editors/flim113/pkg-descr
+++ b/editors/flim113/pkg-descr.emacs21
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
+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,11 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
+	${LOCALBASE}/share/emacs/21.1/site-lisp/flim/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113/pkg-descr.mule b/editors/flim113/pkg-descr.mule
index 099a5b10222c..c7ae6f5b4b96 100644
--- a/editors/flim113/pkg-descr.mule
+++ b/editors/flim113/pkg-descr.mule
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for mule.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${LOCALBASE}/share/mule/site-lisp/flim/
+	${LOCALBASE}/share/mule/19.34/site-lisp/flim/
 
 To use flim, put the following setup into your ~/.emacs:
 
diff --git a/editors/flim113/pkg-plist b/editors/flim113/pkg-plist
deleted file mode 100644
index 8013b178f99f..000000000000
--- a/editors/flim113/pkg-plist
+++ /dev/null
@@ -1,49 +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/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.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-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/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.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
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
-@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
-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/flim113/pkg-plist.emacs19 b/editors/flim113/pkg-plist.emacs19
index 8013b178f99f..dd107950cd04 100644
--- a/editors/flim113/pkg-plist.emacs19
+++ b/editors/flim113/pkg-plist.emacs19
@@ -1,41 +1,41 @@
-%%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/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.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-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/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.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
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/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/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.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-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/mmdbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmdbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.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_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim113/pkg-plist.emacs20 b/editors/flim113/pkg-plist.emacs20
index 48455971a3fa..9770968ece53 100644
--- a/editors/flim113/pkg-plist.emacs20
+++ b/editors/flim113/pkg-plist.emacs20
@@ -1,42 +1,42 @@
-%%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/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.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/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.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
+%%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/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.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.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.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-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-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/mmdbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmdbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.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
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en
diff --git a/editors/flim113/pkg-plist.emacs21 b/editors/flim113/pkg-plist.emacs21
new file mode 100644
index 000000000000..9770968ece53
--- /dev/null
+++ b/editors/flim113/pkg-plist.emacs21
@@ -0,0 +1,53 @@
+%%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/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.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.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.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-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-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/mmdbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmdbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.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
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/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
diff --git a/editors/flim113/pkg-plist.mule b/editors/flim113/pkg-plist.mule
index 5e3ff20a8bb5..a983600d177f 100644
--- a/editors/flim113/pkg-plist.mule
+++ b/editors/flim113/pkg-plist.mule
@@ -1,45 +1,45 @@
-%%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/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.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-b-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-el.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/mmdbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmdbuffer.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
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/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/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mailcap.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-b-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.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-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-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/mmdbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmdbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.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_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/flim
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/NEWS
 %%FLIMDOCDIR%%/README.en