Buildlink3'ify & make mew support optionalize. Refactor code and PLIST a

lot.  Big changes but no functional change should be made.

Good bye long standing build order problem!

3 files changed, 79 insertions, 170 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 11f93afdbb5..3dafc71a672 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/06/30 13:21:13 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/10/29 13:11:11 uebayasi Exp $
 
 DISTNAME=	emacs-w3m-1.4.4
 PKGREVISION=	1
@@ -14,40 +14,44 @@ INFO_FILES=	YES
 
 DEPENDS+=	w3m>=0.5.1nb2:../../www/w3m
 
-.include "../../mk/emacs.mk"
-
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
-.if ${EMACS_FLAVOR} == "xemacs"
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel
-.endif
-
-.if ${EMACS_TYPE} == "emacs21" || ${EMACS_TYPE} == "emacs22"
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs
-.endif
-
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=--with-icondir=${PREFIX}/${ETCDIR}
 BUILD_TARGET=	default
-.if ${EMACS_FLAVOR} == "xemacs"
-INSTALL_TARGET=	install-package
+INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
+PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
+
+SUBST_CLASSES+=	fix-icondir
+SUBST_STAGE.fix-icondir=	pre-configure
+SUBST_FILES.fix-icondir=	Makefile.in w3m.el w3mhack.el
+SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g' \
+				-e 's|images/w3m|w3m|g'
+
+.include "../../mk/emacs.mk"
+
+# GNU Emacs 21 or later and XEmacs have GUI support
+.if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \
+    ${EMACS_FLAVOR} == "xemacs"
+PLIST_SUBST+=	FOR_gui=""
 .else
-INSTALL_TARGET=	install install-icons
+PLIST_SUBST+=	FOR_gui="@comment "
 .endif
 
 DOCUMENTS=	COPYING ChangeLog ChangeLog.1 README README.ja
-.if ${EMACS_FLAVOR} == "xemacs"
-ETCDIR=	lib/xemacs/site-packages/etc
-ICONDIR=	${ETCDIR}/w3m
-.else
-ETCDIR=	share/emacs/${_EMACS_VERSION_NOREV}/etc
-ICONDIR=	${ETCDIR}/images/w3m
-.endif
-DOCDIR=	${ETCDIR}/w3m/doc
-PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+=	ICONDIR=${ICONDIR:Q}
+ETCDIR=		${ETCDIR.${EMACS_FLAVOR}}
+
+INSTALL_TARGET.emacs=	install install-icons
+INSTALL_TARGET.xemacs=	install-package
+ETCDIR.emacs=		share/emacs/${_EMACS_VERSION_NOREV}/etc/w3m
+ETCDIR.xemacs=		lib/xemacs/site-packages/etc/w3m
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/${DOCDIR}; done
+	@${INSTALL_DATA_DIR} ${PREFIX}/${ETCDIR}
+	for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/${ETCDIR}; done
+
+.include "options.mk"
 
