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.

---
 emulators/wine/PLIST      | 14 +++++++-------
 emulators/wine/options.mk |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'emulators/wine')

diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 3e6698f23ab..e78f986c631 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.67 2007/08/11 11:06:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.68 2008/04/12 22:43:00 jlam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -562,7 +562,7 @@ lib/wine/faultrep.dll.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
-${WINE_OPENGL}lib/wine/glu32.dll.so
+${PLIST.opengl}lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
 lib/wine/hal.dll.so
 lib/wine/hh.exe.so
@@ -629,7 +629,7 @@ lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libgdiplus.def
-${WINE_OPENGL}lib/wine/libglu32.def
+${PLIST.opengl}lib/wine/libglu32.def
 lib/wine/libhid.def
 lib/wine/libhlink.def
 lib/wine/libicmp.def
@@ -669,7 +669,7 @@ lib/wine/libolecli32.def
 lib/wine/liboledlg.def
 lib/wine/libolepro32.def
 lib/wine/libolesvr32.def
-${WINE_OPENGL}lib/wine/libopengl32.def
+${PLIST.opengl}lib/wine/libopengl32.def
 lib/wine/libpdh.def
 lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
@@ -704,7 +704,7 @@ lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libwinecrt0.a
-${WINE_OPENGL}lib/wine/libwined3d.def
+${PLIST.opengl}lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
@@ -789,7 +789,7 @@ lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
-${WINE_OPENGL}lib/wine/opengl32.dll.so
+${PLIST.opengl}lib/wine/opengl32.dll.so
 lib/wine/oleview.exe.so
 lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
@@ -878,7 +878,7 @@ lib/wine/winebrowser.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/winecoreaudio.drv.so
-${WINE_OPENGL}lib/wine/wined3d.dll.so
+${PLIST.opengl}lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winedos.dll.so
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 68a9c2e4229..2321013e327 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/04/13 21:25:48 adam Exp $
+# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:00 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups opengl sane
@@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS=	opengl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		opengl
+
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
-PLIST_SUBST+=	WINE_OPENGL=""
+PLIST.opengl=		yes
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-opengl
-PLIST_SUBST+=	WINE_OPENGL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Msane)
-- 
cgit v1.2.3