From 84db467ec7c8386066718011f8d47775d5608811 Mon Sep 17 00:00:00 2001
From: jlam <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.

---
 wm/compiz/Makefile | 12 +++++-------
 wm/compiz/PLIST    | 10 +++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'wm/compiz')

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 2f9e39db597..92930b59907 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:13 jlam Exp $
 #
 
 DISTNAME=	compiz-0.4.0
@@ -29,6 +29,8 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 # this is as much as needed for the basic window decorator
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
@@ -36,20 +38,16 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
 
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-librsvg
-PLIST_SUBST+=		GNOME=""
+PLIST.gnome=		yes
 .include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.else
-PLIST_SUBST+=		GNOME="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mkde)
-PLIST_SUBST+=		KDE=""
+PLIST.kde=		yes
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../sysutils/dbus-qt3/buildlink3.mk"
-.else
-PLIST_SUBST+=		KDE="@comment "
 .endif
 
 # While we don't use threads, we link against libpthread because
diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST
index ed0eec9f889..576df02f0a9 100644
--- a/wm/compiz/PLIST
+++ b/wm/compiz/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/25 10:54:19 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $
 bin/compiz
 bin/gtk-window-decorator
-${KDE}bin/kde-window-decorator
+${PLIST.kde}bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/decoration.h
 lib/compiz/libannotate.la
@@ -21,7 +21,7 @@ lib/compiz/libresize.la
 lib/compiz/librotate.la
 lib/compiz/libscale.la
 lib/compiz/libscreenshot.la
-${GNOME}lib/compiz/libsvg.la
+${PLIST.gnome}lib/compiz/libsvg.la
 lib/compiz/libswitcher.la
 lib/compiz/libwater.la
 lib/compiz/libwobbly.la
@@ -29,12 +29,12 @@ lib/compiz/libzoom.la
 lib/libdecoration.la
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
-${GNOME}lib/window-manager-settings/libcompiz.la
+${PLIST.gnome}lib/window-manager-settings/libcompiz.la
 share/compiz/freedesktop.png
 share/compiz/icon.png
 share/gconf/schemas/compiz.schemas
 share/gconf/schemas/gwd.schemas
-${GNOME}share/gnome/wm-properties/compiz.desktop
+${PLIST.gnome}share/gnome/wm-properties/compiz.desktop
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
 share/locale/bg/LC_MESSAGES/compiz.mo
-- 
cgit v1.2.3