diff options
author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
tree | fdd67c81079412bf94013749a954125434a9baca /print | |
parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'print')
-rw-r--r-- | print/cups/PLIST | 4 | ||||
-rw-r--r-- | print/cups/options.mk | 6 | ||||
-rw-r--r-- | print/evince/Makefile | 15 | ||||
-rw-r--r-- | print/evince/PLIST | 6 | ||||
-rw-r--r-- | print/ghostscript-esp/PLIST | 12 | ||||
-rw-r--r-- | print/ghostscript-esp/options.mk | 6 | ||||
-rw-r--r-- | print/ghostscript/PLIST | 12 | ||||
-rw-r--r-- | print/ghostscript/options.mk | 6 | ||||
-rw-r--r-- | print/libgnomeprint/Makefile | 6 | ||||
-rw-r--r-- | print/libgnomeprint/PLIST | 4 | ||||
-rw-r--r-- | print/xfce4-print/Makefile | 9 | ||||
-rw-r--r-- | print/xfce4-print/PLIST | 6 | ||||
-rw-r--r-- | print/xfce4-print/options.mk | 6 |
13 files changed, 47 insertions, 51 deletions
diff --git a/print/cups/PLIST b/print/cups/PLIST index 9e0ff8e2c03..4ff85969135 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/04/03 04:06:27 markd Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:09 jlam Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -1567,7 +1567,7 @@ share/doc/cups/zh_TW/images/button-view-error-log.gif share/doc/cups/zh_TW/images/button-view-page-log.gif share/doc/cups/zh_TW/images/button-view-printable-version.gif share/doc/cups/zh_TW/index.html -${PAM}share/examples/cups/cups.pam +${PLIST.pam}share/examples/cups/cups.pam share/examples/cups/cupsd.conf share/examples/cups/mime.convs share/examples/cups/mime.types diff --git a/print/cups/options.mk b/print/cups/options.mk index 9f7fe0dae03..6842b7644e1 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,20 +1,20 @@ -# $NetBSD: options.mk,v 1.1 2008/01/22 23:58:13 markd Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp PKG_SUGGESTED_OPTIONS= dnssd kerberos slp .include "../../mk/bsd.options.mk" +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-pam MESSAGE_SRC= ${PKGDIR}/MESSAGE MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam -PLIST_SUBST+= PAM= +PLIST.pam= yes .else CONFIGURE_ARGS+= --disable-pam MESSAGE_SRC= ${.CURDIR}/MESSAGE -PLIST_SUBST+= PAM="@comment " .endif .if !empty(PKG_OPTIONS:Mslp) diff --git a/print/evince/Makefile b/print/evince/Makefile index 6a80c5654b7..29dad766b21 100644 --- a/print/evince/Makefile +++ b/print/evince/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2008/03/06 14:53:53 wiz Exp $ -# +# $NetBSD: Makefile,v 1.40 2008/04/12 22:43:09 jlam Exp $ .include "../../print/evince/Makefile.common" @@ -17,26 +16,24 @@ PKG_SUGGESTED_OPTIONS= # none .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mdvi) CONFIGURE_ARGS+= --enable-dvi -PLIST_SUBST+= DVI= # empty +PLIST.dvi= yes GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas .include "../../mk/tex.buildlink3.mk" -.else -PLIST_SUBST+= DVI="@comment " .endif .if !empty(PKG_OPTIONS:Mdjvu) CONFIGURE_ARGS+= --enable-djvu -PLIST_SUBST+= DJVU= #empty +PLIST.djvu= yes GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .include "../../graphics/djvulibre-lib/buildlink3.mk" -.else -PLIST_SUBST+= DJVU="@comment " .endif CONFIGURE_ARGS+= --enable-comics -GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas BUILDLINK_DEPMETHOD.libXt?= build diff --git a/print/evince/PLIST b/print/evince/PLIST index cbd888e994b..0644262adfb 100644 --- a/print/evince/PLIST +++ b/print/evince/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2007/11/03 16:12:48 drochner Exp $ +@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:09 jlam Exp $ bin/evince bin/evince-thumbnailer man/man1/evince.1 @@ -28,8 +28,8 @@ share/evince/icons/hicolor/32x32/actions/view-page-facing.png share/evince/icons/hicolor/48x48/actions/view-page-continuous.png share/evince/icons/hicolor/48x48/actions/view-page-facing.png share/gconf/schemas/evince-thumbnailer-comics.schemas -${DJVU}share/gconf/schemas/evince-thumbnailer-djvu.schemas -${DVI}share/gconf/schemas/evince-thumbnailer-dvi.schemas +${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas +${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas share/gconf/schemas/evince-thumbnailer-ps.schemas share/gconf/schemas/evince-thumbnailer.schemas share/gconf/schemas/evince.schemas diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST index b7457d97b39..8040b4dc980 100644 --- a/print/ghostscript-esp/PLIST +++ b/print/ghostscript-esp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2008/03/10 12:34:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:09 jlam Exp $ bin/bdftops bin/dvipdf bin/eps2eps @@ -29,8 +29,8 @@ bin/ps2ps bin/pv.sh bin/unix-lpr.sh bin/wftopfa -${CUPS}libexec/cups/filter/pstopxl -${CUPS}libexec/cups/filter/pstoraster +${PLIST.cups}libexec/cups/filter/pstopxl +${PLIST.cups}libexec/cups/filter/pstoraster man/de/man1/dvipdf.1 man/de/man1/eps2eps.1 man/de/man1/font2c.1 @@ -69,8 +69,8 @@ man/man1/ps2pdf13.1 man/man1/ps2pdfwr.1 man/man1/ps2ps.1 man/man1/wftopfa.1 -${CUPS}share/cups/model/pxlcolor.ppd -${CUPS}share/cups/model/pxlmono.ppd +${PLIST.cups}share/cups/model/pxlcolor.ppd +${PLIST.cups}share/cups/model/pxlmono.ppd share/doc/ghostscript/API.htm share/doc/ghostscript/Bug-form.htm share/doc/ghostscript/Bug-info.htm @@ -113,7 +113,7 @@ share/doc/ghostscript/Use.htm share/doc/ghostscript/Xfonts.htm share/doc/ghostscript/gs.css share/doc/ghostscript/index.html -${CUPS}share/examples/cups/pstoraster.convs +${PLIST.cups}share/examples/cups/pstoraster.convs share/examples/ghostscript/alphabet.ps share/examples/ghostscript/colorcir.ps share/examples/ghostscript/doretree.ps diff --git a/print/ghostscript-esp/options.mk b/print/ghostscript-esp/options.mk index f1bb99d847c..cf88bbd7775 100644 --- a/print/ghostscript-esp/options.mk +++ b/print/ghostscript-esp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:03 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript-esp PKG_SUPPORTED_OPTIONS= x11 cups @@ -15,9 +15,10 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --without-x .endif +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) CONFIGURE_ARGS+= --enable-cups -PLIST_SUBST+= CUPS= +PLIST.cups= yes CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups @@ -39,5 +40,4 @@ ghostscript-esp-cups-install: ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR} .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST index b5d610a5c42..30cb1036dc2 100644 --- a/print/ghostscript/PLIST +++ b/print/ghostscript/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/03/10 12:34:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:09 jlam Exp $ bin/bdftops bin/dumphint bin/dvipdf @@ -31,8 +31,8 @@ bin/ps2ps2 bin/pv.sh bin/unix-lpr.sh bin/wftopfa -${CUPS}libexec/cups/filter/pstopxl -${CUPS}libexec/cups/filter/pstoraster +${PLIST.cups}libexec/cups/filter/pstopxl +${PLIST.cups}libexec/cups/filter/pstoraster man/de/man1/dvipdf.1 man/de/man1/eps2eps.1 man/de/man1/font2c.1 @@ -71,9 +71,9 @@ man/man1/ps2pdf13.1 man/man1/ps2pdfwr.1 man/man1/ps2ps.1 man/man1/wftopfa.1 -${CUPS}share/cups/model/pxlcolor.ppd -${CUPS}share/cups/model/pxlmono.ppd -${CUPS}share/examples/cups/pstoraster.convs +${PLIST.cups}share/cups/model/pxlcolor.ppd +${PLIST.cups}share/cups/model/pxlmono.ppd +${PLIST.cups}share/examples/cups/pstoraster.convs share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V share/ghostscript/${PKGVERSION}/Resource/CMap/78-H diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk index a2919b2180e..a3b449a5f3b 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2008/01/24 15:17:30 gdt Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript PKG_SUPPORTED_OPTIONS= x11 cups fontconfig @@ -15,9 +15,10 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --without-x .endif +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) CONFIGURE_ARGS+= --enable-cups -PLIST_SUBST+= CUPS= +PLIST.cups= yes CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups @@ -32,7 +33,6 @@ SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' .include "../../print/cups/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif .if !empty(PKG_OPTIONS:Mfontconfig) diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index ca675a9a420..fc3bd5641e8 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2008/02/13 19:39:26 drochner Exp $ +# $NetBSD: Makefile,v 1.65 2008/04/12 22:43:09 jlam Exp $ # DISTNAME= libgnomeprint-2.18.4 @@ -27,13 +27,13 @@ PKG_SUPPORTED_OPTIONS= cups .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/libgnomecups/buildlink3.mk" CONFIGURE_ARGS+= --with-cups -PLIST_SUBST+= USE_CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --without-cups -PLIST_SUBST+= USE_CUPS="@comment " .endif CONFIGURE_ARGS+= --without-papi diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST index f33496d586e..e91516b0443 100644 --- a/print/libgnomeprint/PLIST +++ b/print/libgnomeprint/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/02/13 19:39:26 drochner Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:09 jlam Exp $ include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h include/libgnomeprint-2.2/libgnomeprint/gnome-font.h include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h @@ -46,7 +46,7 @@ lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-reverse.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-rotate.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-select.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-zoom.la -${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la +${PLIST.cups}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 74e7d1c067f..6ff4d5a40f7 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:12 martti Exp $ +# $NetBSD: Makefile,v 1.21 2008/04/12 22:43:09 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -13,10 +13,9 @@ CONFIGURE_ARGS+= --with-printcap=/etc/printcap .include "options.mk" -.if ${OPSYS} == "SunOS" -PLIST_SUBST+= SOLARIS="@comment " -.else -PLIST_SUBST+= SOLARIS="" +PLIST_VARS+= bsdlpr +.if ${OPSYS} != "SunOS" +PLIST.bsdlpr= yes .endif .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST index 65840415c7f..46c602dba9c 100644 --- a/print/xfce4-print/PLIST +++ b/print/xfce4-print/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.18 2007/12/07 19:43:22 martti Exp $ -${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la +@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:09 jlam Exp $ +${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la bin/xfprint4 bin/xfprint4-manager include/xfce4/libxfprint/common.h @@ -12,7 +12,7 @@ include/xfce4/libxfprint/printing-system.h lib/libxfprint.la lib/pkgconfig/xfprint-1.0.pc lib/xfce4/mcs-plugins/xfprint_plugin.la -${CUPS}lib/xfce4/xfprint-plugins/cups_plugin.la +${PLIST.cups}lib/xfce4/xfprint-plugins/cups_plugin.la share/applications/xfce-xfprint-settings.desktop share/applications/xfprint-manager.desktop share/applications/xfprint.desktop diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk index 06c7b7b6709..061d03509f4 100644 --- a/print/xfce4-print/options.mk +++ b/print/xfce4-print/options.mk @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.4 2007/04/14 22:13:38 dillo Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-print PKG_SUPPORTED_OPTIONS= cups .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif |