From 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
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.

---
 x11/matchbox-panel/Makefile | 9 ++++-----
 x11/matchbox-panel/PLIST    | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'x11/matchbox-panel')

diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index 33d1ca83d2f..df9afb62bda 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/26 23:47:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:14 jlam Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
@@ -24,10 +24,9 @@ CONFIGURE_ARGS+=	--enable-nls
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "DragonFly"
-PLIST_SUBST+=	COND_APM="@comment "
-.else
-PLIST_SUBST+=	COND_APM=""
+PLIST_VARS=		apm
+.if ${OPSYS} != "DragonFly"
+PLIST.apm=		yes
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/matchbox-panel/PLIST b/x11/matchbox-panel/PLIST
index 729dd9ad4e1..136b2100dc6 100644
--- a/x11/matchbox-panel/PLIST
+++ b/x11/matchbox-panel/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/21 22:05:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:14 jlam Exp $
 bin/matchbox-panel
-${COND_APM}bin/mb-applet-battery
+${PLIST.apm}bin/mb-applet-battery
 bin/mb-applet-clock
 bin/mb-applet-launcher
 bin/mb-applet-menu-launcher
 bin/mb-applet-system-monitor
 bin/mb-applet-xterm-wrapper.sh
-${COND_APM}share/applications/mb-applet-battery.desktop
+${PLIST.apm}share/applications/mb-applet-battery.desktop
 share/applications/mb-applet-clock.desktop
 share/applications/mb-applet-menu-launcher.desktop
 share/applications/mb-applet-system-monitor.desktop
-- 
cgit v1.2.3