From 2edd36597f5dd5203edce42a3adf7acb64842d04 Mon Sep 17 00:00:00 2001 From: Shigeyuki Fukushima Date: Fri, 6 Aug 1999 17:07:22 +0000 Subject: [PATCH] Add EMACS_LIBDIR_WITH_VER valiable. wemi-setupel.el file is installed into ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp. --- editors/wemi-emacs-current/Makefile | 20 ++++++++++++-------- editors/wemi-emacs-current/pkg-plist | 2 +- editors/wemi-emacs-current/scripts/configure | 1 + editors/wemi-emacs/Makefile | 19 +++++++++++-------- editors/wemi-emacs/pkg-plist | 2 +- editors/wemi-emacs/scripts/configure | 1 + editors/wemi-emacs20-current/Makefile | 5 +++-- editors/wemi-emacs20/Makefile | 5 +++-- editors/wemi-mule-current/Makefile | 5 +++-- editors/wemi-mule-current/pkg-plist | 2 +- editors/wemi-mule/Makefile | 5 +++-- editors/wemi-mule/pkg-plist | 2 +- 12 files changed, 41 insertions(+), 28 deletions(-) diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile index 6b8ee7141fa7..22eb3e236dbc 100644 --- a/editors/wemi-emacs-current/Makefile +++ b/editors/wemi-emacs-current/Makefile @@ -3,7 +3,7 @@ # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.2 1999/05/21 13:35:10 shige Exp $ +# $Id: Makefile,v 1.3 1999/05/23 15:53:17 shige Exp $ # DISTNAME= wemi-${WEMI_VER} @@ -25,7 +25,9 @@ WEMI_SETUPEL= wemi-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} +# 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="${WEMI_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_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}/${WEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${WEMIDOCDIR} diff --git a/editors/wemi-emacs-current/pkg-plist b/editors/wemi-emacs-current/pkg-plist index 4bcd8ca37d9d..ee9986bd0f73 100644 --- a/editors/wemi-emacs-current/pkg-plist +++ b/editors/wemi-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/%%WEMI_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/semi %%WEMIDOCDIR%%/ChangeLog %%WEMIDOCDIR%%/NEWS diff --git a/editors/wemi-emacs-current/scripts/configure b/editors/wemi-emacs-current/scripts/configure index a489484bfc4a..04796ae5df87 100644 --- a/editors/wemi-emacs-current/scripts/configure +++ b/editors/wemi-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/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile index 631a8ee0b14e..db293de5fe26 100644 --- a/editors/wemi-emacs/Makefile +++ b/editors/wemi-emacs/Makefile @@ -3,7 +3,7 @@ # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.2 1999/05/21 13:33:37 shige Exp $ +# $Id: Makefile,v 1.3 1999/05/23 15:49:50 shige Exp $ # DISTNAME= wemi-${WEMI_VER} @@ -25,7 +25,8 @@ WEMI_SETUPEL= wemi-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="${WEMI_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_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}/${WEMI_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${WEMIDOCDIR} diff --git a/editors/wemi-emacs/pkg-plist b/editors/wemi-emacs/pkg-plist index 945ddc1918c7..1b1a3d601a9a 100644 --- a/editors/wemi-emacs/pkg-plist +++ b/editors/wemi-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/%%WEMI_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/semi %%WEMIDOCDIR%%/ChangeLog %%WEMIDOCDIR%%/NEWS diff --git a/editors/wemi-emacs/scripts/configure b/editors/wemi-emacs/scripts/configure index a489484bfc4a..04796ae5df87 100644 --- a/editors/wemi-emacs/scripts/configure +++ b/editors/wemi-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/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile index 021431d082e9..9681b72449bd 100644 --- a/editors/wemi-emacs20-current/Makefile +++ b/editors/wemi-emacs20-current/Makefile @@ -3,7 +3,7 @@ # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.6 1999/04/19 16:44:51 sada Exp $ +# $Id: Makefile,v 1.7 1999/05/10 14:51:35 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-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/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile index a3fe29bb95d4..30ee300c3b0f 100644 --- a/editors/wemi-emacs20/Makefile +++ b/editors/wemi-emacs20/Makefile @@ -3,7 +3,7 @@ # Date created: 23 September 1998 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.8 1999/04/19 16:44:51 sada Exp $ +# $Id: Makefile,v 1.9 1999/05/10 14:41:32 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-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/wemi-mule-current/Makefile b/editors/wemi-mule-current/Makefile index 4e5c4797a452..ceef7efca49a 100644 --- a/editors/wemi-mule-current/Makefile +++ b/editors/wemi-mule-current/Makefile @@ -3,7 +3,7 @@ # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.1.1.1 1999/05/10 14:47:26 shige Exp $ +# $Id: Makefile,v 1.2 1999/05/21 13:36:01 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-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/wemi-mule-current/pkg-plist b/editors/wemi-mule-current/pkg-plist index 67e4b5834057..6d2679dd1546 100644 --- a/editors/wemi-mule-current/pkg-plist +++ b/editors/wemi-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/%%WEMI_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/semi %%WEMIDOCDIR%%/ChangeLog %%WEMIDOCDIR%%/NEWS diff --git a/editors/wemi-mule/Makefile b/editors/wemi-mule/Makefile index 5e2b5310fae0..19927b2fd7c7 100644 --- a/editors/wemi-mule/Makefile +++ b/editors/wemi-mule/Makefile @@ -3,7 +3,7 @@ # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.1.1.1 1999/05/10 13:38:55 shige Exp $ +# $Id: Makefile,v 1.2 1999/05/21 13:34:27 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-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/wemi-mule/pkg-plist b/editors/wemi-mule/pkg-plist index a6717f4eb22b..8e8fa3dd0697 100644 --- a/editors/wemi-mule/pkg-plist +++ b/editors/wemi-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/%%WEMI_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%WEMI_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/semi %%WEMIDOCDIR%%/ChangeLog %%WEMIDOCDIR%%/NEWS