[pkgsrc/trunk]: pkgsrc/www/w3 Sort variables depending on ${EMACS_FLAVOR} (em...

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee57d024a443
branches:  trunk
changeset: 534664:ee57d024a443
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Oct 29 04:57:17 2007 +0000

description:
Sort variables depending on ${EMACS_FLAVOR} (emacs or xemacs).  Prefer
assignment to conditional.  Include mk/emacs.mk lazily.

No functional changes intended.

diffstat:

 www/w3/Makefile |  20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r 5a8f161b7a1b -r ee57d024a443 www/w3/Makefile
--- a/www/w3/Makefile   Mon Oct 29 04:43:17 2007 +0000
+++ b/www/w3/Makefile   Mon Oct 29 04:57:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/29 04:57:17 uebayasi Exp $
 
 DISTNAME=      w3-4.0pre.47
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}w3-4.0b47
@@ -11,8 +11,8 @@
 COMMENT=       World Wide Web browser for Emacs
 
 # included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-.include "../../mk/emacs.mk"
+# emacs22 doesn't work
+EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-emacs
@@ -21,11 +21,13 @@
 CONFIGURE_ARGS+=       --datadir=${ETCDIR}
 INFO_FILES=            # PLIST
 
-.if ${EMACS_FLAVOR} == "xemacs"
-ETCDIR=                        ${EMACS_LISPPREFIX:H}/etc/w3
-.else
-ETCDIR=                        ${PREFIX}/share/w3
-.endif
-PLIST_SUBST+=          ETCDIR=${ETCDIR:S/^${PREFIX}\///:Q}
+PLIST_SUBST+=  ETCDIR=${ETCDIR:S/^${PREFIX}\///:Q}
+
+ETCDIR=                ${ETCDIR.${EMACS_FLAVOR}}
+
+ETCDIR.emacs=  ${PREFIX}/share/w3
+ETCDIR.xemacs= ${EMACS_LISPPREFIX:H}/etc/w3
+
+.include "../../mk/emacs.mk"
 
 .include "../../mk/bsd.pkg.mk"