aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2001-12-24 13:47:58 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2001-12-24 13:47:58 +0000
commit1ccbe70411b83e111ffbeb962776eceeb384a79f (patch)
tree3e1864db2d0c45da70f4f1b273922200b9b05d2a /www
parentfef693009d781a493245a0842b573bc1fc9b9a0a (diff)
downloadports-1ccbe70411b83e111ffbeb962776eceeb384a79f.tar.gz
ports-1ccbe70411b83e111ffbeb962776eceeb384a79f.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/emacs-w3m/Makefile13
-rw-r--r--www/emacs-w3m/pkg-plist37
2 files changed, 27 insertions, 23 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index d352d941415e..515c5488f5a4 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -19,7 +19,8 @@ EMACS_PORT_NAME?= emacs21
CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \
--with-lispdir=${PREFIX}/${LISPDIR}
LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/w3m
-ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
+ICONDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
+ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
PKGINFODIR?= "@comment "
USE_AUTOCONF= yes
@@ -31,10 +32,12 @@ PLIST_SUB+= EMACS_NAME=${EMACS_NAME} \
EMACS21_ONLY=${EMACS21_ONLY} \
EMACS_ONLY=${EMACS_ONLY} \
LISPDIR=${LISPDIR} \
+ ICONDIR=${ICONDIR} \
ETCDIR=${ETCDIR} \
PKGINFODIR=${PKGINFODIR} \
SHIMBUN=${SHIMBUN} \
- ICONS=${ICONS}
+ ICONS=${ICONS} \
+ ETC=${ETC}
DOCS= FAQ README
DOCS_JA= FAQ.ja README.ja README.namazu.ja README.shimbun.ja TIPS.ja
@@ -48,6 +51,7 @@ EMACS_ONLY= "@comment "
EMACS20_ONLY= "@comment "
EMACS21_ONLY= "@comment "
ICONS= ""
+ETC= "@comment "
.else
.if (${EMACS_PORT_NAME} == "emacs20")
XEMACS_ONLY= "@comment "
@@ -55,12 +59,14 @@ EMACS_ONLY= ""
EMACS20_ONLY= ""
EMACS21_ONLY= "@comment "
ICONS= "@comment "
+ETC= "@comment "
.else
XEMACS_ONLY= "@comment "
EMACS_ONLY= ""
EMACS20_ONLY= "@comment "
EMACS21_ONLY= ""
ICONS= ""
+ETC= ""
INSTALL_TARGET= install install-icons
.endif
.endif
@@ -86,9 +92,6 @@ SHIMBUN= ""
SHIMBUN= "@comment "
.endif
.endif
-.if (${EMACS_PORT_NAME} == "emacs21")
-SHIMBUN= ""
-.endif
.if defined(HAVE_FLIM)
BUILD_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT}
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 153c4b717b1c..328937edaee2 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -1,21 +1,22 @@
%%PKGINFODIR%%/MANIFEST.w3m
-%%ICONS%%%%ETCDIR%%/antenna-up.xpm
-%%ICONS%%%%ETCDIR%%/back-disabled.xpm
-%%ICONS%%%%ETCDIR%%/back-up.xpm
-%%ICONS%%%%ETCDIR%%/copy-up.xpm
-%%ICONS%%%%ETCDIR%%/db-history-up.xpm
-%%ICONS%%%%ETCDIR%%/forward-disabled.xpm
-%%ICONS%%%%ETCDIR%%/forward-up.xpm
-%%ICONS%%%%ETCDIR%%/history-up.xpm
-%%ICONS%%%%ETCDIR%%/home-up.xpm
-%%ICONS%%%%ETCDIR%%/image-up.xpm
-%%ICONS%%%%ETCDIR%%/open-up.xpm
-%%ICONS%%%%ETCDIR%%/parent-disabled.xpm
-%%ICONS%%%%ETCDIR%%/parent-up.xpm
-%%ICONS%%%%ETCDIR%%/reload-up.xpm
-%%ICONS%%%%ETCDIR%%/search-up.xpm
-%%ICONS%%%%ETCDIR%%/weather-up.xpm
-%%ICONS%%@dirrm %%ETCDIR%%
+%%ICONS%%%%ICONDIR%%/antenna-up.xpm
+%%ICONS%%%%ICONDIR%%/back-disabled.xpm
+%%ICONS%%%%ICONDIR%%/back-up.xpm
+%%ICONS%%%%ICONDIR%%/copy-up.xpm
+%%ICONS%%%%ICONDIR%%/db-history-up.xpm
+%%ICONS%%%%ICONDIR%%/forward-disabled.xpm
+%%ICONS%%%%ICONDIR%%/forward-up.xpm
+%%ICONS%%%%ICONDIR%%/history-up.xpm
+%%ICONS%%%%ICONDIR%%/home-up.xpm
+%%ICONS%%%%ICONDIR%%/image-up.xpm
+%%ICONS%%%%ICONDIR%%/open-up.xpm
+%%ICONS%%%%ICONDIR%%/parent-disabled.xpm
+%%ICONS%%%%ICONDIR%%/parent-up.xpm
+%%ICONS%%%%ICONDIR%%/reload-up.xpm
+%%ICONS%%%%ICONDIR%%/search-up.xpm
+%%ICONS%%%%ICONDIR%%/weather-up.xpm
+%%ICONS%%@dirrm %%ICONDIR%%
+%%ETC%%@dirrm %%ETCDIR%%
%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.el
%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.elc
%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
@@ -149,7 +150,7 @@
%%LISPDIR%%/w3m-search.el
%%LISPDIR%%/w3m-search.elc
%%LISPDIR%%/w3m-ucs.el
-%%EMACS21_ONLY%%%%LISPDIR%%/w3m-ucs.elc
+%%XEMACS_ONLY%%%%LISPDIR%%/w3m-ucs.elc
%%LISPDIR%%/w3m-weather.el
%%LISPDIR%%/w3m-weather.elc
%%LISPDIR%%/w3m-xmas.el