summaryrefslogtreecommitdiff
path: root/print/libgnomeprint
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
committerjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
commit31597853cc377bc7f255d79b8cbdba990fd506a1 (patch)
treefdd67c81079412bf94013749a954125434a9baca /print/libgnomeprint
parentd9176ab5ada46cb1a5d0b147d1c9ac9ba38136d0 (diff)
downloadpkgsrc-31597853cc377bc7f255d79b8cbdba990fd506a1.tar.gz
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'print/libgnomeprint')
-rw-r--r--print/libgnomeprint/Makefile6
-rw-r--r--print/libgnomeprint/PLIST4
2 files changed, 5 insertions, 5 deletions
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