4 files changed, 89 insertions, 112 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 2c23abaf6196..87e41e06d1cf 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -23,12 +23,13 @@ PORTCLASS?=	master
 FLIM_TRUNK=	1.14
 SEMI_TRUNK=	1.14
 SEMI_VER=	1.14.3
-# 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_VERSION_SITE_LISPDIR}
+SEMI_VERSION_SPECIFIC_LISPDIR=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 .if (${PORTCLASS} == "master")
 # emacs port setup
@@ -38,9 +39,10 @@ EMACS_PORT_NAME=	emacs20
 # 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}
+PLIST_SUB+=	SEMIDOCDIR=${SEMIDOCDIR} SEMI_COOKIE=${SEMI_COOKIE}
+MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${SEMI_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
@@ -60,11 +62,6 @@ RUN_DEPENDS+=	${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${F
 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
@@ -92,9 +89,6 @@ pre-install:
 post-install:
 	@${MKDIR} ${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
@@ -161,10 +155,6 @@ doc-install:
 		${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 \
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
index 0b61f7ee11bc..d0b1efca5b5e 100644
--- a/editors/semi/pkg-plist.emacs20
+++ b/editors/semi/pkg-plist.emacs20
@@ -1,44 +1,44 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/postpet.el
-%%EMACS_LIBDIR%%/site-lisp/semi/postpet.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/smime.el
-%%EMACS_LIBDIR%%/site-lisp/semi/smime.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-bbdb.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-w3.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
index 0b61f7ee11bc..d0b1efca5b5e 100644
--- a/editors/semi/pkg-plist.emacs21
+++ b/editors/semi/pkg-plist.emacs21
@@ -1,44 +1,44 @@
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mail-mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-bbdb.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-image.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-partial.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-play.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.el
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-view.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/mime-w3.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-gpg.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg-pgp5.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg.el
-%%EMACS_LIBDIR%%/site-lisp/semi/pgg.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/postpet.el
-%%EMACS_LIBDIR%%/site-lisp/semi/postpet.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-def.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.el
-%%EMACS_LIBDIR%%/site-lisp/semi/semi-setup.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.el
-%%EMACS_LIBDIR%%/site-lisp/semi/signature.elc
-%%EMACS_LIBDIR%%/site-lisp/semi/smime.el
-%%EMACS_LIBDIR%%/site-lisp/semi/smime.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/semi
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mail-mime-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-bbdb.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-edit.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-image.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-partial.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-pgp.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-play.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-view.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/mime-w3.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-def.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-gpg.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-parse.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg-pgp5.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/pgg.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/postpet.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-def.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/semi-setup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/signature.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi/smime.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
 %%SEMIDOCDIR%%/README.en
diff --git a/editors/semi/scripts/configure b/editors/semi/scripts/configure
deleted file mode 100644
index 083bc7164d33..000000000000
--- a/editors/semi/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