Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 22 insertions, 31 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 9ec0fb39fa3..3f5d5808c5d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2008/03/02 15:49:24 adam Exp $
+# $NetBSD: Makefile,v 1.174 2008/04/12 22:43:01 jlam Exp $
 
 DISTNAME=	gimp-2.4.5
 CATEGORIES=	graphics
@@ -48,10 +48,9 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
+PLIST_VARS+=		remote twain
 .if exists(/System/Library/Frameworks/TWAIN.framework)
-PLIST_SUBST+=	TWAIN=""
-.else
-PLIST_SUBST+=	TWAIN="@comment "
+PLIST.twain=		yes
 .endif
 
 .include "options.mk"
@@ -68,10 +67,8 @@ PLIST_SUBST+=	TWAIN="@comment "
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.if empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
-PLIST_SUBST+=	REMOTE="@comment "
-.else
-PLIST_SUBST+=	REMOTE=""
+.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
+PLIST.remote=	yes
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index ffa8478ef94..358dba0da8c 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.33 2007/11/21 19:52:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2008/04/12 22:43:01 jlam Exp $
 bin/gimp
 bin/gimp-2.4
 bin/gimp-console
 bin/gimp-console-2.4
-${REMOTE}bin/gimp-remote
-${REMOTE}bin/gimp-remote-2.4
+${PLIST.remote}bin/gimp-remote
+${PLIST.remote}bin/gimp-remote-2.4
 bin/gimptool-2.0
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
@@ -226,7 +226,7 @@ lib/gimp/2.0/plug-ins/CML_explorer
 lib/gimp/2.0/plug-ins/FractalExplorer
 lib/gimp/2.0/plug-ins/Lighting
 lib/gimp/2.0/plug-ins/MapObject
-${AALIB}lib/gimp/2.0/plug-ins/aa
+${PLIST.aalib}lib/gimp/2.0/plug-ins/aa
 lib/gimp/2.0/plug-ins/align_layers
 lib/gimp/2.0/plug-ins/animationplay
 lib/gimp/2.0/plug-ins/animoptimize
@@ -295,7 +295,7 @@ lib/gimp/2.0/plug-ins/gtm
 lib/gimp/2.0/plug-ins/guillotine
 lib/gimp/2.0/plug-ins/header
 lib/gimp/2.0/plug-ins/help
-${GNOME}lib/gimp/2.0/plug-ins/helpbrowser
+${PLIST.gnome}lib/gimp/2.0/plug-ins/helpbrowser
 lib/gimp/2.0/plug-ins/hot
 lib/gimp/2.0/plug-ins/ifscompose
 lib/gimp/2.0/plug-ins/illusion
@@ -313,7 +313,7 @@ lib/gimp/2.0/plug-ins/max_rgb
 lib/gimp/2.0/plug-ins/maze
 lib/gimp/2.0/plug-ins/mblur
 lib/gimp/2.0/plug-ins/metadata
-${MNG}lib/gimp/2.0/plug-ins/mng
+${PLIST.mng}lib/gimp/2.0/plug-ins/mng
 lib/gimp/2.0/plug-ins/mosaic
 lib/gimp/2.0/plug-ins/neon
 lib/gimp/2.0/plug-ins/newsprint
@@ -367,7 +367,7 @@ lib/gimp/2.0/plug-ins/spheredesigner
 lib/gimp/2.0/plug-ins/spread
 lib/gimp/2.0/plug-ins/struc
 lib/gimp/2.0/plug-ins/sunras
-${SVG}lib/gimp/2.0/plug-ins/svg
+${PLIST.svg}lib/gimp/2.0/plug-ins/svg
 lib/gimp/2.0/plug-ins/tga
 lib/gimp/2.0/plug-ins/threshold_alpha
 lib/gimp/2.0/plug-ins/tiff-load
@@ -375,7 +375,7 @@ lib/gimp/2.0/plug-ins/tiff-save
 lib/gimp/2.0/plug-ins/tile
 lib/gimp/2.0/plug-ins/tileit
 lib/gimp/2.0/plug-ins/tiler
-${TWAIN}lib/gimp/2.0/plug-ins/twain
+${PLIST.twain}lib/gimp/2.0/plug-ins/twain
 lib/gimp/2.0/plug-ins/uniteditor
 lib/gimp/2.0/plug-ins/unsharp
 lib/gimp/2.0/plug-ins/uri
@@ -995,7 +995,7 @@ share/gimp/2.0/themes/Default/images/stock-question-64.png
 share/gimp/2.0/themes/Default/images/stock-warning-64.png
 share/gimp/2.0/themes/Small/gtkrc
 share/gimp/2.0/tips/gimp-tips.xml
-${TWAIN}share/gimp/2.0/twain/gimp-twain.png
+${PLIST.twain}share/gimp/2.0/twain/gimp-twain.png
 share/gtk-doc/html/libgimp/GimpAspectPreview.html
 share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
 share/gtk-doc/html/libgimp/GimpDrawablePreview.html
@@ -1975,7 +1975,7 @@ share/mime-info/gimp.keys
 @dirrm share/gtk-doc/html/libgimpcolor
 @dirrm share/gtk-doc/html/libgimpbase
 @dirrm share/gtk-doc/html/libgimp
-${TWAIN}@dirrm share/gimp/2.0/twain
+${PLIST.twain}@dirrm share/gimp/2.0/twain
 @dirrm share/gimp/2.0/tips
 @dirrm share/gimp/2.0/themes/Small
 @dirrm share/gimp/2.0/themes/Default/images/preferences
diff --git a/graphics/gimp/options.mk b/graphics/gimp/options.mk
index 4e1b4916e0a..1fe0ddfada2 100644
--- a/graphics/gimp/options.mk
+++ b/graphics/gimp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/10/28 16:43:00 dogcow Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp
 PKG_SUPPORTED_OPTIONS=	aalib gnome mng svg
@@ -6,30 +6,24 @@ PKG_SUGGESTED_OPTIONS=	aalib gnome mng svg
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		aalib gnome mng svg
+
 .if !empty(PKG_OPTIONS:Maalib)
 .include "../../graphics/aalib/buildlink3.mk"
-PLIST_SUBST+=	AALIB=
-.else
-PLIST_SUBST+=	AALIB="@comment "
+PLIST.aalib=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
 .include "../../www/libgtkhtml/buildlink3.mk"
-PLIST_SUBST+=	GNOME=
-.else
-PLIST_SUBST+=	GNOME="@comment "
+PLIST.gnome=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mmng)
 .include "../../graphics/mng/buildlink3.mk"
-PLIST_SUBST+=	MNG=
-.else
-PLIST_SUBST+=	MNG="@comment "
+PLIST.mng=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
-PLIST_SUBST+=	SVG=
-.else
-PLIST_SUBST+=	SVG="@comment "
+PLIST.svg=		yes
 .endif