summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorShigeyuki Fukushima <shige@FreeBSD.org>1999-08-06 16:56:19 +0000
committerShigeyuki Fukushima <shige@FreeBSD.org>1999-08-06 16:56:19 +0000
commit9e5a01bf353f226cb2a419530e17ba904f30c58d (patch)
treee955881e7a19cc7588431652ae220760bcf8b4db /editors
parentUpdate to the 1.4.19990805 "Preacher Man" version. (diff)
Add EMACS_LIBDIR_WITH_VER valiable.
flim-setupel.el file is installed into ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp.
Notes
Notes: svn path=/head/; revision=20560
Diffstat (limited to 'editors')
-rw-r--r--editors/flim-emacs-current/Makefile20
-rw-r--r--editors/flim-emacs-current/pkg-plist2
-rw-r--r--editors/flim-emacs-current/scripts/configure1
-rw-r--r--editors/flim-emacs/Makefile20
-rw-r--r--editors/flim-emacs/pkg-plist2
-rw-r--r--editors/flim-emacs/scripts/configure1
-rw-r--r--editors/flim-emacs20-current/Makefile6
-rw-r--r--editors/flim-emacs20/Makefile5
-rw-r--r--editors/flim-mule-current/Makefile5
-rw-r--r--editors/flim-mule-current/pkg-plist2
-rw-r--r--editors/flim-mule/Makefile5
-rw-r--r--editors/flim-mule/pkg-plist2
-rw-r--r--editors/flim/Makefile20
-rw-r--r--editors/flim/pkg-plist2
-rw-r--r--editors/flim/pkg-plist.emacs202
-rw-r--r--editors/flim/pkg-plist.emacs212
-rw-r--r--editors/flim/scripts/configure1
-rw-r--r--editors/flim113-emacs/Makefile20
-rw-r--r--editors/flim113-emacs/pkg-plist2
-rw-r--r--editors/flim113-emacs/scripts/configure1
-rw-r--r--editors/flim113-emacs20/Makefile6
-rw-r--r--editors/flim113-mule/Makefile5
-rw-r--r--editors/flim113-mule/pkg-plist2
-rw-r--r--editors/flim113/Makefile20
-rw-r--r--editors/flim113/pkg-plist2
-rw-r--r--editors/flim113/pkg-plist.emacs192
-rw-r--r--editors/flim113/pkg-plist.mule2
-rw-r--r--editors/flim113/scripts/configure1
-rw-r--r--editors/flim114-emacs20/Makefile20
-rw-r--r--editors/flim114-emacs20/pkg-plist2
-rw-r--r--editors/flim114-emacs20/scripts/configure1
31 files changed, 109 insertions, 75 deletions
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile
index ee25024c23b0..392eeeee6063 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 e303dd6b448b..bb84e793d46a 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 a489484bfc4a..04796ae5df87 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 afc4c5f6903c..fd9e63bac4f1 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 cc7ef050ace7..bcadcf81cb58 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 a489484bfc4a..04796ae5df87 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 01b8506cb92f..32be770853bb 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 5aab1724fec3..cb08246c3200 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 d8398869d8f7..f1e26cb9fd48 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 7661d9e3cda8..7d97b4635586 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 f80db77e4d78..f3a684034d98 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 cc7ef050ace7..bcadcf81cb58 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 ee25024c23b0..392eeeee6063 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 e303dd6b448b..bb84e793d46a 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 e303dd6b448b..bb84e793d46a 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 e303dd6b448b..bb84e793d46a 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 a489484bfc4a..04796ae5df87 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 ee25024c23b0..392eeeee6063 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 e303dd6b448b..bb84e793d46a 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 a489484bfc4a..04796ae5df87 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 01b8506cb92f..32be770853bb 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 d8398869d8f7..f1e26cb9fd48 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 7661d9e3cda8..7d97b4635586 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 ee25024c23b0..392eeeee6063 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 e303dd6b448b..bb84e793d46a 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 e303dd6b448b..bb84e793d46a 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 7661d9e3cda8..7d97b4635586 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 a489484bfc4a..04796ae5df87 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 ee25024c23b0..392eeeee6063 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 e303dd6b448b..bb84e793d46a 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 a489484bfc4a..04796ae5df87 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 19:01:56 +0000