New master/slave scheme for flim-1.13.x(old version) ports.

Update master port to emacs21.
Update slave ports to stub port:
  flim113-emacs20, flim113-mule, flim113-xemacs21-mule.
Remove flim113-emacs.
I'll addport flim113-emacs19 stub(slave) port as emacs19 ports.
Install el/elc files to version specific site-lisp directory.
Change some style.

35 files changed, 198 insertions, 778 deletions

diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
deleted file mode 100644
index 671bfac34cff..000000000000
--- a/editors/flim113-emacs/Makefile
+++ /dev/null
@@ -1,220 +0,0 @@
-# New ports collection makefile for:	flim-1.13.x for emacs
-# Date created:		9 May 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flim
-PORTVERSION=	${FLIM_VER}
-PORTREVISION?=	1
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-MAINTAINER?=	shige@FreeBSD.org
-
-PORTCLASS?=	master
-
-# distfile version
-FLIM_TRUNK=	1.13
-FLIM_VER=	1.13.2
-# setupel filename
-FLIM_SETUPEL=	flim-setupel.el
-# document install directory by install-doc target
-FLIMDOCDIR?=	share/doc/flim
-FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
-# flim lispdir
-FLIM_LISPDIR?=			${LOCALBASE}/${EMACS_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
-.endif
-
-# target name for make build
-ALL_TARGET?=	elc
-# environments
-SCRIPTS_ENV+=	TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
-		FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
-		LISPDIR="${FLIM_LISPDIR}" \
-		VERSION_SPECIFIC_LISPDIR="${FLIM_VERSION_SPECIFIC_LISPDIR}"
-
-.include <bsd.port.pre.mk>
-
-.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}
-.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}
-.endif
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-.if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO")
-# info files JIS to EUC
-BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
-.endif
-
-pre-configure:
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
-	@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
-.endif
-
-# makeinfo stuff
-MAKEINFO=		makeinfo --no-split --no-validate
-MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
-MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
-
-pre-build:
-.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
-	@${MAKE} pkg-el-copy
-.endif
-
-post-build:
-.if defined(BUILD_INFO_BY_EMACS) && (${BUILD_INFO_BY_EMACS} == "YES")
-	@${MAKE} info-build-by-emacs
-.else
-	@${MAKE} info-build
-.endif
-
-pre-install:
-.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
-	@${MAKE} mkdir-site-packages
-.endif
-.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
-	@${MAKE} pkg-el-install
-.endif
-
-post-install:
-# install package-cookie
-	@${MKDIR} ${LOCALBASE}/share/flim
-	@${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
-	@${MAKE} setupel-install
-.endif
-.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
-	@${MAKE} info-package-install
-	@${MAKE} manifest-install
-.else
-	@${MAKE} info-install
-.endif
-.if !defined(NOPORTDOCS)
-	@${MAKE} doc-install
-.endif
-
-###############################################################################
-#
-# miscellaneous local functions
-#
-info-build:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ja.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
-	done)
-.endif
-
-info-build-by-emacs:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ja.texi; do \
-		${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
-	done)
-.endif
-
-pkg-el-copy:
-	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/_pkg.el ;\
-	fi)
-
-pkg-el-install:
-	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
-	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
-		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
-	fi)
-
-mkdir-site-packages:
-	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-		${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
-	done)
-
-doc-install:
-	@${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
-	@(cd ${WRKSRC} ; \
-	for i in ChangeLog NEWS README.* VERSION ; do \
-		${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
-	done)
-
-setupel-install:
-	@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
-			${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-
-info-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
-		install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
-	done)
-.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
-	@(cd ${WRKSRC} ; \
-	for i in mime-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
-		install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
-	done)
-.endif
-
-info-package-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.info mime-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-				${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
-	done ; \
-	${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
-	for i in mime-en.texi mime-ja.texi; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-				${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
-	done)
-
-manifest-install:
-	@${RM} -f ${WRKDIR}/${MANIFEST}
-	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
-
-.include <bsd.port.post.mk>
diff --git a/editors/flim113-emacs/distinfo b/editors/flim113-emacs/distinfo
deleted file mode 100644
index c5c1ac37bdf0..000000000000
--- a/editors/flim113-emacs/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (flim-1.13.2.tar.gz) = 3a7341529167bd1de0b510150c48d41e
diff --git a/editors/flim113-emacs/files/_pkg.el b/editors/flim113-emacs/files/_pkg.el
deleted file mode 100644
index 7b3df375fb4d..000000000000
--- a/editors/flim113-emacs/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'flim
-                 :version 1.13
-                 :type 'regular)
diff --git a/editors/flim113-emacs/files/flim-setupel.el.in b/editors/flim113-emacs/files/flim-setupel.el.in
deleted file mode 100644
index 0f1bf4144e76..000000000000
--- a/editors/flim113-emacs/files/flim-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)flim-setupel.el -- flim emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
- ) load-path))
-(provide 'flim-setupel)
diff --git a/editors/flim113-emacs/files/patch-aa b/editors/flim113-emacs/files/patch-aa
deleted file mode 100644
index 450d2b6f8af6..000000000000
--- a/editors/flim113-emacs/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- FLIM-CFG.orig	Tue Sep 15 15:26:08 1998
-+++ FLIM-CFG	Sun May  9 01:33:26 1999
-@@ -8,6 +8,8 @@
- 
- (add-to-list 'load-path
- 	     (expand-file-name "../../site-lisp/apel" data-directory))
-+(add-to-list 'load-path
-+	     (expand-file-name "../site-lisp/emu" data-directory))
- 
- (if (boundp 'LISPDIR)
-     (progn
diff --git a/editors/flim113-emacs/files/patch-ac b/editors/flim113-emacs/files/patch-ac
deleted file mode 100644
index 71f45d4ecb8f..000000000000
--- a/editors/flim113-emacs/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- mime-en.texi.orig	Wed Jan 27 23:12:41 1999
-+++ mime-en.texi	Tue Mar  9 06:10:11 1999
-@@ -2,6 +2,10 @@
- @c Generated automatically from mime-en.sgml by sinfo 3.7.
- @setfilename mime-en.info
- @settitle{FLIM 1.12 Reference Manual about MIME Features}
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-en: (mime-en).		MIME features for GNU Emacs. (English)
-+@end direntry 
- @titlepage
- @title FLIM 1.12 Reference Manual about MIME Features
- @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
diff --git a/editors/flim113-emacs/files/patch-ad b/editors/flim113-emacs/files/patch-ad
deleted file mode 100644
index 3ea7ff6154ee..000000000000
--- a/editors/flim113-emacs/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- mime-ja.texi.orig	Wed Jan 27 23:12:42 1999
-+++ mime-ja.texi	Tue Mar  9 06:11:05 1999
-@@ -2,6 +2,10 @@
- @c Generated automatically from mime-ja.sgml by sinfo 3.7.
- @setfilename mime-ja.info
- @settitle{FLIM 1.12 MIME $B5!G=@bL@=q(B}
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-ja: (mime-ja).		MIME features for GNU Emacs. (Japanese)
-+@end direntry 
- @titlepage
- @title FLIM 1.12 MIME $B5!G=@bL@=q(B
- @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp>
diff --git a/editors/flim113-emacs/pkg-descr b/editors/flim113-emacs/pkg-descr
deleted file mode 100644
index bb84f58126d8..000000000000
--- a/editors/flim113-emacs/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
-
-  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/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113-emacs/pkg-plist b/editors/flim113-emacs/pkg-plist
deleted file mode 100644
index 8013b178f99f..000000000000
--- a/editors/flim113-emacs/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-emacs/scripts/configure b/editors/flim113-emacs/scripts/configure
deleted file mode 100644
index 083bc7164d33..000000000000
--- a/editors/flim113-emacs/scripts/configure
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for i in ${TARGETS}
-do
-	if [ -f ${WRKDIR}/${i}.in ]; then
-	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-		-e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-		-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-		-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-		-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
-	> ${WRKDIR}/${i}
-	fi
-done
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index 1f5b87c7afec..ace0ce5cdd0b 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim113
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim113-emacs20/pkg-comment b/editors/flim113-emacs20/pkg-comment
deleted file mode 100644
index 8517efff787a..000000000000
--- a/editors/flim113-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim113-emacs20/pkg-plist b/editors/flim113-emacs20/pkg-plist
deleted file mode 100644
index 48455971a3fa..000000000000
--- a/editors/flim113-emacs20/pkg-plist
+++ /dev/null
@@ -1,53 +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-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
-%%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-mule/Makefile b/editors/flim113-mule/Makefile
index e3dd02a0de77..cfcdb638d57f 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -10,15 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim113
 
 # emacs port setup
 EMACS_PORT_NAME=	mule
 
-# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL=	YES
-
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim113-mule/pkg-comment b/editors/flim113-mule/pkg-comment
deleted file mode 100644
index 6cea8f5d2cd0..000000000000
--- a/editors/flim113-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for mule
diff --git a/editors/flim113-mule/pkg-descr b/editors/flim113-mule/pkg-descr
deleted file mode 100644
index 099a5b10222c..000000000000
--- a/editors/flim113-mule/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for 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}/share/mule/site-lisp/flim/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/flim113-mule/pkg-plist b/editors/flim113-mule/pkg-plist
deleted file mode 100644
index 5e3ff20a8bb5..000000000000
--- a/editors/flim113-mule/pkg-plist
+++ /dev/null
@@ -1,56 +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-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
-%%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-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index 55f9dd8b0a45..f77a570280f3 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim113
 
 # emacs port setup
 EMACS_PORT_NAME=	xemacs21-mule
@@ -30,9 +30,6 @@ 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
 
diff --git a/editors/flim113-xemacs21-mule/pkg-comment b/editors/flim113-xemacs21-mule/pkg-comment
deleted file mode 100644
index e0bf6ba11318..000000000000
--- a/editors/flim113-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim113-xemacs21-mule/pkg-descr b/editors/flim113-xemacs21-mule/pkg-descr
deleted file mode 100644
index c2c2a9ab7933..000000000000
--- a/editors/flim113-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/
-
-Ported by shige shige@FreeBSD.ORG
diff --git a/editors/flim113-xemacs21-mule/pkg-plist b/editors/flim113-xemacs21-mule/pkg-plist
deleted file mode 100644
index ffa02872e9fa..000000000000
--- a/editors/flim113-xemacs21-mule/pkg-plist
+++ /dev/null
@@ -1,58 +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/luna.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/luna.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/mmdbuffer.el
-%%EMACS_PACKAGESDIR%%/lisp/flim/mmdbuffer.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)
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 b/editors/flim113/pkg-comment
deleted file mode 100644
index 04c6e5a8a792..000000000000
--- a/editors/flim113/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs
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-emacs/pkg-comment b/editors/flim113/pkg-comment.emacs21
index 04c6e5a8a792..6b774373623e 100644
--- a/editors/flim113-emacs/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 b/editors/flim113/pkg-descr
deleted file mode 100644
index bb84f58126d8..000000000000
--- a/editors/flim113/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs.
-
-  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/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
-Ported by shige@FreeBSD.ORG
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-emacs20/pkg-descr b/editors/flim113/pkg-descr.emacs21
index c227a5dc068e..2c709a6e7dc6 100644
--- a/editors/flim113-emacs20/pkg-descr
+++ b/editors/flim113/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/site-lisp/flim/
+	${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