author: Shigeyuki Fukushima <shige@FreeBSD.org> 1999-08-06 17:01:02 +0000
committer: Shigeyuki Fukushima <shige@FreeBSD.org> 1999-08-06 17:01:02 +0000
commit: 97d530e1d3a096a1f65ab2e9c7611aecaaec4976 (patch)
tree: 7b1bd143775d99bab495f9869ddc8fae217fe1d0 /editors
parent: 9e5a01bf353f226cb2a419530e17ba904f30c58d (diff)
download: ports-97d530e1d3a096a1f65ab2e9c7611aecaaec4976.tar.gz
ports-97d530e1d3a096a1f65ab2e9c7611aecaaec4976.zip
29 files changed, 106 insertions, 71 deletions
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index e0896c088ce4..c6a169a000bf 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:27 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,9 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +53,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +106,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi-emacs-current/pkg-plist b/editors/semi-emacs-current/pkg-plist
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi-emacs-current/pkg-plist
+++ b/editors/semi-emacs-current/pkg-plist
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi-emacs-current/scripts/configure b/editors/semi-emacs-current/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi-emacs-current/scripts/configure
+++ b/editors/semi-emacs-current/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index e741e4051e5f..28327bd95932 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:29:59 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:22 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,8 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +52,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +105,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi-emacs/pkg-plist b/editors/semi-emacs/pkg-plist
index 166805523f07..9ba812ce5582 100644
--- a/editors/semi-emacs/pkg-plist
+++ b/editors/semi-emacs/pkg-plist
@@ -22,7 +22,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi-emacs/scripts/configure b/editors/semi-emacs/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi-emacs/scripts/configure
+++ b/editors/semi-emacs/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile
index 625dcabfdd73..1562cc376c57 100644
--- a/editors/semi-emacs20-current/Makefile
+++ b/editors/semi-emacs20-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/04/18 05:01:14 sada Exp $
+# $Id: Makefile,v 1.7 1999/05/09 16:58:51 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.3
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index 4326614d169b..d8f6b04482de 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/04/18 05:01:14 sada Exp $
+# $Id: Makefile,v 1.8 1999/05/09 16:51:30 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.3
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile
index 303cac7131c2..3aab16877620 100644
--- a/editors/semi-mule-current/Makefile
+++ b/editors/semi-mule-current/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/09 16:56:53 shige Exp $
+# $Id: Makefile,v 1.2 1999/05/21 13:32:36 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 HAVE_COMMON_PORT=	YES
 REQUIRE_SETUPEL=	YES
diff --git a/editors/semi-mule-current/pkg-plist b/editors/semi-mule-current/pkg-plist
index 39297deb05f8..99d0da3c9dfe 100644
--- a/editors/semi-mule-current/pkg-plist
+++ b/editors/semi-mule-current/pkg-plist
@@ -22,7 +22,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile
index f00f406907bc..4ae036588412 100644
--- a/editors/semi-mule/Makefile
+++ b/editors/semi-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/09 16:48:44 shige Exp $
+# $Id: Makefile,v 1.2 1999/05/21 13:30:51 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 HAVE_COMMON_PORT=	YES
 REQUIRE_SETUPEL=	YES
diff --git a/editors/semi-mule/pkg-plist b/editors/semi-mule/pkg-plist
index 930d26a0db3b..a72c35ee8d36 100644
--- a/editors/semi-mule/pkg-plist
+++ b/editors/semi-mule/pkg-plist
@@ -24,7 +24,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index e0896c088ce4..c6a169a000bf 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:27 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,9 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +53,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +106,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi/pkg-plist.emacs20 b/editors/semi/pkg-plist.emacs20
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi/pkg-plist.emacs20
+++ b/editors/semi/pkg-plist.emacs20
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi/pkg-plist.emacs21 b/editors/semi/pkg-plist.emacs21
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi/pkg-plist.emacs21
+++ b/editors/semi/pkg-plist.emacs21
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi/scripts/configure b/editors/semi/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi/scripts/configure
+++ b/editors/semi/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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-emacs/Makefile b/editors/semi113-emacs/Makefile
index e0896c088ce4..c6a169a000bf 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:27 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,9 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +53,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +106,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi113-emacs/pkg-plist b/editors/semi113-emacs/pkg-plist
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi113-emacs/pkg-plist
+++ b/editors/semi113-emacs/pkg-plist
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113-emacs/scripts/configure b/editors/semi113-emacs/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi113-emacs/scripts/configure
+++ b/editors/semi113-emacs/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 625dcabfdd73..1562cc376c57 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/04/18 05:01:14 sada Exp $
+# $Id: Makefile,v 1.7 1999/05/09 16:58:51 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.3
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index 303cac7131c2..3aab16877620 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/09 16:56:53 shige Exp $
+# $Id: Makefile,v 1.2 1999/05/21 13:32:36 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 HAVE_COMMON_PORT=	YES
 REQUIRE_SETUPEL=	YES
