5 files changed, 205 insertions, 231 deletions

diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index ba6f14947b05..ffe0e4f2e6c9 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -22,11 +22,12 @@ PORTCLASS?=	master
 # distfile version
 FLIM_VER=	1.14.3
 FLIM_TRUNK=	1.14
-# 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_VERSION_SITE_LISPDIR}
+FLIM_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # for emacs20
@@ -36,9 +37,10 @@ EMACS_PORT_NAME=	emacs20
 # 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}
+PLIST_SUB+=	FLIMDOCDIR=${FLIMDOCDIR} FLIM_COOKIE=${FLIM_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${FLIM_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${FLIM_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
@@ -68,11 +70,6 @@ RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTS
 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
@@ -102,9 +99,6 @@ 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
@@ -171,10 +165,6 @@ doc-install:
 		${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 \
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index d257a58aaa84..d08499b49613 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -1,72 +1,71 @@
-%%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/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.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-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.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-conf.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.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/mmexternal.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.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%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%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
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index d257a58aaa84..d08499b49613 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -1,72 +1,71 @@
-%%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/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.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-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.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-conf.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.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/mmexternal.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.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%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%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
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index d257a58aaa84..d08499b49613 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -1,72 +1,71 @@
-%%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/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.el
-%%EMACS_LIBDIR%%/site-lisp/flim/luna.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.el
-%%EMACS_LIBDIR%%/site-lisp/flim/lunit.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.el
-%%EMACS_LIBDIR%%/site-lisp/flim/md5.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-ccl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q-ccl.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-conf.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-conf.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/mmexternal.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmexternal.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmgeneric.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.el
-%%EMACS_LIBDIR%%/site-lisp/flim/qmtp.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl-digest.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/flim/sha1.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%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
+%%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
diff --git a/editors/flim/scripts/configure b/editors/flim/scripts/configure
deleted file mode 100644
index 083bc7164d33..000000000000
--- a/editors/flim/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