+.include "../../devel/apel/buildlink3.mk"
+.include "../../devel/semi/buildlink3.mk"
+.include "../../editors/mule-ucs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST
index 5699c1a5bdc..4b4e7a0d7c9 100644
--- a/www/emacs-w3m/PLIST
+++ b/www/emacs-w3m/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2007/02/19 09:22:30 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/10/29 13:11:11 uebayasi Exp $
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el
-@comment XXXPKGSRC we ignore! ${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
+${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.el
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/octet.el
@@ -23,13 +23,17 @@ ${EMACS_LISPPREFIX}/w3m/w3m-e20.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-e20.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-form.el
 ${EMACS_LISPPREFIX}/w3m/w3m-form.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-fsf.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.el
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-image.el
@@ -51,7 +55,7 @@ ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.el
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-ucs.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-util.el
@@ -64,8 +68,7 @@ ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
 ${EMACS_LISPPREFIX}/w3m/w3m.el
 ${EMACS_LISPPREFIX}/w3m/w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
-@comment XXX This doesn't seem to work with Mew 4.x.
-@comment ${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
+${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-ccl.el
 ${EMACS_LISPPREFIX}/w3m/w3m-favicon.el
 ${EMACS_LISPPREFIX}/w3m/w3m-filter.el
@@ -309,144 +312,33 @@ ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/auto-autoloads.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/auto-autoloads.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/custom-load.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/custom-load.elc
-${DOCDIR}/COPYING
-${DOCDIR}/ChangeLog
-${DOCDIR}/ChangeLog.1
-${DOCDIR}/README
-${DOCDIR}/README.ja
-${FOR_emacs22}${ICONDIR}/antenna-up.xpm
-${FOR_emacs22}${ICONDIR}/back-disabled.xpm
-${FOR_emacs22}${ICONDIR}/back-up.xpm
-${FOR_emacs22}${ICONDIR}/copy-up.xpm
-${FOR_emacs22}${ICONDIR}/db-history-up.xpm
-${FOR_emacs22}${ICONDIR}/forward-disabled.xpm
-${FOR_emacs22}${ICONDIR}/forward-up.xpm
-${FOR_emacs22}${ICONDIR}/history-up.xpm
-${FOR_emacs22}${ICONDIR}/home-up.xpm
-${FOR_emacs22}${ICONDIR}/image-up.xpm
-${FOR_emacs22}${ICONDIR}/open-up.xpm
-${FOR_emacs22}${ICONDIR}/parent-disabled.xpm
-${FOR_emacs22}${ICONDIR}/parent-up.xpm
-${FOR_emacs22}${ICONDIR}/reload-up.xpm
-${FOR_emacs22}${ICONDIR}/search-up.xpm
-${FOR_emacs22}${ICONDIR}/spinner.gif
-${FOR_emacs22}${ICONDIR}/state-00.xpm
-${FOR_emacs22}${ICONDIR}/state-01.xpm
-${FOR_emacs22}${ICONDIR}/state-10.xpm
-${FOR_emacs22}${ICONDIR}/state-11.xpm
-${FOR_emacs22}${ICONDIR}/weather-up.xpm
-${FOR_emacs22nox}${ICONDIR}/antenna-up.xpm
-${FOR_emacs22nox}${ICONDIR}/back-disabled.xpm
-${FOR_emacs22nox}${ICONDIR}/back-up.xpm
-${FOR_emacs22nox}${ICONDIR}/copy-up.xpm
-${FOR_emacs22nox}${ICONDIR}/db-history-up.xpm
-${FOR_emacs22nox}${ICONDIR}/forward-disabled.xpm
-${FOR_emacs22nox}${ICONDIR}/forward-up.xpm
-${FOR_emacs22nox}${ICONDIR}/history-up.xpm
-${FOR_emacs22nox}${ICONDIR}/home-up.xpm
-${FOR_emacs22nox}${ICONDIR}/image-up.xpm
-${FOR_emacs22nox}${ICONDIR}/open-up.xpm
-${FOR_emacs22nox}${ICONDIR}/parent-disabled.xpm
-${FOR_emacs22nox}${ICONDIR}/parent-up.xpm
-${FOR_emacs22nox}${ICONDIR}/reload-up.xpm
-${FOR_emacs22nox}${ICONDIR}/search-up.xpm
-${FOR_emacs22nox}${ICONDIR}/spinner.gif
-${FOR_emacs22nox}${ICONDIR}/state-00.xpm
-${FOR_emacs22nox}${ICONDIR}/state-01.xpm
-${FOR_emacs22nox}${ICONDIR}/state-10.xpm
-${FOR_emacs22nox}${ICONDIR}/state-11.xpm
-${FOR_emacs22nox}${ICONDIR}/weather-up.xpm
-${FOR_emacs21}${ICONDIR}/antenna-up.xpm
-${FOR_emacs21}${ICONDIR}/back-disabled.xpm
-${FOR_emacs21}${ICONDIR}/back-up.xpm
-${FOR_emacs21}${ICONDIR}/copy-up.xpm
-${FOR_emacs21}${ICONDIR}/db-history-up.xpm
-${FOR_emacs21}${ICONDIR}/forward-disabled.xpm
-${FOR_emacs21}${ICONDIR}/forward-up.xpm
-${FOR_emacs21}${ICONDIR}/history-up.xpm
-${FOR_emacs21}${ICONDIR}/home-up.xpm
-${FOR_emacs21}${ICONDIR}/image-up.xpm
-${FOR_emacs21}${ICONDIR}/open-up.xpm
-${FOR_emacs21}${ICONDIR}/parent-disabled.xpm
-${FOR_emacs21}${ICONDIR}/parent-up.xpm
-${FOR_emacs21}${ICONDIR}/reload-up.xpm
-${FOR_emacs21}${ICONDIR}/search-up.xpm
-${FOR_emacs21}${ICONDIR}/spinner.gif
-${FOR_emacs21}${ICONDIR}/state-00.xpm
-${FOR_emacs21}${ICONDIR}/state-01.xpm
-${FOR_emacs21}${ICONDIR}/state-10.xpm
-${FOR_emacs21}${ICONDIR}/state-11.xpm
-${FOR_emacs21}${ICONDIR}/weather-up.xpm
-${FOR_emacs21nox}${ICONDIR}/antenna-up.xpm
-${FOR_emacs21nox}${ICONDIR}/back-disabled.xpm
-${FOR_emacs21nox}${ICONDIR}/back-up.xpm
-${FOR_emacs21nox}${ICONDIR}/copy-up.xpm
-${FOR_emacs21nox}${ICONDIR}/db-history-up.xpm
-${FOR_emacs21nox}${ICONDIR}/forward-disabled.xpm
-${FOR_emacs21nox}${ICONDIR}/forward-up.xpm
-${FOR_emacs21nox}${ICONDIR}/history-up.xpm
-${FOR_emacs21nox}${ICONDIR}/home-up.xpm
-${FOR_emacs21nox}${ICONDIR}/image-up.xpm
-${FOR_emacs21nox}${ICONDIR}/open-up.xpm
-${FOR_emacs21nox}${ICONDIR}/parent-disabled.xpm
-${FOR_emacs21nox}${ICONDIR}/parent-up.xpm
-${FOR_emacs21nox}${ICONDIR}/reload-up.xpm
-${FOR_emacs21nox}${ICONDIR}/search-up.xpm
-${FOR_emacs21nox}${ICONDIR}/spinner.gif
-${FOR_emacs21nox}${ICONDIR}/state-00.xpm
-${FOR_emacs21nox}${ICONDIR}/state-01.xpm
-${FOR_emacs21nox}${ICONDIR}/state-10.xpm
-${FOR_emacs21nox}${ICONDIR}/state-11.xpm
-${FOR_emacs21nox}${ICONDIR}/weather-up.xpm
-${FOR_xemacs214}${ICONDIR}/antenna-up.xpm
-${FOR_xemacs214}${ICONDIR}/back-disabled.xpm
-${FOR_xemacs214}${ICONDIR}/back-up.xpm
-${FOR_xemacs214}${ICONDIR}/copy-up.xpm
-${FOR_xemacs214}${ICONDIR}/db-history-up.xpm
-${FOR_xemacs214}${ICONDIR}/forward-disabled.xpm
-${FOR_xemacs214}${ICONDIR}/forward-up.xpm
-${FOR_xemacs214}${ICONDIR}/history-up.xpm
-${FOR_xemacs214}${ICONDIR}/home-up.xpm
-${FOR_xemacs214}${ICONDIR}/image-up.xpm
-${FOR_xemacs214}${ICONDIR}/open-up.xpm
-${FOR_xemacs214}${ICONDIR}/parent-disabled.xpm
-${FOR_xemacs214}${ICONDIR}/parent-up.xpm
-${FOR_xemacs214}${ICONDIR}/reload-up.xpm
-${FOR_xemacs214}${ICONDIR}/search-up.xpm
-${FOR_xemacs214}${ICONDIR}/spinner.gif
-${FOR_xemacs214}${ICONDIR}/state-00.xpm
-${FOR_xemacs214}${ICONDIR}/state-01.xpm
-${FOR_xemacs214}${ICONDIR}/state-10.xpm
-${FOR_xemacs214}${ICONDIR}/state-11.xpm
-${FOR_xemacs214}${ICONDIR}/weather-up.xpm
-${FOR_xemacs215}${ICONDIR}/antenna-up.xpm
-${FOR_xemacs215}${ICONDIR}/back-disabled.xpm
-${FOR_xemacs215}${ICONDIR}/back-up.xpm
-${FOR_xemacs215}${ICONDIR}/copy-up.xpm
-${FOR_xemacs215}${ICONDIR}/db-history-up.xpm
-${FOR_xemacs215}${ICONDIR}/forward-disabled.xpm
-${FOR_xemacs215}${ICONDIR}/forward-up.xpm
-${FOR_xemacs215}${ICONDIR}/history-up.xpm
-${FOR_xemacs215}${ICONDIR}/home-up.xpm
-${FOR_xemacs215}${ICONDIR}/image-up.xpm
-${FOR_xemacs215}${ICONDIR}/open-up.xpm
-${FOR_xemacs215}${ICONDIR}/parent-disabled.xpm
-${FOR_xemacs215}${ICONDIR}/parent-up.xpm
-${FOR_xemacs215}${ICONDIR}/reload-up.xpm
-${FOR_xemacs215}${ICONDIR}/search-up.xpm
-${FOR_xemacs215}${ICONDIR}/spinner.gif
-${FOR_xemacs215}${ICONDIR}/state-00.xpm
-${FOR_xemacs215}${ICONDIR}/state-01.xpm
-${FOR_xemacs215}${ICONDIR}/state-10.xpm
-${FOR_xemacs215}${ICONDIR}/state-11.xpm
-${FOR_xemacs215}${ICONDIR}/weather-up.xpm
-${FOR_xemacs215}@dirrm ${ICONDIR}
-${FOR_xemacs214}@dirrm ${ICONDIR}
-${FOR_emacs22nox}@dirrm ${ICONDIR}
-${FOR_emacs22}@dirrm ${ICONDIR}
-${FOR_emacs21nox}@dirrm ${ICONDIR}
-${FOR_emacs21}@dirrm ${ICONDIR}
+${ETCDIR}/COPYING
+${ETCDIR}/ChangeLog
+${ETCDIR}/ChangeLog.1
+${ETCDIR}/README
+${ETCDIR}/README.ja
+${FOR_gui}${ETCDIR}/antenna-up.xpm
+${FOR_gui}${ETCDIR}/back-disabled.xpm
+${FOR_gui}${ETCDIR}/back-up.xpm
+${FOR_gui}${ETCDIR}/copy-up.xpm
+${FOR_gui}${ETCDIR}/db-history-up.xpm
+${FOR_gui}${ETCDIR}/forward-disabled.xpm
+${FOR_gui}${ETCDIR}/forward-up.xpm
+${FOR_gui}${ETCDIR}/history-up.xpm
+${FOR_gui}${ETCDIR}/home-up.xpm
+${FOR_gui}${ETCDIR}/image-up.xpm
+${FOR_gui}${ETCDIR}/open-up.xpm
+${FOR_gui}${ETCDIR}/parent-disabled.xpm
+${FOR_gui}${ETCDIR}/parent-up.xpm
+${FOR_gui}${ETCDIR}/reload-up.xpm
+${FOR_gui}${ETCDIR}/search-up.xpm
+${FOR_gui}${ETCDIR}/spinner.gif
+${FOR_gui}${ETCDIR}/state-00.xpm
+${FOR_gui}${ETCDIR}/state-01.xpm
+${FOR_gui}${ETCDIR}/state-10.xpm
+${FOR_gui}${ETCDIR}/state-11.xpm
+${FOR_gui}${ETCDIR}/weather-up.xpm
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
 @dirrm ${EMACS_LISPPREFIX}/w3m
-@dirrm ${DOCDIR}
+@dirrm ${ETCDIR}
diff --git a/www/emacs-w3m/options.mk b/www/emacs-w3m/options.mk
new file mode 100644
index 00000000000..9a611060270
--- /dev/null
+++ b/www/emacs-w3m/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2007/10/29 13:11:11 uebayasi Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs-w3m
+PKG_SUPPORTED_OPTIONS=	emacs-w3m-mew
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Memacs-w3m-mew)
+.include "../../mail/mew/buildlink3.mk"
+PLIST_SUBST+=	FOR_mew=
+.else
+PLIST_SUBST+=	FOR_mew="@comment "
+.endif