[pkgsrc/trunk]: pkgsrc Sort variables depending on ${EMACS_FLAVOR} (emacs or ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a8f161b7a1b
branches:  trunk
changeset: 534663:5a8f161b7a1b
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Oct 29 04:43: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:

 mail/vm/Makefile           |  16 +++++++---------
 print/auctex/Makefile      |  13 +++++++------
 print/auctex/buildlink3.mk |  22 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 15 deletions(-)

diffs (105 lines):

diff -r 0617546fcc0a -r 5a8f161b7a1b mail/vm/Makefile
--- a/mail/vm/Makefile  Mon Oct 29 04:40:11 2007 +0000
+++ b/mail/vm/Makefile  Mon Oct 29 04:43:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/05 15:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/10/29 04:43:17 uebayasi Exp $
 
 DISTNAME=      vm-7.19
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -21,17 +21,9 @@
 HOMEPAGE=      http://www.wonderworks.com/vm/
 COMMENT=       VM (View Mail) is an advanced mail user agent for Emacs
 
-.include "../../mk/emacs.mk"
-
 USE_TOOLS+=    makeinfo
 INFO_FILES=    # PLIST
 
-.if ${EMACS_FLAVOR} == "xemacs"
-PIXMAPDIR=     ${EMACS_LISPPREFIX:H}/etc/vm
-.elif ${EMACS_FLAVOR} == "emacs"
-PIXMAPDIR=     ${EMACS_LISPPREFIX}/vm/pixmaps
-.endif
-
 MAKEFLAGS+=    EMACS=${EMACS_BIN:Q}
 MAKE_ENV+=     LISPDIR=${EMACS_LISPPREFIX}/vm
 MAKE_ENV+=     INFODIR=${INFODIR:Q}
@@ -42,6 +34,10 @@
 INSTALLATION_DIRS=     bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm  \
                        ${PIXMAPDIR}
 
+PIXMAPDIR=             ${PIXMAPDIR.${EMACS_FLAVOR}}
+PIXMAPDIR.emacs=       ${EMACS_LISPPREFIX}/vm/pixmaps
+PIXMAPDIR.xemacs=      ${EMACS_LISPPREFIX:H}/etc/vm
+
 do-install:
        cd ${WRKSRC} && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/vm
        cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do                 \
@@ -52,4 +48,6 @@
        cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode          \
                base64-decode base64-encode ${PREFIX}/bin
 
+.include "../../mk/emacs.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 0617546fcc0a -r 5a8f161b7a1b print/auctex/Makefile
--- a/print/auctex/Makefile     Mon Oct 29 04:40:11 2007 +0000
+++ b/print/auctex/Makefile     Mon Oct 29 04:43:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/01/17 13:18:42 tonio Exp $
+# $NetBSD: Makefile,v 1.33 2007/10/29 04:44:04 uebayasi Exp $
 
 DISTNAME=              auctex-11.84
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,18 +11,19 @@
 
 EMACS_MODULES=         base
 
-.include "../../mk/emacs.mk"
-
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         YES
 
-.if ${EMACS_FLAVOR} == "xemacs"
-CONFIGURE_ARGS+=       --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||}
-.endif
+CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
 CONFIGURE_ARGS+=       --disable-preview
 
 MAKEFLAGS+=            EMACS=${EMACS_BIN:Q}
 MESSAGE_SUBST+=                LISPDIR=${EMACS_LISPPREFIX:Q}
 INFO_FILES=            YES
 
+CONFIGURE_ARGS.emacs=  --with-lispdir=${EMACS_LISPPREFIX}
+CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||}
+
+.include "../../mk/emacs.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 0617546fcc0a -r 5a8f161b7a1b print/auctex/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/auctex/buildlink3.mk        Mon Oct 29 04:43:17 2007 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 04:44:04 uebayasi Exp $
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+AUCTEX_BUILDLINK3_MK:= ${AUCTEX_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=    auctex
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nauctex}
+BUILDLINK_PACKAGES+=   auctex
+BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}auctex
+
+.if ${AUCTEX_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.auctex+= ${EMACS_PKGNAME_PREFIX}auctex>=11
+BUILDLINK_PKGSRCDIR.auctex?=   ../../print/auctex
+.endif # AUCTEX_BUILDLINK3_MK
+
+BUILDLINK_CONTENTS_FILTER.auctex=      ${EGREP} '.*\.el$$|.*\.elc$$'
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}