diff options
31 files changed, 109 insertions, 75 deletions
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile index ee25024..392eeee 100644 --- a/editors/flim-emacs-current/Makefile +++ b/editors/flim-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:27:51 shige Exp $ +# $Id: Makefile,v 1.5 1999/05/23 15:39:37 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,18 +52,20 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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 mmencode .if (${EMACS_NAME} != "xemacs") RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail @@ -69,7 +73,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail .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}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim-emacs-current/pkg-plist b/editors/flim-emacs-current/pkg-plist index e303dd6..bb84e79 100644 --- a/editors/flim-emacs-current/pkg-plist +++ b/editors/flim-emacs-current/pkg-plist @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim-emacs-current/scripts/configure b/editors/flim-emacs-current/scripts/configure index a489484..04796ae 100644 --- a/editors/flim-emacs-current/scripts/configure +++ b/editors/flim-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/flim-emacs/Makefile b/editors/flim-emacs/Makefile index afc4c5f..fd9e63b 100644 --- a/editors/flim-emacs/Makefile +++ b/editors/flim-emacs/Makefile @@ -3,7 +3,7 @@ # Date created: 9 May 1999 # Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG> # -# $Id: Makefile,v 1.3 1999/05/21 13:25:30 shige Exp $ +# $Id: Makefile,v 1.4 1999/05/23 15:34:57 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,22 +52,24 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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} .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 @@ -98,7 +102,7 @@ post-install: done) .if (${REQUIRE_SETUPEL} == "YES") @${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim-emacs/pkg-plist b/editors/flim-emacs/pkg-plist index cc7ef05..bcadcf8 100644 --- a/editors/flim-emacs/pkg-plist +++ b/editors/flim-emacs/pkg-plist @@ -26,7 +26,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc %%EMACS_LIBDIR%%/site-lisp/flim/std11.el %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/README.en diff --git a/editors/flim-emacs/scripts/configure b/editors/flim-emacs/scripts/configure index a489484..04796ae 100644 --- a/editors/flim-emacs/scripts/configure +++ b/editors/flim-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/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile index 01b8506..32be770 100644 --- a/editors/flim-emacs20-current/Makefile +++ b/editors/flim-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:39:50 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,8 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current EMACS_NAME= emacs EMACS_PORT= emacs20 EMACS_VER= 20.3 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} +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/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile index 5aab172..cb08246 100644 --- a/editors/flim-emacs20/Makefile +++ b/editors/flim-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:13 sada Exp $ +# $Id: Makefile,v 1.8 1999/05/09 16:26:19 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-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/flim-mule-current/Makefile b/editors/flim-mule-current/Makefile index d839886..f1e26cb 100644 --- a/editors/flim-mule-current/Makefile +++ b/editors/flim-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:36:49 shige Exp $ +# $Id: Makefile,v 1.2 1999/05/21 13:28:48 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-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/flim-mule-current/pkg-plist b/editors/flim-mule-current/pkg-plist index 7661d9e..7d97b46 100644 --- a/editors/flim-mule-current/pkg-plist +++ b/editors/flim-mule-current/pkg-plist @@ -36,7 +36,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile index f80db77..f3a6840 100644 --- a/editors/flim-mule/Makefile +++ b/editors/flim-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:22:35 shige Exp $ +# $Id: Makefile,v 1.2 1999/05/21 13:26:51 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-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_NAME} HAVE_COMMON_PORT= YES REQUIRE_SETUPEL= YES diff --git a/editors/flim-mule/pkg-plist b/editors/flim-mule/pkg-plist index cc7ef05..bcadcf8 100644 --- a/editors/flim-mule/pkg-plist +++ b/editors/flim-mule/pkg-plist @@ -26,7 +26,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc %%EMACS_LIBDIR%%/site-lisp/flim/std11.el %%EMACS_LIBDIR%%/site-lisp/flim/std11.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/README.en diff --git a/editors/flim/Makefile b/editors/flim/Makefile index ee25024..392eeee 100644 --- a/editors/flim/Makefile +++ b/editors/flim/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:27:51 shige Exp $ +# $Id: Makefile,v 1.5 1999/05/23 15:39:37 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,18 +52,20 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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 mmencode .if (${EMACS_NAME} != "xemacs") RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail @@ -69,7 +73,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail .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}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist index e303dd6..bb84e79 100644 --- a/editors/flim/pkg-plist +++ b/editors/flim/pkg-plist @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20 index e303dd6..bb84e79 100644 --- a/editors/flim/pkg-plist.emacs20 +++ b/editors/flim/pkg-plist.emacs20 @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21 index e303dd6..bb84e79 100644 --- a/editors/flim/pkg-plist.emacs21 +++ b/editors/flim/pkg-plist.emacs21 @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim/scripts/configure b/editors/flim/scripts/configure index a489484..04796ae 100644 --- a/editors/flim/scripts/configure +++ b/editors/flim/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/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile index ee25024..392eeee 100644 --- a/editors/flim113-emacs/Makefile +++ b/editors/flim113-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:27:51 shige Exp $ +# $Id: Makefile,v 1.5 1999/05/23 15:39:37 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,18 +52,20 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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 mmencode .if (${EMACS_NAME} != "xemacs") RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail @@ -69,7 +73,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail .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}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim113-emacs/pkg-plist b/editors/flim113-emacs/pkg-plist index e303dd6..bb84e79 100644 --- a/editors/flim113-emacs/pkg-plist +++ b/editors/flim113-emacs/pkg-plist @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim113-emacs/scripts/configure b/editors/flim113-emacs/scripts/configure index a489484..04796ae 100644 --- a/editors/flim113-emacs/scripts/configure +++ b/editors/flim113-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/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile index 01b8506..32be770 100644 --- a/editors/flim113-emacs20/Makefile +++ b/editors/flim113-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:39:50 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,8 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current EMACS_NAME= emacs EMACS_PORT= emacs20 EMACS_VER= 20.3 -EMACS_LIBDIR= share/${EMACS_NAME} -EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER} +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/flim113-mule/Makefile b/editors/flim113-mule/Makefile index d839886..f1e26cb 100644 --- a/editors/flim113-mule/Makefile +++ b/editors/flim113-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:36:49 shige Exp $ +# $Id: Makefile,v 1.2 1999/05/21 13:28:48 shige Exp $ # MAINTAINER= shige@FreeBSD.ORG @@ -17,7 +17,8 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-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/flim113-mule/pkg-plist b/editors/flim113-mule/pkg-plist index 7661d9e..7d97b46 100644 --- a/editors/flim113-mule/pkg-plist +++ b/editors/flim113-mule/pkg-plist @@ -36,7 +36,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile index ee25024..392eeee 100644 --- a/editors/flim113/Makefile +++ b/editors/flim113/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:27:51 shige Exp $ +# $Id: Makefile,v 1.5 1999/05/23 15:39:37 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,18 +52,20 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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 mmencode .if (${EMACS_NAME} != "xemacs") RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail @@ -69,7 +73,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail .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}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim113/pkg-plist b/editors/flim113/pkg-plist index e303dd6..bb84e79 100644 --- a/editors/flim113/pkg-plist +++ b/editors/flim113/pkg-plist @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim113/pkg-plist.emacs19 b/editors/flim113/pkg-plist.emacs19 index e303dd6..bb84e79 100644 --- a/editors/flim113/pkg-plist.emacs19 +++ b/editors/flim113/pkg-plist.emacs19 @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim113/pkg-plist.mule b/editors/flim113/pkg-plist.mule index 7661d9e..7d97b46 100644 --- a/editors/flim113/pkg-plist.mule +++ b/editors/flim113/pkg-plist.mule @@ -36,7 +36,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim113/scripts/configure b/editors/flim113/scripts/configure index a489484..04796ae 100644 --- a/editors/flim113/scripts/configure +++ b/editors/flim113/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/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile index ee25024..392eeee 100644 --- a/editors/flim114-emacs20/Makefile +++ b/editors/flim114-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:27:51 shige Exp $ +# $Id: Makefile,v 1.5 1999/05/23 15:39:37 shige Exp $ # DISTNAME= flim-${FLIM_VER} @@ -24,7 +24,9 @@ FLIM_SETUPEL= flim-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 @@ -50,18 +52,20 @@ 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="${FLIM_SETUPEL}" PLIST_SUB= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \ + EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_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 mmencode .if (${EMACS_NAME} != "xemacs") RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail @@ -69,7 +73,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail .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}/${FLIM_SETUPEL} \ - ${PREFIX}/${EMACS_LIBDIR}/site-lisp + ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp .endif .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${FLIMDOCDIR} diff --git a/editors/flim114-emacs20/pkg-plist b/editors/flim114-emacs20/pkg-plist index e303dd6..bb84e79 100644 --- a/editors/flim114-emacs20/pkg-plist +++ b/editors/flim114-emacs20/pkg-plist @@ -32,7 +32,7 @@ %%EMACS_LIBDIR%%/site-lisp/flim/smtp.elc %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.el %%EMACS_LIBDIR%%/site-lisp/flim/smtpmail.elc -%%EMACS_LIBDIR%%/site-lisp/%%FLIM_SETUPEL%% +%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%FLIM_SETUPEL%% @dirrm %%EMACS_LIBDIR%%/site-lisp/flim %%FLIMDOCDIR%%/ChangeLog %%FLIMDOCDIR%%/NEWS diff --git a/editors/flim114-emacs20/scripts/configure b/editors/flim114-emacs20/scripts/configure index a489484..04796ae 100644 --- a/editors/flim114-emacs20/scripts/configure +++ b/editors/flim114-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 |
