36 files changed, 145 insertions, 685 deletions

diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
deleted file mode 100644
index b7f64c68d0d6..000000000000
--- a/editors/semi113-emacs/Makefile
+++ /dev/null
@@ -1,211 +0,0 @@
-# New ports collection makefile for:	semi-1.13.x for emacs
-# Date created:		9 May 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	semi
-PORTVERSION=	${SEMI_VER}
-PORTREVISION?=	1
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
-		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-MAINTAINER?=	shige@FreeBSD.org
-
-PORTCLASS?=	master
-
-# distfile version
-FLIM_TRUNK=	1.13
-SEMI_TRUNK=	1.13
-SEMI_VER=	1.13.7
-# setupel filename
-SEMI_SETUPEL=	semi-setupel.el
-# document install directory by install-doc target
-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_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
-.endif
-
-# target name for make build
-ALL_TARGET?=	elc
-# environments
-SCRIPTS_ENV+=	TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
-		SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
-		LISPDIR="${SEMI_LISPDIR}" \
-		VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}"
-
-.include <bsd.port.pre.mk>
-
-.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}
-.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}/${SEMI_SETUPEL}.in ${WRKDIR}
-.endif
-
-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:
-	@${MKDIR} -p ${LOCALBASE}/share/semi
-	@${TOUCH} ${LOCALBASE}/share/semi/${SEMI_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-ui-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-ui-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-ui-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-ui-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}/${SEMIDOCDIR}
-	@(cd ${WRKSRC} ; \
-	for i in ChangeLog NEWS README.* TODO VERSION ; do \
-		${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
-	done)
-
-setupel-install:
-	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-		${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-
-info-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-ui-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-ui-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-ui-en.info mime-ui-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
-	done ; \
-	${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
-	for i in mime-ui-en.texi mime-ui-ja.texi; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} \
-			${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
-	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/semi113-emacs/distinfo b/editors/semi113-emacs/distinfo
deleted file mode 100644
index e5285f2f2660..000000000000
--- a/editors/semi113-emacs/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (semi-1.13.7.tar.gz) = 76c6aec75ae03c3b4813c65be0511018
diff --git a/editors/semi113-emacs/files/_pkg.el b/editors/semi113-emacs/files/_pkg.el
deleted file mode 100644
index 5bc3c1a4a951..000000000000
--- a/editors/semi113-emacs/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'semi
-                 :version 1.18
-                 :type 'regular)
diff --git a/editors/semi113-emacs/files/patch-aa b/editors/semi113-emacs/files/patch-aa
deleted file mode 100644
index 5eb2a1996015..000000000000
--- a/editors/semi113-emacs/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- mime-ui-en.texi.orig	Sun Feb 28 14:35:10 1999
-+++ mime-ui-en.texi	Tue Mar  9 06:43:58 1999
-@@ -1,6 +1,10 @@
- \input texinfo.tex
- @setfilename mime-ui-en.info
- @settitle{SEMI 1.8 Manual}
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-ui-en: (mime-ui-en).	MIME user interface for GNU Emacs. (English)
-+@end direntry 
- @titlepage
- @title SEMI 1.8 Manual
- @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
diff --git a/editors/semi113-emacs/files/patch-ab b/editors/semi113-emacs/files/patch-ab
deleted file mode 100644
index 818a0c70c32a..000000000000
--- a/editors/semi113-emacs/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- mime-ui-ja.texi.orig	Sun Feb 28 14:35:10 1999
-+++ mime-ui-ja.texi	Tue Mar  9 06:44:08 1999
-@@ -1,6 +1,10 @@
- \input texinfo.tex
- @setfilename mime-ui-ja.info
- @settitle{SEMI 1.8 $B@bL@=q(B}
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* mime-ui-ja: (mime-ui-ja).	MIME user interface for GNU Emacs. (Japanese)
-+@end direntry 
- @titlepage
- @title SEMI 1.8 $B@bL@=q(B
- @author $B<i2,(B $BCNI'(B <morioka@@jaist.ac.jp>
diff --git a/editors/semi113-emacs/files/patch-ac b/editors/semi113-emacs/files/patch-ac
deleted file mode 100644
index 2c7aa48962d6..000000000000
--- a/editors/semi113-emacs/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- SEMI-CFG.orig	Wed Sep 16 15:48:58 1998
-+++ SEMI-CFG	Sun May  9 21:54:02 1999
-@@ -11,6 +11,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))
-+(add-to-list 'load-path
- 	     (expand-file-name "." data-directory))
- 
- (when (boundp 'LISPDIR)
diff --git a/editors/semi113-emacs/files/semi-setupel.el.in b/editors/semi113-emacs/files/semi-setupel.el.in
deleted file mode 100644
index 7fdd3efd2ae0..000000000000
--- a/editors/semi113-emacs/files/semi-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)semi-setupel.el -- semi emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
- ) load-path))
-(provide 'semi-setupel)
diff --git a/editors/semi113-emacs/pkg-comment b/editors/semi113-emacs/pkg-comment
deleted file mode 100644
index d645639bb462..000000000000
--- a/editors/semi113-emacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs
diff --git a/editors/semi113-emacs/pkg-descr b/editors/semi113-emacs/pkg-descr
deleted file mode 100644
index 69b4f38b51b1..000000000000
--- a/editors/semi113-emacs/pkg-descr
+++ /dev/null
@@ -1,31 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-	(require 'semi-setupel)
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-emacs/pkg-plist b/editors/semi113-emacs/pkg-plist
deleted file mode 100644
index e82055c5f68c..000000000000
--- a/editors/semi113-emacs/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-%%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
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-info/mime-ui-en.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
diff --git a/editors/semi113-emacs/scripts/configure b/editors/semi113-emacs/scripts/configure
deleted file mode 100644
index 083bc7164d33..000000000000
--- a/editors/semi113-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/semi113-emacs19/Makefile b/editors/semi113-emacs19/Makefile
new file mode 100644
index 000000000000..b9eb7e9398e0
--- /dev/null
+++ b/editors/semi113-emacs19/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	semi-1.13.x for emacs19
+# 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/semi113
+
+# emacs port setup
+EMACS_PORT_NAME=	emacs19
+
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index b823eeda4f7e..40d3ce7e3d65 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -10,12 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/semi113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/semi113
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
 
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/semi113-emacs20/pkg-comment b/editors/semi113-emacs20/pkg-comment
deleted file mode 100644
index 5fedc11e1f37..000000000000
--- a/editors/semi113-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi113-emacs20/pkg-descr b/editors/semi113-emacs20/pkg-descr
deleted file mode 100644
index 6cdf8aac2e11..000000000000
--- a/editors/semi113-emacs20/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-emacs20/pkg-plist b/editors/semi113-emacs20/pkg-plist
deleted file mode 100644
index 0530ab62eb65..000000000000
--- a/editors/semi113-emacs20/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-%%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
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index 7b20077b68a4..16674322962d 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -10,15 +10,9 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/semi113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/semi113
 
 # 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/semi113-mule/pkg-comment b/editors/semi113-mule/pkg-comment
deleted file mode 100644
index 6fa10ef6ea3a..000000000000
--- a/editors/semi113-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for mule
diff --git a/editors/semi113-mule/pkg-descr b/editors/semi113-mule/pkg-descr
deleted file mode 100644
index 8fa7e4591ac6..000000000000
--- a/editors/semi113-mule/pkg-descr
+++ /dev/null
@@ -1,31 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for mule.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/semi/
-
-To use flim, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'flim-setupel)
-	(require 'semi-setupel)
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-mule/pkg-plist b/editors/semi113-mule/pkg-plist
deleted file mode 100644
index ea8349b4409b..000000000000
--- a/editors/semi113-mule/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-%%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
-%%SEMIDOCDIR%%/ChangeLog
-%%SEMIDOCDIR%%/NEWS
-%%SEMIDOCDIR%%/README.en
-%%SEMIDOCDIR%%/TODO
-%%SEMIDOCDIR%%/VERSION
-@dirrm %%SEMIDOCDIR%%
-@unexec install-info --delete %D/info/mime-ui-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ui-ja.info %D/info/dir
-info/mime-ui-en.info
-info/mime-ui-ja.info
-@exec install-info %D/info/mime-ui-en.info %D/info/dir
-@exec install-info %D/info/mime-ui-ja.info %D/info/dir
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi || true
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index 0077ae6cebec..6afe7ada180a 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/semi113-emacs
+MASTERDIR=	${.CURDIR}/../../editors/semi113
 
 # 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.semi
 
diff --git a/editors/semi113-xemacs21-mule/pkg-comment b/editors/semi113-xemacs21-mule/pkg-comment
deleted file mode 100644
index cecdd81db035..000000000000
--- a/editors/semi113-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi113-xemacs21-mule/pkg-descr b/editors/semi113-xemacs21-mule/pkg-descr
deleted file mode 100644
index 49c1b5eb33ca..000000000000
--- a/editors/semi113-xemacs21-mule/pkg-descr
+++ /dev/null
@@ -1,25 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule.
-
-  SEMI is a library to provide MIME feature for GNU Emacs.  MIME is a
-  proposed internet standard for including content and headers other
-  than (ASCII) plain text in messages.
-
-  SEMI has the following features:
-	- MIME message viewer   (mime-view-mode) (RFC 2045 .. 2049)
-	- MIME message composer (mime-edit-mode) (RFC 2045 .. 2049)
-
-  MIME message viewer and composer also support following features:
-	- filename handling by Content-Disposition field (RFC 1806)
-	- PGP/MIME security Multiparts (RFC 2015)
-	- application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
-	- text/richtext (RFC 1521; obsolete; preview only)
-	- text/enriched (RFC 1896)
-	- External method configuration by mailcap (RFC 1524)
-
-  Notice that this package does not contain MIME extender for any
-  MUAs.  They are released as separated packages.
-
-  SEMI is installed the following directory tree:
-	${LOCALBASE}/lib/xemacs/site-packages/lisp/semi/
-
-Ported by shige@FreeBSD.ORG
diff --git a/editors/semi113-xemacs21-mule/pkg-plist b/editors/semi113-xemacs21-mule/pkg-plist
deleted file mode 100644
index 287a42379263..000000000000
--- a/editors/semi113-xemacs21-mule/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-%%EMACS_PACKAGESDIR%%/lisp/semi/ChangeLog
-%%EMACS_PACKAGESDIR%%/lisp/semi/NEWS
-%%EMACS_PACKAGESDIR%%/lisp/semi/README.en
-%%EMACS_PACKAGESDIR%%/lisp/semi/TODO
-%%EMACS_PACKAGESDIR%%/lisp/semi/VERSION
-%%EMACS_PACKAGESDIR%%/lisp/semi/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el
-@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-mc.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-play.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-partial.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el
-@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/semi-setup.elc
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.el
-%%EMACS_PACKAGESDIR%%/lisp/semi/signature.elc
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/semi
-%%EMACS_PACKAGESDIR%%/info/mime-ui-en.info
-%%EMACS_PACKAGESDIR%%/info/mime-ui-ja.info
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-en.texi
-%%EMACS_PACKAGESDIR%%/man/semi/mime-ui-ja.texi
-@dirrm %%EMACS_PACKAGESDIR%%/man/semi
-share/semi/%%SEMI_COOKIE%%
-@unexec /bin/rmdir %D/share/semi||(echo "===>  Please ignore above error.";true)
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