diff --git a/editors/semi113-mule/pkg-plist b/editors/semi113-mule/pkg-plist
index 39297deb05f8..99d0da3c9dfe 100644
--- a/editors/semi113-mule/pkg-plist
+++ b/editors/semi113-mule/pkg-plist
@@ -22,7 +22,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index e0896c088ce4..c6a169a000bf 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:27 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,9 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +53,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +106,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi113/pkg-plist.emacs19 b/editors/semi113/pkg-plist.emacs19
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi113/pkg-plist.emacs19
+++ b/editors/semi113/pkg-plist.emacs19
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113/pkg-plist.mule b/editors/semi113/pkg-plist.mule
index 39297deb05f8..99d0da3c9dfe 100644
--- a/editors/semi113/pkg-plist.mule
+++ b/editors/semi113/pkg-plist.mule
@@ -22,7 +22,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi113/scripts/configure b/editors/semi113/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi113/scripts/configure
+++ b/editors/semi113/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index e0896c088ce4..c6a169a000bf 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 May 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/05/21 13:31:52 shige Exp $
+# $Id: Makefile,v 1.5 1999/05/23 15:44:27 shige Exp $
 #
 
 DISTNAME=	semi-${SEMI_VER}
@@ -25,7 +25,9 @@ SEMI_SETUPEL=	semi-setupel.el
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -51,25 +53,27 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${SEMI_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${EMACS_VER} == "19.34")
 # depends on custom: emacs-19.34 or mule-19.34
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT}
 .endif
 # depends on apel
-BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+RUN_DEPENDS+=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
 # depends on flim
 BUILD_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 RUN_DEPENDS+=	${PKG_DBDIR}/flim-${EMACS_PORT}-${FLIM_VER}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -102,7 +106,7 @@ post-install:
 	done)
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${SEMIDOCDIR}
diff --git a/editors/semi114-emacs20/pkg-plist b/editors/semi114-emacs20/pkg-plist
index 051d24139c8e..9378598c520d 100644
--- a/editors/semi114-emacs20/pkg-plist
+++ b/editors/semi114-emacs20/pkg-plist
@@ -20,7 +20,7 @@
 %%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%%/site-lisp/%%SEMI_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%SEMI_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/semi
 %%SEMIDOCDIR%%/ChangeLog
 %%SEMIDOCDIR%%/NEWS
diff --git a/editors/semi114-emacs20/scripts/configure b/editors/semi114-emacs20/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/semi114-emacs20/scripts/configure
+++ b/editors/semi114-emacs20/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};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
author	Shigeyuki Fukushima <shige@FreeBSD.org>	1999-08-06 17:01:02 +0000
committer	Shigeyuki Fukushima <shige@FreeBSD.org>	1999-08-06 17:01:02 +0000
commit	97d530e1d3a096a1f65ab2e9c7611aecaaec4976 (patch)
tree	7b1bd143775d99bab495f9869ddc8fae217fe1d0 /editors
parent	9e5a01bf353f226cb2a419530e17ba904f30c58d (diff)
download	ports-97d530e1d3a096a1f65ab2e9c7611aecaaec4976.tar.gz ports-97d530e1d3a096a1f65ab2e9c7611aecaaec4976.zip