aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshige <shige@FreeBSD.org>2000-07-12 23:51:49 +0800
committershige <shige@FreeBSD.org>2000-07-12 23:51:49 +0800
commit093488a6c73e5f74e21f5338668735f844909b4b (patch)
treebad9832cb1ec0e7bb7a7dcadfbdd7907fd5f9b1b
parent07893b28b23ddcfd66573349ca4631f5094f4191 (diff)
downloadfreebsd-ports-gnome-093488a6c73e5f74e21f5338668735f844909b4b.tar.gz
freebsd-ports-gnome-093488a6c73e5f74e21f5338668735f844909b4b.tar.zst
freebsd-ports-gnome-093488a6c73e5f74e21f5338668735f844909b4b.zip
Convert into EMACS_PORT_NAME style port.
-rw-r--r--editors/flim-emacs-current/Makefile92
-rw-r--r--editors/flim-emacs-current/files/flim-setupel.el.in2
-rw-r--r--editors/flim-emacs-current/pkg-descr2
-rw-r--r--editors/flim-emacs-current/pkg-plist2
-rw-r--r--editors/flim-emacs-current/scripts/configure2
-rw-r--r--editors/flim-emacs/Makefile92
-rw-r--r--editors/flim-emacs/files/flim-setupel.el.in2
-rw-r--r--editors/flim-emacs/pkg-descr2
-rw-r--r--editors/flim-emacs/scripts/configure2
-rw-r--r--editors/flim-emacs20-current/Makefile9
-rw-r--r--editors/flim-emacs20-current/pkg-descr2
-rw-r--r--editors/flim-emacs20/Makefile9
-rw-r--r--editors/flim-emacs20/pkg-descr2
-rw-r--r--editors/flim-mule-current/Makefile10
-rw-r--r--editors/flim-mule-current/pkg-descr2
-rw-r--r--editors/flim-mule/Makefile10
-rw-r--r--editors/flim-mule/pkg-descr2
-rw-r--r--editors/flim-xemacs-current/Makefile7
-rw-r--r--editors/flim-xemacs-current/pkg-descr2
-rw-r--r--editors/flim-xemacs/Makefile7
-rw-r--r--editors/flim-xemacs/pkg-descr2
-rw-r--r--editors/flim-xemacs20-current/Makefile7
-rw-r--r--editors/flim-xemacs20-current/pkg-descr2
-rw-r--r--editors/flim-xemacs20/Makefile7
-rw-r--r--editors/flim-xemacs20/pkg-descr2
-rw-r--r--editors/flim/Makefile92
-rw-r--r--editors/flim/files/flim-setupel.el.in2
-rw-r--r--editors/flim/pkg-descr2
-rw-r--r--editors/flim/pkg-descr.emacs202
-rw-r--r--editors/flim/pkg-descr.emacs212
-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/configure2
-rw-r--r--editors/flim113-emacs/Makefile92
-rw-r--r--editors/flim113-emacs/files/flim-setupel.el.in2
-rw-r--r--editors/flim113-emacs/pkg-descr2
-rw-r--r--editors/flim113-emacs/pkg-plist2
-rw-r--r--editors/flim113-emacs/scripts/configure2
-rw-r--r--editors/flim113-emacs20/Makefile9
-rw-r--r--editors/flim113-emacs20/pkg-descr2
-rw-r--r--editors/flim113-mule/Makefile10
-rw-r--r--editors/flim113-mule/pkg-descr2
-rw-r--r--editors/flim113-xemacs/Makefile7
-rw-r--r--editors/flim113-xemacs/pkg-descr2
-rw-r--r--editors/flim113-xemacs20/Makefile7
-rw-r--r--editors/flim113-xemacs20/pkg-descr2
-rw-r--r--editors/flim113/Makefile92
-rw-r--r--editors/flim113/files/flim-setupel.el.in2
-rw-r--r--editors/flim113/pkg-descr2
-rw-r--r--editors/flim113/pkg-descr.emacs192
-rw-r--r--editors/flim113/pkg-descr.emacs202
-rw-r--r--editors/flim113/pkg-descr.mule2
-rw-r--r--editors/flim113/pkg-plist2
-rw-r--r--editors/flim113/pkg-plist.emacs192
-rw-r--r--editors/flim113/scripts/configure2
-rw-r--r--editors/flim114-emacs20/Makefile92
-rw-r--r--editors/flim114-emacs20/files/flim-setupel.el.in2
-rw-r--r--editors/flim114-emacs20/pkg-descr2
-rw-r--r--editors/flim114-emacs20/pkg-plist2
-rw-r--r--editors/flim114-emacs20/scripts/configure2
-rw-r--r--editors/semi-emacs-current/Makefile101
-rw-r--r--editors/semi-emacs-current/files/semi-setupel.el.in2
-rw-r--r--editors/semi-emacs-current/pkg-descr2
-rw-r--r--editors/semi-emacs-current/scripts/configure2
-rw-r--r--editors/semi-emacs/Makefile100
-rw-r--r--editors/semi-emacs/files/semi-setupel.el.in2
-rw-r--r--editors/semi-emacs/pkg-descr2
-rw-r--r--editors/semi-emacs/scripts/configure2
-rw-r--r--editors/semi-emacs20-current/Makefile9
-rw-r--r--editors/semi-emacs20-current/pkg-descr2
-rw-r--r--editors/semi-emacs20/Makefile9
-rw-r--r--editors/semi-emacs20/pkg-descr2
-rw-r--r--editors/semi-mule-current/Makefile10
-rw-r--r--editors/semi-mule-current/pkg-descr2
-rw-r--r--editors/semi-mule/Makefile10
-rw-r--r--editors/semi-mule/pkg-descr2
-rw-r--r--editors/semi-xemacs-current/Makefile7
-rw-r--r--editors/semi-xemacs-current/pkg-descr2
-rw-r--r--editors/semi-xemacs/Makefile7
-rw-r--r--editors/semi-xemacs/pkg-descr2
-rw-r--r--editors/semi-xemacs20-current/Makefile7
-rw-r--r--editors/semi-xemacs20-current/pkg-descr2
-rw-r--r--editors/semi-xemacs20/Makefile7
-rw-r--r--editors/semi-xemacs20/pkg-descr2
-rw-r--r--editors/semi/Makefile101
-rw-r--r--editors/semi/files/semi-setupel.el.in2
-rw-r--r--editors/semi/pkg-descr.emacs202
-rw-r--r--editors/semi/pkg-descr.emacs212
-rw-r--r--editors/semi/scripts/configure2
-rw-r--r--editors/semi113-emacs/Makefile101
-rw-r--r--editors/semi113-emacs/files/semi-setupel.el.in2
-rw-r--r--editors/semi113-emacs/pkg-descr2
-rw-r--r--editors/semi113-emacs/scripts/configure2
-rw-r--r--editors/semi113-emacs20/Makefile9
-rw-r--r--editors/semi113-emacs20/pkg-descr2
-rw-r--r--editors/semi113-mule/Makefile10
-rw-r--r--editors/semi113-mule/pkg-descr2
-rw-r--r--editors/semi113-xemacs/Makefile7
-rw-r--r--editors/semi113-xemacs/pkg-descr2
-rw-r--r--editors/semi113-xemacs20/Makefile7
-rw-r--r--editors/semi113-xemacs20/pkg-descr2
-rw-r--r--editors/semi113/Makefile101
-rw-r--r--editors/semi113/files/semi-setupel.el.in2
-rw-r--r--editors/semi113/pkg-descr.emacs192
-rw-r--r--editors/semi113/pkg-descr.emacs202
-rw-r--r--editors/semi113/pkg-descr.emacs212
-rw-r--r--editors/semi113/pkg-descr.mule2
-rw-r--r--editors/semi113/scripts/configure2
-rw-r--r--editors/semi114-emacs20/Makefile101
-rw-r--r--editors/semi114-emacs20/files/semi-setupel.el.in2
-rw-r--r--editors/semi114-emacs20/pkg-descr2
-rw-r--r--editors/semi114-emacs20/scripts/configure2
-rw-r--r--editors/wemi-emacs-current/Makefile101
-rw-r--r--editors/wemi-emacs-current/files/wemi-setupel.el.in2
-rw-r--r--editors/wemi-emacs-current/pkg-descr2
-rw-r--r--editors/wemi-emacs-current/scripts/configure2
-rw-r--r--editors/wemi-emacs/Makefile105
-rw-r--r--editors/wemi-emacs/files/wemi-setupel.el.in2
-rw-r--r--editors/wemi-emacs/pkg-descr2
-rw-r--r--editors/wemi-emacs/scripts/configure2
-rw-r--r--editors/wemi-emacs20-current/Makefile9
-rw-r--r--editors/wemi-emacs20-current/pkg-descr2
-rw-r--r--editors/wemi-emacs20/Makefile9
-rw-r--r--editors/wemi-mule-current/Makefile10
-rw-r--r--editors/wemi-mule-current/pkg-descr2
-rw-r--r--editors/wemi-mule/Makefile10
-rw-r--r--editors/wemi-mule/pkg-descr2
-rw-r--r--editors/wemi-xemacs-current/Makefile7
-rw-r--r--editors/wemi-xemacs-current/pkg-descr2
-rw-r--r--editors/wemi-xemacs/Makefile7
-rw-r--r--editors/wemi-xemacs/pkg-descr2
-rw-r--r--editors/wemi-xemacs20-current/Makefile7
-rw-r--r--editors/wemi-xemacs20-current/pkg-descr2
-rw-r--r--editors/wemi-xemacs20/Makefile7
-rw-r--r--editors/wemi-xemacs20/pkg-descr2
136 files changed, 622 insertions, 1185 deletions
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile
index 75b435e7ccee..2265d76451a0 100644
--- a/editors/flim-emacs-current/Makefile
+++ b/editors/flim-emacs-current/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.13.2
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -172,39 +150,39 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim-emacs-current/files/flim-setupel.el.in b/editors/flim-emacs-current/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim-emacs-current/files/flim-setupel.el.in
+++ b/editors/flim-emacs-current/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim-emacs-current/pkg-descr b/editors/flim-emacs-current/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim-emacs-current/pkg-descr
+++ b/editors/flim-emacs-current/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim-emacs-current/pkg-plist b/editors/flim-emacs-current/pkg-plist
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim-emacs-current/pkg-plist
+++ b/editors/flim-emacs-current/pkg-plist
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim-emacs-current/scripts/configure b/editors/flim-emacs-current/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim-emacs-current/scripts/configure
+++ b/editors/flim-emacs-current/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile
index a1f2e4fb22dd..9c9b9ca8be7d 100644
--- a/editors/flim-emacs/Makefile
+++ b/editors/flim-emacs/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.12/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.12/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.12/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.12/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.12.7
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -167,7 +145,7 @@ info-build-by-emacs:
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
pkg-el-copy:
@@ -177,34 +155,34 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim-emacs/files/flim-setupel.el.in b/editors/flim-emacs/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim-emacs/files/flim-setupel.el.in
+++ b/editors/flim-emacs/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim-emacs/pkg-descr b/editors/flim-emacs/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim-emacs/pkg-descr
+++ b/editors/flim-emacs/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim-emacs/scripts/configure b/editors/flim-emacs/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim-emacs/scripts/configure
+++ b/editors/flim-emacs/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile
index e5baf402f260..739eff5d587c 100644
--- a/editors/flim-emacs20-current/Makefile
+++ b/editors/flim-emacs20-current/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-emacs20-current/pkg-descr b/editors/flim-emacs20-current/pkg-descr
index 0390a7448775..2f54be83c580 100644
--- a/editors/flim-emacs20-current/pkg-descr
+++ b/editors/flim-emacs20-current/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index cad0b173f73a..7b94a5b58503 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-emacs20/pkg-descr b/editors/flim-emacs20/pkg-descr
index 0390a7448775..2f54be83c580 100644
--- a/editors/flim-emacs20/pkg-descr
+++ b/editors/flim-emacs20/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-mule-current/Makefile b/editors/flim-mule-current/Makefile
index a6360de02b1e..9d859d76107b 100644
--- a/editors/flim-mule-current/Makefile
+++ b/editors/flim-mule-current/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-mule-current/pkg-descr b/editors/flim-mule-current/pkg-descr
index 2ab1c2d7e28c..d235eb18a260 100644
--- a/editors/flim-mule-current/pkg-descr
+++ b/editors/flim-mule-current/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/mule/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile
index 893f2c08131a..b3a0c5190500 100644
--- a/editors/flim-mule/Makefile
+++ b/editors/flim-mule/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-mule/pkg-descr b/editors/flim-mule/pkg-descr
index 2ab1c2d7e28c..d235eb18a260 100644
--- a/editors/flim-mule/pkg-descr
+++ b/editors/flim-mule/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/mule/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim-xemacs-current/Makefile b/editors/flim-xemacs-current/Makefile
index d2ebea473323..36d4f50cbfff 100644
--- a/editors/flim-xemacs-current/Makefile
+++ b/editors/flim-xemacs-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-xemacs-current/pkg-descr b/editors/flim-xemacs-current/pkg-descr
index f25dde6d0041..8a73d33d38fe 100644
--- a/editors/flim-xemacs-current/pkg-descr
+++ b/editors/flim-xemacs-current/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-xemacs/Makefile b/editors/flim-xemacs/Makefile
index 1cd68e1c9756..664c972d6510 100644
--- a/editors/flim-xemacs/Makefile
+++ b/editors/flim-xemacs/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-xemacs/pkg-descr b/editors/flim-xemacs/pkg-descr
index f25dde6d0041..8a73d33d38fe 100644
--- a/editors/flim-xemacs/pkg-descr
+++ b/editors/flim-xemacs/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-xemacs20-current/Makefile b/editors/flim-xemacs20-current/Makefile
index 6061cb980fd2..f3270189c694 100644
--- a/editors/flim-xemacs20-current/Makefile
+++ b/editors/flim-xemacs20-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-xemacs20-current/pkg-descr b/editors/flim-xemacs20-current/pkg-descr
index bc0155d84743..b2caa8c19b15 100644
--- a/editors/flim-xemacs20-current/pkg-descr
+++ b/editors/flim-xemacs20-current/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-xemacs20/Makefile b/editors/flim-xemacs20/Makefile
index f6f3d6192cab..b1fbc2fa00a5 100644
--- a/editors/flim-xemacs20/Makefile
+++ b/editors/flim-xemacs20/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim-xemacs20/pkg-descr b/editors/flim-xemacs20/pkg-descr
index bc0155d84743..b2caa8c19b15 100644
--- a/editors/flim-xemacs20/pkg-descr
+++ b/editors/flim-xemacs20/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 75b435e7ccee..2265d76451a0 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.13.2
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -172,39 +150,39 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim/files/flim-setupel.el.in b/editors/flim/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim/files/flim-setupel.el.in
+++ b/editors/flim/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim/pkg-descr b/editors/flim/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim/pkg-descr
+++ b/editors/flim/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim/pkg-descr.emacs20 b/editors/flim/pkg-descr.emacs20
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim/pkg-descr.emacs20
+++ b/editors/flim/pkg-descr.emacs20
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim/pkg-descr.emacs21 b/editors/flim/pkg-descr.emacs21
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim/pkg-descr.emacs21
+++ b/editors/flim/pkg-descr.emacs21
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim/pkg-plist.emacs20 b/editors/flim/pkg-plist.emacs20
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim/pkg-plist.emacs20
+++ b/editors/flim/pkg-plist.emacs20
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim/pkg-plist.emacs21 b/editors/flim/pkg-plist.emacs21
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim/pkg-plist.emacs21
+++ b/editors/flim/pkg-plist.emacs21
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim/scripts/configure b/editors/flim/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim/scripts/configure
+++ b/editors/flim/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index 75b435e7ccee..2265d76451a0 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.13.2
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -172,39 +150,39 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim113-emacs/files/flim-setupel.el.in b/editors/flim113-emacs/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim113-emacs/files/flim-setupel.el.in
+++ b/editors/flim113-emacs/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim113-emacs/pkg-descr b/editors/flim113-emacs/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim113-emacs/pkg-descr
+++ b/editors/flim113-emacs/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim113-emacs/pkg-plist b/editors/flim113-emacs/pkg-plist
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim113-emacs/pkg-plist
+++ b/editors/flim113-emacs/pkg-plist
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim113-emacs/scripts/configure b/editors/flim113-emacs/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim113-emacs/scripts/configure
+++ b/editors/flim113-emacs/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index e5baf402f260..739eff5d587c 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim113-emacs20/pkg-descr b/editors/flim113-emacs20/pkg-descr
index 0390a7448775..2f54be83c580 100644
--- a/editors/flim113-emacs20/pkg-descr
+++ b/editors/flim113-emacs20/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile
index a6360de02b1e..9d859d76107b 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim113-mule/pkg-descr b/editors/flim113-mule/pkg-descr
index 2ab1c2d7e28c..d235eb18a260 100644
--- a/editors/flim113-mule/pkg-descr
+++ b/editors/flim113-mule/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/mule/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim113-xemacs/Makefile b/editors/flim113-xemacs/Makefile
index d2ebea473323..36d4f50cbfff 100644
--- a/editors/flim113-xemacs/Makefile
+++ b/editors/flim113-xemacs/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim113-xemacs/pkg-descr b/editors/flim113-xemacs/pkg-descr
index f25dde6d0041..8a73d33d38fe 100644
--- a/editors/flim113-xemacs/pkg-descr
+++ b/editors/flim113-xemacs/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim113-xemacs20/Makefile b/editors/flim113-xemacs20/Makefile
index 6061cb980fd2..f3270189c694 100644
--- a/editors/flim113-xemacs20/Makefile
+++ b/editors/flim113-xemacs20/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/flim113-xemacs20/pkg-descr b/editors/flim113-xemacs20/pkg-descr
index bc0155d84743..b2caa8c19b15 100644
--- a/editors/flim113-xemacs20/pkg-descr
+++ b/editors/flim113-xemacs20/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/lib/xemacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 75b435e7ccee..2265d76451a0 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.13.2
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -172,39 +150,39 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim113/files/flim-setupel.el.in b/editors/flim113/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim113/files/flim-setupel.el.in
+++ b/editors/flim113/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim113/pkg-descr b/editors/flim113/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim113/pkg-descr
+++ b/editors/flim113/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim113/pkg-descr.emacs19 b/editors/flim113/pkg-descr.emacs19
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim113/pkg-descr.emacs19
+++ b/editors/flim113/pkg-descr.emacs19
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim113/pkg-descr.emacs20 b/editors/flim113/pkg-descr.emacs20
index 0390a7448775..2f54be83c580 100644
--- a/editors/flim113/pkg-descr.emacs20
+++ b/editors/flim113/pkg-descr.emacs20
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for emacs20.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim113/pkg-descr.mule b/editors/flim113/pkg-descr.mule
index 2ab1c2d7e28c..d235eb18a260 100644
--- a/editors/flim113/pkg-descr.mule
+++ b/editors/flim113/pkg-descr.mule
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for mule.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/mule/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/mule/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim113/pkg-plist b/editors/flim113/pkg-plist
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim113/pkg-plist
+++ b/editors/flim113/pkg-plist
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim113/pkg-plist.emacs19 b/editors/flim113/pkg-plist.emacs19
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim113/pkg-plist.emacs19
+++ b/editors/flim113/pkg-plist.emacs19
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim113/scripts/configure b/editors/flim113/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim113/scripts/configure
+++ b/editors/flim113/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile
index 75b435e7ccee..2265d76451a0 100644
--- a/editors/flim114-emacs20/Makefile
+++ b/editors/flim114-emacs20/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= flim-${EMACS_PORT}
+PORTNAME= flim
PORTVERSION= ${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/flim/flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/flim/flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/flim/flim-1.13/
MAINTAINER?= shige@FreeBSD.org
-DISTNAME= flim-${FLIM_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
PORTCLASS?= master
@@ -23,58 +23,38 @@ FLIM_VER= 1.13.2
FLIM_SETUPEL= flim-setupel.el
# document install directory by install-doc target
FLIMDOCDIR?= share/doc/flim
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# for emacs
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${FLIM_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${FLIM_SETUPEL}"
+PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_SETUPEL=${FLIM_SETUPEL} \
FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on apel (case of xemacs-21.x or later)
.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.else
# depends on apel (case of other emacsen etc...)
-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}
+BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
.endif
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -88,8 +68,6 @@ pre-configure:
@${CP} ${FILESDIR}/${FLIM_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
@@ -117,8 +95,8 @@ pre-install:
post-install:
# install package-cookie
- @${MKDIR} -p ${PREFIX}/share/flim
- @${TOUCH} ${PREFIX}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/flim
+ @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -144,7 +122,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -158,7 +136,7 @@ info-build-by-emacs:
for i in mime-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -172,39 +150,39 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${FLIMDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${FLIM_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -212,12 +190,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -225,6 +203,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/flim114-emacs20/files/flim-setupel.el.in b/editors/flim114-emacs20/files/flim-setupel.el.in
index e65e90116ba6..0f1bf4144e76 100644
--- a/editors/flim114-emacs20/files/flim-setupel.el.in
+++ b/editors/flim114-emacs20/files/flim-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/flim"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/flim"
) load-path))
(provide 'flim-setupel)
diff --git a/editors/flim114-emacs20/pkg-descr b/editors/flim114-emacs20/pkg-descr
index af221dd2a4dd..8893698ed661 100644
--- a/editors/flim114-emacs20/pkg-descr
+++ b/editors/flim114-emacs20/pkg-descr
@@ -8,7 +8,7 @@ FLIM, message representation or encoding emacs lisp library for emacs.
- mailcap parser and utility
FLIM is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/flim/ --- FLIM
+ ${LOCALBASE}/share/emacs/site-lisp/flim/ --- FLIM
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/flim114-emacs20/pkg-plist b/editors/flim114-emacs20/pkg-plist
index 92def16ebe96..8013b178f99f 100644
--- a/editors/flim114-emacs20/pkg-plist
+++ b/editors/flim114-emacs20/pkg-plist
@@ -45,3 +45,5 @@
@unexec install-info --delete %D/info/mime-en.info %D/info/dir
info/mime-en.info
@exec install-info %D/info/mime-en.info %D/info/dir
+share/flim/%%FLIM_COOKIE%%
+@unexec /bin/rmdir %D/share/flim || true
diff --git a/editors/flim114-emacs20/scripts/configure b/editors/flim114-emacs20/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/flim114-emacs20/scripts/configure
+++ b/editors/flim114-emacs20/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index f37fae3164a5..0331c6187f95 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.7
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,6 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +90,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +117,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +131,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +145,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +197,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi-emacs-current/files/semi-setupel.el.in b/editors/semi-emacs-current/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi-emacs-current/files/semi-setupel.el.in
+++ b/editors/semi-emacs-current/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi-emacs-current/pkg-descr b/editors/semi-emacs-current/pkg-descr
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi-emacs-current/pkg-descr
+++ b/editors/semi-emacs-current/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi-emacs-current/scripts/configure b/editors/semi-emacs-current/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi-emacs-current/scripts/configure
+++ b/editors/semi-emacs-current/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index 4693812ceeae..52c98a71a411 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.12/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.12/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.4
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,7 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
+# makeinfo stuff
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +91,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +118,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +132,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +146,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +185,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +198,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi-emacs/files/semi-setupel.el.in b/editors/semi-emacs/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi-emacs/files/semi-setupel.el.in
+++ b/editors/semi-emacs/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi-emacs/pkg-descr b/editors/semi-emacs/pkg-descr
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi-emacs/pkg-descr
+++ b/editors/semi-emacs/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi-emacs/scripts/configure b/editors/semi-emacs/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi-emacs/scripts/configure
+++ b/editors/semi-emacs/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile
index 4e40ff6c3c17..bd53da93b24f 100644
--- a/editors/semi-emacs20-current/Makefile
+++ b/editors/semi-emacs20-current/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-emacs20-current/pkg-descr b/editors/semi-emacs20-current/pkg-descr
index 4730cbddbd85..62b014e02da6 100644
--- a/editors/semi-emacs20-current/pkg-descr
+++ b/editors/semi-emacs20-current/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index 9aaf91416f3a..e26999119704 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-emacs20/pkg-descr b/editors/semi-emacs20/pkg-descr
index 4730cbddbd85..62b014e02da6 100644
--- a/editors/semi-emacs20/pkg-descr
+++ b/editors/semi-emacs20/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile
index b1f65136686c..95e2b3adee21 100644
--- a/editors/semi-mule-current/Makefile
+++ b/editors/semi-mule-current/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-mule-current/pkg-descr b/editors/semi-mule-current/pkg-descr
index 0d7de9ab0b4d..e7727d684b63 100644
--- a/editors/semi-mule-current/pkg-descr
+++ b/editors/semi-mule-current/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile
index 047faf8afb92..333c8e22aa61 100644
--- a/editors/semi-mule/Makefile
+++ b/editors/semi-mule/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-mule/pkg-descr b/editors/semi-mule/pkg-descr
index 0d7de9ab0b4d..e7727d684b63 100644
--- a/editors/semi-mule/pkg-descr
+++ b/editors/semi-mule/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi-xemacs-current/Makefile b/editors/semi-xemacs-current/Makefile
index 7a8fae700a68..b4a59b4848b1 100644
--- a/editors/semi-xemacs-current/Makefile
+++ b/editors/semi-xemacs-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-xemacs-current/pkg-descr b/editors/semi-xemacs-current/pkg-descr
index 994b09895623..7dc4fc49bbbb 100644
--- a/editors/semi-xemacs-current/pkg-descr
+++ b/editors/semi-xemacs-current/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-xemacs/Makefile b/editors/semi-xemacs/Makefile
index 6f2521b00be4..93c0c2727753 100644
--- a/editors/semi-xemacs/Makefile
+++ b/editors/semi-xemacs/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-xemacs/pkg-descr b/editors/semi-xemacs/pkg-descr
index 994b09895623..7dc4fc49bbbb 100644
--- a/editors/semi-xemacs/pkg-descr
+++ b/editors/semi-xemacs/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-xemacs20-current/Makefile b/editors/semi-xemacs20-current/Makefile
index 7eb072bdee27..b19b50cc24da 100644
--- a/editors/semi-xemacs20-current/Makefile
+++ b/editors/semi-xemacs20-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-xemacs20-current/pkg-descr b/editors/semi-xemacs20-current/pkg-descr
index 99dae9f3fd58..ff43ab1d6ac4 100644
--- a/editors/semi-xemacs20-current/pkg-descr
+++ b/editors/semi-xemacs20-current/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi-xemacs20/Makefile b/editors/semi-xemacs20/Makefile
index fd6c17a327f3..b9780761cafb 100644
--- a/editors/semi-xemacs20/Makefile
+++ b/editors/semi-xemacs20/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi-xemacs20/pkg-descr b/editors/semi-xemacs20/pkg-descr
index 99dae9f3fd58..ff43ab1d6ac4 100644
--- a/editors/semi-xemacs20/pkg-descr
+++ b/editors/semi-xemacs20/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index f37fae3164a5..0331c6187f95 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.7
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,6 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +90,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +117,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +131,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +145,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +197,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi/files/semi-setupel.el.in b/editors/semi/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi/files/semi-setupel.el.in
+++ b/editors/semi/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi/pkg-descr.emacs20 b/editors/semi/pkg-descr.emacs20
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi/pkg-descr.emacs20
+++ b/editors/semi/pkg-descr.emacs20
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi/pkg-descr.emacs21 b/editors/semi/pkg-descr.emacs21
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi/pkg-descr.emacs21
+++ b/editors/semi/pkg-descr.emacs21
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi/scripts/configure b/editors/semi/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi/scripts/configure
+++ b/editors/semi/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index f37fae3164a5..0331c6187f95 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.7
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,6 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +90,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +117,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +131,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +145,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +197,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi113-emacs/files/semi-setupel.el.in b/editors/semi113-emacs/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi113-emacs/files/semi-setupel.el.in
+++ b/editors/semi113-emacs/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi113-emacs/pkg-descr b/editors/semi113-emacs/pkg-descr
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi113-emacs/pkg-descr
+++ b/editors/semi113-emacs/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi113-emacs/scripts/configure b/editors/semi113-emacs/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi113-emacs/scripts/configure
+++ b/editors/semi113-emacs/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 4e40ff6c3c17..bd53da93b24f 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi113-emacs20/pkg-descr b/editors/semi113-emacs20/pkg-descr
index 4730cbddbd85..62b014e02da6 100644
--- a/editors/semi113-emacs20/pkg-descr
+++ b/editors/semi113-emacs20/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index b1f65136686c..95e2b3adee21 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi113-mule/pkg-descr b/editors/semi113-mule/pkg-descr
index 0d7de9ab0b4d..e7727d684b63 100644
--- a/editors/semi113-mule/pkg-descr
+++ b/editors/semi113-mule/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi113-xemacs/Makefile b/editors/semi113-xemacs/Makefile
index 7a8fae700a68..b4a59b4848b1 100644
--- a/editors/semi113-xemacs/Makefile
+++ b/editors/semi113-xemacs/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi113-xemacs/pkg-descr b/editors/semi113-xemacs/pkg-descr
index 994b09895623..7dc4fc49bbbb 100644
--- a/editors/semi113-xemacs/pkg-descr
+++ b/editors/semi113-xemacs/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113-xemacs20/Makefile b/editors/semi113-xemacs20/Makefile
index 7eb072bdee27..b19b50cc24da 100644
--- a/editors/semi113-xemacs20/Makefile
+++ b/editors/semi113-xemacs20/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/semi113-xemacs20/pkg-descr b/editors/semi113-xemacs20/pkg-descr
index 99dae9f3fd58..ff43ab1d6ac4 100644
--- a/editors/semi113-xemacs20/pkg-descr
+++ b/editors/semi113-xemacs20/pkg-descr
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for xemacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index f37fae3164a5..0331c6187f95 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.7
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,6 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +90,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +117,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +131,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +145,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +197,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi113/files/semi-setupel.el.in b/editors/semi113/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi113/files/semi-setupel.el.in
+++ b/editors/semi113/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi113/pkg-descr.emacs19 b/editors/semi113/pkg-descr.emacs19
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi113/pkg-descr.emacs19
+++ b/editors/semi113/pkg-descr.emacs19
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi113/pkg-descr.emacs20 b/editors/semi113/pkg-descr.emacs20
index 4730cbddbd85..62b014e02da6 100644
--- a/editors/semi113/pkg-descr.emacs20
+++ b/editors/semi113/pkg-descr.emacs20
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/pkg-descr.emacs21 b/editors/semi113/pkg-descr.emacs21
index 4730cbddbd85..62b014e02da6 100644
--- a/editors/semi113/pkg-descr.emacs21
+++ b/editors/semi113/pkg-descr.emacs21
@@ -20,6 +20,6 @@ SEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/semi113/pkg-descr.mule b/editors/semi113/pkg-descr.mule
index 0d7de9ab0b4d..e7727d684b63 100644
--- a/editors/semi113/pkg-descr.mule
+++ b/editors/semi113/pkg-descr.mule
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi113/scripts/configure b/editors/semi113/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi113/scripts/configure
+++ b/editors/semi113/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index f37fae3164a5..0331c6187f95 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= semi-${EMACS_PORT}
+PORTNAME= semi
PORTVERSION= ${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.media.kyoto-u.ac.jp/pub/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.win.or.jp/pub/word/mule/semi/semi-1.13-for-flim-1.13/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/emacs/mule/semi/semi-1.13-for-flim-1.13/
-DISTNAME= semi-${SEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,62 +25,33 @@ SEMI_VER= 1.13.7
SEMI_SETUPEL= semi-setupel.el
# document install directory by install-doc target
SEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${SEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${SEMI_SETUPEL}"
+PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_SETUPEL=${SEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -94,8 +65,6 @@ pre-configure:
@${CP} ${FILESDIR}/${SEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -121,8 +90,8 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -148,7 +117,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -162,7 +131,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -176,38 +145,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${SEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${SEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${SEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${SEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -215,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -228,6 +197,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/semi114-emacs20/files/semi-setupel.el.in b/editors/semi114-emacs20/files/semi-setupel.el.in
index 767148046718..7fdd3efd2ae0 100644
--- a/editors/semi114-emacs20/files/semi-setupel.el.in
+++ b/editors/semi114-emacs20/files/semi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'semi-setupel)
diff --git a/editors/semi114-emacs20/pkg-descr b/editors/semi114-emacs20/pkg-descr
index 2fde40381c18..6643b26f426b 100644
--- a/editors/semi114-emacs20/pkg-descr
+++ b/editors/semi114-emacs20/pkg-descr
@@ -20,7 +20,7 @@ SEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
SEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- SEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- SEMI
To use flim, put the following setup into your ~/.emacs:
diff --git a/editors/semi114-emacs20/scripts/configure b/editors/semi114-emacs20/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/semi114-emacs20/scripts/configure
+++ b/editors/semi114-emacs20/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index a76ecc50905d..2ed83bd513bc 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -5,11 +5,11 @@
# $FreeBSD$
#
-PORTNAME= wemi-${EMACS_PORT}
+PORTNAME= wemi
PORTVERSION= ${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/
-DISTNAME= wemi-${WEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -22,63 +22,32 @@ WEMI_VER= 1.13.7
WEMI_SETUPEL= wemi-setupel.el
# document install directory by install-doc target
WEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
-WEMI_COOKIE= wemi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
+WEMI_COOKIE= wemi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${WEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${WEMI_SETUPEL}"
+PLIST_SUB+= WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE} WEMI_COOKIE=${WEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}-current
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}-current
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -119,9 +88,9 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
- @${TOUCH} ${PREFIX}/share/semi/${WEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
+ @${TOUCH} ${LOCALBASE}/share/semi/${WEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -147,7 +116,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -161,7 +130,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -175,38 +144,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${WEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${WEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${WEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${WEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${WEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -214,12 +183,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -227,6 +196,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/wemi-emacs-current/files/wemi-setupel.el.in b/editors/wemi-emacs-current/files/wemi-setupel.el.in
index 0affa03ed64d..e7b324fe6497 100644
--- a/editors/wemi-emacs-current/files/wemi-setupel.el.in
+++ b/editors/wemi-emacs-current/files/wemi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'wemi-setupel)
diff --git a/editors/wemi-emacs-current/pkg-descr b/editors/wemi-emacs-current/pkg-descr
index b6288fb1c74a..c30705076724 100644
--- a/editors/wemi-emacs-current/pkg-descr
+++ b/editors/wemi-emacs-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-emacs-current/scripts/configure b/editors/wemi-emacs-current/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/wemi-emacs-current/scripts/configure
+++ b/editors/wemi-emacs-current/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index dac39e06031a..e00d625696e0 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= wemi-${EMACS_PORT}
+PORTNAME= wemi
PORTVERSION= ${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/wemi/ \
${MASTER_SITE_PORTS_JP} \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= shige
-DISTNAME= wemi-${WEMI_VER}
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
@@ -25,63 +25,34 @@ WEMI_VER= 1.13.4
WEMI_SETUPEL= wemi-setupel.el
# document install directory by install-doc target
WEMIDOCDIR?= share/doc/semi
-FLIM_COOKIE= flim-${EMACS_PORT}-${FLIM_VER}.FreeBSD-packages
-SEMI_COOKIE= semi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
-WEMI_COOKIE= wemi-${EMACS_PORT}-${WEMI_VER}.FreeBSD-packages
+FLIM_COOKIE= flim-${EMACS_PORT_NAME}-${FLIM_VER}.FreeBSD-packages
+SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
+WEMI_COOKIE= wemi-${EMACS_PORT_NAME}-${WEMI_VER}.FreeBSD-packages
.if (${PORTCLASS} == "master")
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= emacs
# whether emacs requires *-setupel.el
-REQUIRE_SETUPEL= YES
+REQUIRE_SETUPEL= YES
.endif
# target name for make build
ALL_TARGET?= elc
-
-.if defined(EMACS_PORT)
-EMACS_CMD?= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
-.if defined(HAS_COMMON_PORT) && (${HAS_COMMON_PORT} == "YES")
-RUN_DEPENDS+= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
-.else
-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} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- TARGETS="${WEMI_SETUPEL}"
-PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
- EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
- EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
- WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
+# environments
+SCRIPTS_ENV+= TARGETS="${WEMI_SETUPEL}"
+PLIST_SUB+= WEMIDOCDIR=${WEMIDOCDIR} WEMI_SETUPEL=${WEMI_SETUPEL} \
SEMI_COOKIE=${SEMI_COOKIE} WEMI_COOKIE=${WEMI_COOKIE}
-MAKE_FLAGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
-.if (${EMACS_VER} == "19.34")
-# depends on custom: emacs-19.34 or mule-19.34
-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 (case of xemacs-21.x or later)
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/apel/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-.else
-# depends on apel (case of other emacsen etc...)
-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}
-.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(EMACS_PORT_NAME)
# depends on flim
-BUILD_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
-RUN_DEPENDS+= ${PREFIX}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
.else
.BEGIN:
@${ECHO} "Error: Bad port."
- @${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
+ @${ECHO} "You must define EMACS_PORT_NAME."
@${FALSE}
.endif
@@ -95,8 +66,6 @@ pre-configure:
@${CP} ${FILESDIR}/${WEMI_SETUPEL}.in ${WRKDIR}
.endif
-.include <bsd.port.pre.mk>
-
MAKEINFO= makeinfo --no-split --no-validate
MAKEINFO_EMACS= ${EMACS_CMD} -no-site-file -no-init-file -batch
MAKEINFO_EMACS_FLAGS= -e texinfo-format-buffer -f save-buffer
@@ -122,9 +91,9 @@ pre-install:
.endif
post-install:
- @${MKDIR} -p ${PREFIX}/share/semi
- @${TOUCH} ${PREFIX}/share/semi/${SEMI_COOKIE}
- @${TOUCH} ${PREFIX}/share/semi/${WEMI_COOKIE}
+ @${MKDIR} -p ${LOCALBASE}/share/semi
+ @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE}
+ @${TOUCH} ${LOCALBASE}/share/semi/${WEMI_COOKIE}
.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
@${MAKE} setupel-install
.endif
@@ -150,7 +119,7 @@ info-build:
${CAT} $${i}.jis | nkf -e > $${i} ; \
${MAKEINFO} $${i} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MV} $${i} $${i}.jis ; \
@@ -164,7 +133,7 @@ info-build-by-emacs:
for i in mime-ui-en.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.texi; do \
${MAKEINFO_EMACS} $${i} ${MAKEINFO_EMACS_FLAGS} || ${TRUE} ; \
@@ -178,38 +147,38 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${PREFIX}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${PREFIX}/${WEMIDOCDIR}
+ @${MKDIR} ${LOCALBASE}/${WEMIDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* TODO VERSION ; do \
- ${INSTALL_DATA} $${i} ${PREFIX}/${WEMIDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${LOCALBASE}/${WEMIDOCDIR}/ ; \
done)
setupel-install:
@${INSTALL_DATA} ${WRKDIR}/${WEMI_SETUPEL} \
- ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ ${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
info-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
-.if defined(HAS_MULE) && (${HAS_MULE} == "YES")
+.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ui-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
- install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
+ install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
done)
.endif
@@ -217,12 +186,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-ui-en.info mime-ui-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/info ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} -p ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${MKDIR} -p ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
for i in mime-ui-en.texi mime-ui-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/man/semi ; \
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \
done)
manifest-install:
@@ -230,6 +199,6 @@ manifest-install:
@${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
.include <bsd.port.post.mk>
diff --git a/editors/wemi-emacs/files/wemi-setupel.el.in b/editors/wemi-emacs/files/wemi-setupel.el.in
index 0affa03ed64d..e7b324fe6497 100644
--- a/editors/wemi-emacs/files/wemi-setupel.el.in
+++ b/editors/wemi-emacs/files/wemi-setupel.el.in
@@ -3,6 +3,6 @@
;; -- by shige@FreeBSD.ORG
(setq load-path (append '(
- "@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/semi"
+ "@@LOCALBASE@@/@@EMACS_LIBDIR@@/site-lisp/semi"
) load-path))
(provide 'wemi-setupel)
diff --git a/editors/wemi-emacs/pkg-descr b/editors/wemi-emacs/pkg-descr
index b6288fb1c74a..c30705076724 100644
--- a/editors/wemi-emacs/pkg-descr
+++ b/editors/wemi-emacs/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for emacs.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-emacs/scripts/configure b/editors/wemi-emacs/scripts/configure
index 04796ae5df87..083bc7164d33 100644
--- a/editors/wemi-emacs/scripts/configure
+++ b/editors/wemi-emacs/scripts/configure
@@ -4,7 +4,7 @@ for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
- -e "s;@@PREFIX@@;${PREFIX};g" \
+ -e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
diff --git a/editors/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile
index 61bf9ad133bc..b78a95a2a5a2 100644
--- a/editors/wemi-emacs20-current/Makefile
+++ b/editors/wemi-emacs20-current/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-emacs20-current/pkg-descr b/editors/wemi-emacs20-current/pkg-descr
index fd0ac96d6f33..7d199c7e99e2 100644
--- a/editors/wemi-emacs20-current/pkg-descr
+++ b/editors/wemi-emacs20-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for emacs20.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile
index bd6ba7d2715c..bb23057dfe35 100644
--- a/editors/wemi-emacs20/Makefile
+++ b/editors/wemi-emacs20/Makefile
@@ -13,14 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs
# emacs port setup
-EMACS_NAME= emacs
-EMACS_PORT= emacs20
-EMACS_VER= 20.7
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
-
-# whether emacs has mule feature
-HAS_MULE= YES
+EMACS_PORT_NAME= emacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-mule-current/Makefile b/editors/wemi-mule-current/Makefile
index f36d585bfcb6..a50a9303607e 100644
--- a/editors/wemi-mule-current/Makefile
+++ b/editors/wemi-mule-current/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-mule-current/pkg-descr b/editors/wemi-mule-current/pkg-descr
index 1836868a944c..b4ef06f73506 100644
--- a/editors/wemi-mule-current/pkg-descr
+++ b/editors/wemi-mule-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-mule/Makefile b/editors/wemi-mule/Makefile
index b6c7dd004231..8b5aea344fe9 100644
--- a/editors/wemi-mule/Makefile
+++ b/editors/wemi-mule/Makefile
@@ -13,18 +13,10 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs
# emacs port setup
-EMACS_NAME= mule
-EMACS_PORT= mule
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME= mule
# whether emacs requires *-setupel.el
REQUIRE_SETUPEL= YES
-# whether emacs has a *-common port
-HAS_COMMON_PORT= YES
-# whether emacs has mule feature
-HAS_MULE= YES
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-mule/pkg-descr b/editors/wemi-mule/pkg-descr
index 1836868a944c..b4ef06f73506 100644
--- a/editors/wemi-mule/pkg-descr
+++ b/editors/wemi-mule/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for mule.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/share/emacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/share/emacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-xemacs-current/Makefile b/editors/wemi-xemacs-current/Makefile
index 7410a48e7e4b..9c36953794dc 100644
--- a/editors/wemi-xemacs-current/Makefile
+++ b/editors/wemi-xemacs-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs-current/pkg-descr b/editors/wemi-xemacs-current/pkg-descr
index 3562a77221c1..90de8020a590 100644
--- a/editors/wemi-xemacs-current/pkg-descr
+++ b/editors/wemi-xemacs-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for xemacs.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-xemacs/Makefile b/editors/wemi-xemacs/Makefile
index f75fadcfceca..79d86432727a 100644
--- a/editors/wemi-xemacs/Makefile
+++ b/editors/wemi-xemacs/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs
-EMACS_VER= 19.16
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-19.16 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs/pkg-descr b/editors/wemi-xemacs/pkg-descr
index 3562a77221c1..90de8020a590 100644
--- a/editors/wemi-xemacs/pkg-descr
+++ b/editors/wemi-xemacs/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for xemacs.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-xemacs20-current/Makefile b/editors/wemi-xemacs20-current/Makefile
index 1dde14fc124a..9cda9dfe5042 100644
--- a/editors/wemi-xemacs20-current/Makefile
+++ b/editors/wemi-xemacs20-current/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs20-current/pkg-descr b/editors/wemi-xemacs20-current/pkg-descr
index 2a9335f30033..8f104a865c72 100644
--- a/editors/wemi-xemacs20-current/pkg-descr
+++ b/editors/wemi-xemacs20-current/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for xemacs20.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- WEMI
*** Caution!! ***
diff --git a/editors/wemi-xemacs20/Makefile b/editors/wemi-xemacs20/Makefile
index a9c81d596061..8b4d5fe59722 100644
--- a/editors/wemi-xemacs20/Makefile
+++ b/editors/wemi-xemacs20/Makefile
@@ -13,12 +13,7 @@ PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs
# emacs port setup
-EMACS_NAME= xemacs
-EMACS_PORT= xemacs20
-EMACS_VER= 20.4
-EMACS_LIBDIR= lib/${EMACS_NAME}
-# xemacs-20.4 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER= ${EMACS_LIBDIR}
+EMACS_PORT_NAME= xemacs20
# use pkg/* files in ${.CURDIR}
PKGDIR= ${.CURDIR}/pkg
diff --git a/editors/wemi-xemacs20/pkg-descr b/editors/wemi-xemacs20/pkg-descr
index 2a9335f30033..8f104a865c72 100644
--- a/editors/wemi-xemacs20/pkg-descr
+++ b/editors/wemi-xemacs20/pkg-descr
@@ -30,7 +30,7 @@ WEMI, Library of MIME feature for GNU Emacs for xemacs20.
MUAs. They are released as separated packages.
WEMI is installed the following directory tree:
- ${PREFIX}/lib/xemacs/site-lisp/semi/ --- WEMI
+ ${LOCALBASE}/lib/xemacs/site-lisp/semi/ --- WEMI
*** Caution!! ***