Sort variables depending on ${EMACS_FLAVOR} (emacs or xemacs). Prefer

assignment to conditional.  Include mk/emacs.mk lazily.

No functional changes intended.
This commit is contained in:
uebayasi 2007-10-29 04:43:17 +00:00
parent 1693dd10ec
commit f3764d72fa
3 changed files with 36 additions and 15 deletions

View file

@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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 @@ PLIST_SUBST+= PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q}
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 @@ do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \
base64-decode base64-encode ${PREFIX}/bin
.include "../../mk/emacs.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -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 @@ COMMENT= Enhanced LaTeX mode for Emacs
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"

View file

@ -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/+$//}