From 84db467ec7c8386066718011f8d47775d5608811 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 12 Apr 2008 22:42:57 +0000 Subject: Convert to use PLIST_VARS instead of manually passing "@comment " through PLIST_SUBST to the plist module. --- editors/emacs21/Makefile.common | 6 +++--- editors/emacs21/PLIST | 4 ++-- editors/tamago/Makefile | 8 ++++---- editors/tamago/PLIST | 6 +++--- editors/xemacs-nox11/Makefile | 4 +--- editors/xemacs/Makefile | 4 ++-- editors/xemacs/Makefile.common | 3 ++- editors/xemacs/PLIST | 6 +++--- editors/xemacs/options.mk | 7 ++++--- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'editors') diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common index e11b358332e..b1e13faa22c 100644 --- a/editors/emacs21/Makefile.common +++ b/editors/emacs21/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2007/10/29 12:38:02 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.3 2008/04/12 22:43:00 jlam Exp $ DISTNAME= emacs-${EMACSVERSION}a @@ -49,11 +49,11 @@ LDFLAGS+= -Wl,-z,nocombreloc CPPFLAGS+= -DDFLY_PRE_17_CRT .endif +PLIST_VARS+= fns.el .if ${OPSYS} == "Darwin" -PLIST_SUBST+= FNS_EL="@comment " PLIST_SUBST+= DOCTAIL="" .else -PLIST_SUBST+= FNS_EL="" +PLIST.fns.el= yes PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1" .endif diff --git a/editors/emacs21/PLIST b/editors/emacs21/PLIST index 91caf1d9c8b..d39b92d0b78 100644 --- a/editors/emacs21/PLIST +++ b/editors/emacs21/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/10/29 12:37:13 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:00 jlam Exp $ bin/emacs bin/emacs-${EMACSVERSION} bin/emacs-b2m @@ -12,7 +12,7 @@ libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail -${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el +${PLIST.fns.el}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 034266a906e..4beb2e9cb47 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/11/12 15:29:49 uebayasi Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $ DISTNAME= tamago-4.0.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909 @@ -17,10 +17,10 @@ EMACS_MODULES+= leim .include "../../mk/emacs.mk" +PLIST_VARS+= jisx0213 + .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} >= 21 -PLIST_SUBST+= HAVE_JISX0213= # empty -.else -PLIST_SUBST+= HAVE_JISX0213="@comment " +PLIST.jisx0213= yes .endif .include "../../mk/bsd.pkg.mk" diff --git a/editors/tamago/PLIST b/editors/tamago/PLIST index 7a0bd3269f9..b9969fff807 100644 --- a/editors/tamago/PLIST +++ b/editors/tamago/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2007/08/18 14:30:52 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:00 jlam Exp $ ${EMACS_LISPPREFIX}/egg/egg-cnv.el ${EMACS_LISPPREFIX}/egg/egg-cnv.elc ${EMACS_LISPPREFIX}/egg/egg-com.el @@ -34,8 +34,8 @@ ${EMACS_LISPPREFIX}/egg/its.el ${EMACS_LISPPREFIX}/egg/its.elc ${EMACS_LISPPREFIX}/egg/its/ascii.el ${EMACS_LISPPREFIX}/egg/its/ascii.elc -${HAVE_JISX0213}${EMACS_LISPPREFIX}/egg/its/aynu.el -${HAVE_JISX0213}${EMACS_LISPPREFIX}/egg/its/aynu.elc +${PLIST.jisx0213}${EMACS_LISPPREFIX}/egg/its/aynu.el +${PLIST.jisx0213}${EMACS_LISPPREFIX}/egg/its/aynu.elc ${EMACS_LISPPREFIX}/egg/its/bixing.el ${EMACS_LISPPREFIX}/egg/its/bixing.elc ${EMACS_LISPPREFIX}/egg/its/erpin.el diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index 548de5d8931..f771dc4909b 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/02/15 14:27:48 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:00 jlam Exp $ .include "../../editors/xemacs/Makefile.common" @@ -23,6 +23,4 @@ CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib -PLIST_SUBST+= X11ONLY="@comment " - .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 06706897df3..385585a7f60 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2007/02/15 14:27:48 joerg Exp $ +# $NetBSD: Makefile,v 1.84 2008/04/12 22:43:00 jlam Exp $ .include "../../editors/xemacs/Makefile.common" @@ -9,7 +9,7 @@ CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/i CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib -PLIST_SUBST+= X11ONLY="" +PLIST.x11= yes .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 408c0a77014..8573465893d 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2007/04/20 15:05:22 joerg Exp $ +# $NetBSD: Makefile.common,v 1.20 2008/04/12 22:43:00 jlam Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -17,6 +17,7 @@ USE_TOOLS+= gtar DIST_SUBDIR= xemacs EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PLIST_VARS+= x11 PLIST_SUBST+= DISTNAME=${DISTNAME:Q} FILES_SUBST+= DISTNAME=${DISTNAME:Q} MESSAGE_SUBST+= DISTNAME="${DISTNAME}" diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST index 3fb3763c492..76100c4737b 100644 --- a/editors/xemacs/PLIST +++ b/editors/xemacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2007/02/15 14:27:48 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2008/04/12 22:43:00 jlam Exp $ bin/${DISTNAME} bin/ellcc bin/gnuattach @@ -1040,7 +1040,7 @@ lib/${DISTNAME}/lisp/mule/arabic.elc lib/${DISTNAME}/lisp/mule/auto-autoloads.el${ELSUFX} lib/${DISTNAME}/lisp/mule/auto-autoloads.elc lib/${DISTNAME}/lisp/mule/canna-leim.el${ELSUFX} -${FOR_MULE}lib/${DISTNAME}/lisp/mule/canna-leim.elc +${PLIST.mule}lib/${DISTNAME}/lisp/mule/canna-leim.elc lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX} lib/${DISTNAME}/lisp/mule/chinese.elc lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX} @@ -1086,7 +1086,7 @@ lib/${DISTNAME}/lisp/mule/mule-misc.elc lib/${DISTNAME}/lisp/mule/mule-tty-init.el${ELSUFX} lib/${DISTNAME}/lisp/mule/mule-tty-init.elc lib/${DISTNAME}/lisp/mule/mule-x-init.el${ELSUFX} -${X11ONLY}lib/${DISTNAME}/lisp/mule/mule-x-init.elc +${PLIST.x11}lib/${DISTNAME}/lisp/mule/mule-x-init.elc lib/${DISTNAME}/lisp/mule/thai-xtis-chars.el${ELSUFX} lib/${DISTNAME}/lisp/mule/thai-xtis-chars.elc lib/${DISTNAME}/lisp/mule/thai-xtis.el${ELSUFX} diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 4eb5482f54f..9637db8758a 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,10 +1,12 @@ -# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:23 ghen Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:00 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna .include "../../mk/bsd.options.mk" +PLIST_VARS+= mule + .if !empty(PKG_OPTIONS:Mldap) CONFIGURE_ARGS+= --with-ldap . include "../../databases/openldap-client/buildlink3.mk" @@ -22,8 +24,7 @@ CONFIGURE_ARGS+= --without-xface .if !empty(PKG_OPTIONS:Mcanna) . include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-canna -PLIST_SUBST+= FOR_MULE='' +PLIST.mule= yes .else CONFIGURE_ARGS+= --without-canna -PLIST_SUBST+= FOR_MULE='@comment ' .endif -- cgit v1.2.3