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 slave ports:
  flim113-emacs.
Add slave stub ports:
  flim113-emacs19 for emacs-19.x ports.
Install el/elc files to version specific site-lisp directory.
Change some style.

12 files changed, 124 insertions, 120 deletions

diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index b7f64c68d0d6..d0eb032ee4d7 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -31,16 +31,18 @@ SEMIDOCDIR?=	share/doc/semi
 FLIM_COOKIE=	flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
 # semi lispdir
-SEMI_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+SEMI_LISPDIR?=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 SEMI_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
-# emacs port setup
-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
@@ -55,8 +57,8 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 
 .if defined(EMACS_PORT_NAME)
 # depends on flim
-BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${FLIM_TRUNK:S/.//}${DEPPORT_SUFFIX}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
@@ -70,7 +72,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}/${SEMI_SETUPEL}.in ${WRKDIR}
 .endif
 
@@ -101,7 +103,7 @@ pre-install:
 post-install:
 	@${MKDIR} -p ${LOCALBASE}/share/semi
 	@${TOUCH} ${LOCALBASE}/share/semi/${SEMI_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/semi113/files/semi-setupel.el.in b/editors/semi113/files/semi-setupel.el.in
index 7fdd3efd2ae0..50534a346f7c 100644
--- a/editors/semi113/files/semi-setupel.el.in
+++ b/editors/semi113/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
 ;;                                            --  by shige@FreeBSD.ORG
 
 (setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+	"@@LOCALBASE@@/@@EMACS_VERSION_SITE_LISPDIR@@/semi"
  ) load-path))
 (provide 'semi-setupel)
diff --git a/editors/semi113/pkg-comment.emacs21 b/editors/semi113/pkg-comment.emacs21
index 5fedc11e1f37..ee2c44c781fb 100644
--- a/editors/semi113/pkg-comment.emacs21
+++ b/editors/semi113/pkg-comment.emacs21
@@ -1 +1 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
+SEMI, Library of MIME feature for GNU Emacs for emacs21
diff --git a/editors/semi113/pkg-descr.emacs19 b/editors/semi113/pkg-descr.emacs19
index 69b4f38b51b1..4e21478cbfa1 100644
--- a/editors/semi113/pkg-descr.emacs19
+++ b/editors/semi113/pkg-descr.emacs19
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
+	${LOCALBASE}/share/emacs/19.34/site-lisp/semi/
 
 To use flim, put the following setup into your ~/.emacs:
 
diff --git a/editors/semi113/pkg-descr.emacs20 b/editors/semi113/pkg-descr.emacs20
index 6cdf8aac2e11..45708a0a1125 100644
--- a/editors/semi113/pkg-descr.emacs20
+++ b/editors/semi113/pkg-descr.emacs20
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
+	${LOCALBASE}/share/emacs/20.7/site-lisp/semi/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.emacs21 b/editors/semi113/pkg-descr.emacs21
index 6cdf8aac2e11..809794d2066e 100644
--- a/editors/semi113/pkg-descr.emacs21
+++ b/editors/semi113/pkg-descr.emacs21
@@ -1,4 +1,4 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20.
+SEMI, Library of MIME feature for GNU Emacs for emacs21.
 
   SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
   proposed internet standard for including content and headers other
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
+	${LOCALBASE}/share/emacs/21.1/site-lisp/semi/
 
 Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113/pkg-descr.mule b/editors/semi113/pkg-descr.mule
index 8fa7e4591ac6..2bf0d0a88a86 100644
--- a/editors/semi113/pkg-descr.mule
+++ b/editors/semi113/pkg-descr.mule
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
   MUAs.  They are released as separated packages.
 
   SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
+	${LOCALBASE}/share/mule/19.34/site-lisp/semi/
 
 To use flim, put the following setup into your ~/.emacs:
 
diff --git a/editors/semi113/pkg-plist.emacs19 b/editors/semi113/pkg-plist.emacs19
index e82055c5f68c..1eb21ba206b3 100644
--- a/editors/semi113/pkg-plist.emacs19
+++ b/editors/semi113/pkg-plist.emacs19
@@ -1,27 +1,27 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-mc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/%%SEMI_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi113/pkg-plist.emacs20 b/editors/semi113/pkg-plist.emacs20
index 0530ab62eb65..1b7d4f290358 100644
--- a/editors/semi113/pkg-plist.emacs20
+++ b/editors/semi113/pkg-plist.emacs20
@@ -1,28 +1,28 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-mc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi113/pkg-plist.emacs21 b/editors/semi113/pkg-plist.emacs21
index 0530ab62eb65..1b7d4f290358 100644
--- a/editors/semi113/pkg-plist.emacs21
+++ b/editors/semi113/pkg-plist.emacs21
@@ -1,28 +1,28 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-mc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi113/pkg-plist.mule b/editors/semi113/pkg-plist.mule
index ea8349b4409b..bb61c0c037a6 100644
--- a/editors/semi113/pkg-plist.mule
+++ b/editors/semi113/pkg-plist.mule
@@ -1,29 +1,29 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-mc.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-mc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/%%SEMI_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi113/scripts/configure b/editors/semi113/scripts/configure
index 083bc7164d33..ffe214ba26f5 100644
--- a/editors/semi113/scripts/configure
+++ b/editors/semi113/scripts/configure
@@ -4,10 +4,12 @@ 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" \
+	-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" \
+	-e "s;@@EMACS_SITE_LISPDIR@@;${EMACS_SITE_LISPDIR};g" \
+	-e "s;@@EMACS_VERSION_SITE_LISPDIR@@;${EMACS_VERSION_SITE_LISPDIR};g" \
 	> ${WRKDIR}/${i}
 	fi
 done