diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /print/xfce4-print | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'print/xfce4-print')
| -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 |
3 files changed, 10 insertions, 11 deletions
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 |