33 files changed, 188 insertions, 775 deletions

diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile
deleted file mode 100644
index 18fca3034a80..000000000000
--- a/editors/flim-emacs/Makefile
+++ /dev/null
@@ -1,212 +0,0 @@
-# New ports collection makefile for:	flim for emacs
-# Date created:		9 May 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flim
-PORTVERSION=	${FLIM_VER}
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.12/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/flim/flim-1.12/ \
-		ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.12/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.12/
-MAINTAINER?=	shige@FreeBSD.org
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-PORTCLASS?=	master
-
-# distfile version
-FLIM_VER=	1.12.7
-# 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_VER}.FreeBSD-packages
-
-.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}
-
-.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} -p ${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
-
-mkdir-site-packages:
-	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-		${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
-	done)
-
-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)
-
-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} -p ${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/flim-emacs/distinfo b/editors/flim-emacs/distinfo
deleted file mode 100644
index ddf32d235168..000000000000
--- a/editors/flim-emacs/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (flim-1.12.7.tar.gz) = 70a25ed010904071b9185034b8bb9048
diff --git a/editors/flim-emacs/files/_pkg.el b/editors/flim-emacs/files/_pkg.el
deleted file mode 100644
index 76e2a44b2bd2..000000000000
--- a/editors/flim-emacs/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'flim
-                 :version 1.12
-                 :type 'regular)
diff --git a/editors/flim-emacs/files/flim-setupel.el.in b/editors/flim-emacs/files/flim-setupel.el.in
deleted file mode 100644
index 0f1bf4144e76..000000000000
--- a/editors/flim-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/flim-emacs/files/patch-aa b/editors/flim-emacs/files/patch-aa
deleted file mode 100644
index bbe4ab40628d..000000000000
--- a/editors/flim-emacs/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- FLIM-CFG.orig	Mon May 31 18:23:26 1999
-+++ FLIM-CFG	Thu Oct 14 23:56:32 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
-@@ -19,6 +21,7 @@
- (if (boundp 'VERSION_SPECIFIC_LISPDIR)
-     (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
- 
-+(require 'emu)
- (require 'install)
- 
- (add-latest-path "custom")
diff --git a/editors/flim-emacs/files/patch-ac b/editors/flim-emacs/files/patch-ac
deleted file mode 100644
index 4980243b8736..000000000000
--- a/editors/flim-emacs/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- mime-en.texi.orig	Sun Dec 27 17:48:47 1998
-+++ mime-en.texi	Sun Dec 27 17:49:17 1998
-@@ -9,6 +9,11 @@
- @node Top, Introduction, (dir), (dir)
- @top FLIM 1.12 Manual about MIME Features
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-en: (mime-en).		MIME features for GNU Emacs. (English)
-+@end direntry 
-+
- @ifinfo
- 
- This file documents MIME features of FLIM, a Internet message
diff --git a/editors/flim-emacs/files/patch-ad b/editors/flim-emacs/files/patch-ad
deleted file mode 100644
index 039aafd5597f..000000000000
--- a/editors/flim-emacs/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- mime-ja.texi.orig	Sun Dec 27 17:46:55 1998
-+++ mime-ja.texi	Sun Dec 27 17:48:34 1998
-@@ -9,6 +9,11 @@
- @node Top, Introduction, (dir), (dir)
- @top FLIM 1.12 MIME 機能説明書
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* mime-ja: (mime-ja).		MIME features for GNU Emacs. (Japanese)
-+@end direntry
-+
- @ifinfo
- 
- This file documents MIME features of FLIM, a Internet message
diff --git a/editors/flim-emacs/pkg-comment b/editors/flim-emacs/pkg-comment
deleted file mode 100644
index 04c6e5a8a792..000000000000
--- a/editors/flim-emacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs
diff --git a/editors/flim-emacs/pkg-descr b/editors/flim-emacs/pkg-descr
deleted file mode 100644
index 8893698ed661..000000000000
--- a/editors/flim-emacs/pkg-descr
+++ /dev/null
@@ -1,19 +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/	--- FLIM
-
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-emacs/pkg-plist b/editors/flim-emacs/pkg-plist
deleted file mode 100644
index fc7514552dae..000000000000
--- a/editors/flim-emacs/pkg-plist
+++ /dev/null
@@ -1,47 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-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/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%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/flim-emacs/scripts/configure b/editors/flim-emacs/scripts/configure
deleted file mode 100644
index 083bc7164d33..000000000000
--- a/editors/flim-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/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index f7e7f52ddebb..ac192c9a0f15 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-emacs20/pkg-comment b/editors/flim-emacs20/pkg-comment
deleted file mode 100644
index 8517efff787a..000000000000
--- a/editors/flim-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim-emacs20/pkg-descr b/editors/flim-emacs20/pkg-descr
deleted file mode 100644
index 2f54be83c580..000000000000
--- a/editors/flim-emacs20/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20.
-
-  FLIM is a library to provide basic features about message
-  representation or encoding.  It consists of following
-  modules:
-    - STD 11 (RFC 822) parser and utility
-    - MIME library
-    - mailcap parser and utility
-
-  FLIM is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/flim/	--- FLIM
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-emacs20/pkg-plist b/editors/flim-emacs20/pkg-plist
deleted file mode 100644
index 9b2f60c0d0e8..000000000000
--- a/editors/flim-emacs20/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
-%%FLIMDOCDIR%%/ChangeLog
-%%FLIMDOCDIR%%/NEWS
-%%FLIMDOCDIR%%/README.en
-%%FLIMDOCDIR%%/README.ja
-%%FLIMDOCDIR%%/VERSION
-@dirrm %%FLIMDOCDIR%%
-@unexec install-info --delete %D/info/mime-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-en.info
-info/mime-ja.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-@exec install-info %D/info/mime-ja.info %D/info/dir
-share/flim/%%FLIM_COOKIE%%
-@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile
deleted file mode 100644
index e10dc46e9648..000000000000
--- a/editors/flim-mule/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	flim for mule
-# Date created:		9 May 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	shige@FreeBSD.org
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
-
-# 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/flim-mule/pkg-comment b/editors/flim-mule/pkg-comment
deleted file mode 100644
index 6cea8f5d2cd0..000000000000
--- a/editors/flim-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for mule
diff --git a/editors/flim-mule/pkg-descr b/editors/flim-mule/pkg-descr
deleted file mode 100644
index d235eb18a260..000000000000
--- a/editors/flim-mule/pkg-descr
+++ /dev/null
@@ -1,19 +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/	--- FLIM
-
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-mule/pkg-plist b/editors/flim-mule/pkg-plist
deleted file mode 100644
index 6eef720b271a..000000000000
--- a/editors/flim-mule/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b-ccl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-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/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el
-%%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc
-%%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/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 575ac67e503f..b116bde1b74d 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
+MASTERDIR=	${.CURDIR}/../../editors/flim
 
 # emacs port setup
 EMACS_PORT_NAME=	xemacs21-mule
@@ -30,15 +30,12 @@ BUILD_INFO_BY_EMACS=	YES
 # texinfo packages
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 # package info manifest
 MANIFEST=	MANIFEST.flim
 
 # xemacs package
 XEMACS_PKGNAME=	flim
-XEMACS_PKGVER=	1.12
+XEMACS_PKGVER=	1.14
 #XEMACS_PKGVER!=	grep version ${.CURDIR}/../flim-emacs/files/_pkg.el | \
 #		sed 's/.*:version \([0-9.]*\).*/\1/'
 XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
diff --git a/editors/flim-xemacs21-mule/pkg-comment b/editors/flim-xemacs21-mule/pkg-comment
deleted file mode 100644
index e0bf6ba11318..000000000000
--- a/editors/flim-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/flim-xemacs21-mule/pkg-descr b/editors/flim-xemacs21-mule/pkg-descr
deleted file mode 100644
index 725bff5240b3..000000000000
--- a/editors/flim-xemacs21-mule/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule.
-
-  FLIM is a library to provide basic features about message
-  representation or encoding.  It consists of following
-  modules:
-    - STD 11 (RFC 822) parser and utility
-    - MIME library
-    - mailcap parser and utility
-
-  FLIM is installed the following directory tree:
-	${LOCALBASE}/lib/xemacs/site-packages/lisp/flim/	--- FLIM
-
---- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim/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-xemacs21-mule/pkg-plist b/editors/flim/pkg-plist.xemacs21-mule
index d592fb56994b..c818f8059e8e 100644
--- a/editors/flim-xemacs21-mule/pkg-plist
+++ b/editors/flim/pkg-plist.xemacs21-mule
@@ -12,8 +12,22 @@
 %%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
@@ -34,14 +48,30 @@
 %%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