Update to 0.2.150.

Add hooks for the forthcoming emacs-w3m-xemacs21-mule port.

3 files changed, 72 insertions, 39 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index e05d48d24166..cc1d7dede3aa 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	0.2.126
+PORTVERSION=	0.2.150
 CATEGORIES=	www elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/emacs-w3m/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -15,28 +15,39 @@ DISTNAME=	w3m_el-${PORTVERSION}
 MAINTAINER=	nobutaka@nobutaka.com
 
 EMACS_PORT_NAME?=	emacs20
-.if (${EMACS_PORT_NAME} == "emacs20")
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
-.endif
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-CONFIGURE_ARGS=	--with-xemacs=${EMACS_CMD}
-EMACS_PACKAGESDIR=	lib/xemacs/site-packages
-MANIFEST=		MANIFEST.w3m
-INSTALL_TARGET=		install-package
-.endif
+
+CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD}
+LISPDIR?=	${EMACS_LIBDIR}/site-lisp/w3m
+ETCDIR?=	share/w3m
+PKGINFODIR?=	"@comment "
 
 USE_AUTOCONF=	yes
 ALL_TARGET=	default
 
-PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
+		XEMACS_ONLY=${XEMACS_ONLY} \
+		EMACS_ONLY=${EMACS_ONLY} \
+		LISPDIR=${LISPDIR} \
+		ETCDIR=${ETCDIR} \
+		PKGINFODIR=${PKGINFODIR}
 
 DOCS=		README
 DOCS_JA=	README.ja TIPS.ja
 
-DOCSDIR=	${PREFIX}/share/doc/emacs-w3m
-DOCSDIR_JA=	${PREFIX}/share/doc/ja/emacs-w3m
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
+DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
+
+.include <bsd.port.pre.mk>
+
+.if ${EMACS_NAME} == xemacs
+XEMACS_ONLY?=		""
+EMACS_ONLY?=		"@comment "
+.else
+XEMACS_ONLY?=		"@comment "
+EMACS_ONLY?=		""
+.endif
 
-pre-build:
+post-extract:
 .if defined(EMACS_PACKAGESDIR)
 	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
 .endif
@@ -54,4 +65,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 30ac28e536f7..8011f042a66b 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1 +1 @@
-MD5 (w3m_el-0.2.126.tar.gz) = 932f53e082ff7042c865103c17d3b6f7
+MD5 (w3m_el-0.2.150.tar.gz) = ea1ecc0aef0bcb992813a70066ccc8b5
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 0a5bed2c1d76..8d3b021325b6 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -1,28 +1,50 @@
-%%EMACS_LIBDIR%%/site-lisp/w3m/mew-w3m.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/w3m/mew-w3m.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/mime-w3m.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/w3m/mime-w3m.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-antenna.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-antenna.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-bookmark.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-bookmark.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-e21.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-form.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-form.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-om.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-search.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-search.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-time.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-time.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-weather.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-weather.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m-xmas.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m.elc
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3mhack.el
-%%EMACS_LIBDIR%%/site-lisp/w3m/w3m.el
+%%PKGINFODIR%%/MANIFEST.w3m
+%%XEMACS_ONLY%%%%ETCDIR%%/antenna-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/back-disabled.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/back-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/forward-disabled.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/forward-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/home-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/image-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/open-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/reload-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/search-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/weather-up.xpm
+%%XEMACS_ONLY%%@dirrm %%ETCDIR%%
+%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.el
+%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.elc
+%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
+%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
+%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
+%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
+%%XEMACS_ONLY%%%%LISPDIR%%/w3m-xmas.elc
+%%LISPDIR%%/mew-w3m.el
+@unexec rm -f %D/%%LISPDIR%%/mew-w3m.elc
+%%LISPDIR%%/mime-w3m.el
+@unexec rm -f %D/%%LISPDIR%%/mime-w3m.elc
+%%LISPDIR%%/w3m-antenna.el
+%%LISPDIR%%/w3m-antenna.elc
+%%LISPDIR%%/w3m-bookmark.el
+%%LISPDIR%%/w3m-bookmark.elc
+%%LISPDIR%%/w3m-e21.el
+%%LISPDIR%%/w3m-filter.el
+%%LISPDIR%%/w3m-filter.elc
+%%LISPDIR%%/w3m-form.el
+%%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-hist.el
+%%LISPDIR%%/w3m-hist.elc
+%%LISPDIR%%/w3m-om.el
+%%LISPDIR%%/w3m-search.el
+%%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-weather.el
+%%LISPDIR%%/w3m-weather.elc
+%%LISPDIR%%/w3m-xmas.el
+%%LISPDIR%%/w3m.elc
+%%LISPDIR%%/w3mhack.el
+%%LISPDIR%%/w3m.el
+@dirrm %%LISPDIR%%
 share/doc/ja/emacs-w3m/TIPS.ja
 share/doc/ja/emacs-w3m/README.ja
 share/doc/emacs-w3m/README
-@dirrm %%EMACS_LIBDIR%%/site-lisp/w3m
 @dirrm share/doc/ja/emacs-w3m
 @dirrm share/doc/emacs-w3m