aboutsummaryrefslogtreecommitdiff
path: root/www/emacs-w3m
diff options
context:
space:
mode:
authorShigeyuki Fukushima <shige@FreeBSD.org>2001-12-03 17:27:41 +0000
committerShigeyuki Fukushima <shige@FreeBSD.org>2001-12-03 17:27:41 +0000
commitb1650ff64b2d478564b5af18b10dbb1f5ac1d1cf (patch)
tree925b6173c65eb2929941e8ecef2f57d94c2b9f67 /www/emacs-w3m
parent6f1afb519bec683ffa4cc9a1603339cc59dcee2c (diff)
downloadports-b1650ff64b2d478564b5af18b10dbb1f5ac1d1cf.tar.gz
ports-b1650ff64b2d478564b5af18b10dbb1f5ac1d1cf.zip
Notes
Diffstat (limited to 'www/emacs-w3m')
-rw-r--r--www/emacs-w3m/Makefile20
-rw-r--r--www/emacs-w3m/pkg-plist3
2 files changed, 16 insertions, 7 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 8d25ab688ca3..9e7f311e439b 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -14,10 +14,18 @@ DISTNAME= w3m_el-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
-EMACS_PORT_NAME?= emacs20
+PORTCLASS?= master
-CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD}
-LISPDIR?= ${EMACS_LIBDIR}/site-lisp/w3m
+.if (${PORTCLASS} == "master")
+EMACS_PORT_NAME?= emacs21
+DEPPORT_SUFFIX=
+.else
+DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
+.endif
+
+CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \
+ --with-lispdir=${LOCALBASE}/${LISPDIR}
+LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/w3m
ETCDIR?= share/w3m
PKGINFODIR?= "@comment "
@@ -47,7 +55,7 @@ SEMI_FILE= ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el
.else
XEMACS_ONLY?= "@comment "
EMACS_ONLY?= ""
-SEMI_FILE= ${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el
+SEMI_FILE= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semi/mime-setup.el
.endif
.if defined(WITH_SHIMBUN)
@@ -63,8 +71,8 @@ SHIMBUN= "@comment "
.endif
.if defined(HAVE_SEMI)
-BUILD_DEPENDS+= ${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+= ${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+= ${SEMI_FILE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
+RUN_DEPENDS+= ${SEMI_FILE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
.endif
.if !defined(HAVE_SEMI)
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index e8d7339fc5a3..fa11c11aaf07 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -114,8 +114,9 @@
%%LISPDIR%%/w3m-dtree.el
%%LISPDIR%%/w3m-dtree.elc
%%LISPDIR%%/w3m-e20.el
-%%EMACS_ONLY%%%%LISPDIR%%/w3m-e20.elc
+%%EMACS_ONLY%%@unexec rm -f %D/%%LISPDIR%%/w3m-e20.elc
%%LISPDIR%%/w3m-e21.el
+%%EMACS_ONLY%%@unexec rm -f %D/%%LISPDIR%%/w3m-e21.elc
%%LISPDIR%%/w3m-filter.el
%%LISPDIR%%/w3m-filter.elc
%%LISPDIR%%/w3m-form.el