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

through PLIST_SUBST to the plist module.

2 files changed, 20 insertions, 21 deletions

diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST
index 4244f750f6a..1afc9882360 100644
--- a/audio/streamtuner/PLIST
+++ b/audio/streamtuner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:42:58 jlam Exp $
 bin/streamtuner
 include/streamtuner/st-action-api.h
 include/streamtuner/st-category-api.h
@@ -21,10 +21,10 @@ include/streamtuner/st-version-api.h
 include/streamtuner/streamtuner.h
 lib/pkgconfig/streamtuner.pc
 lib/streamtuner/plugins/live365.la
-${LOCAL_PLUGIN}lib/streamtuner/plugins/local.la
-${PYTHON_PLUGIN}lib/streamtuner/plugins/python.la
+${PLIST.local}lib/streamtuner/plugins/local.la
+${PLIST.python}lib/streamtuner/plugins/python.la
 lib/streamtuner/plugins/shoutcast.la
-${XIPH_PLUGIN}lib/streamtuner/plugins/xiph.la
+${PLIST.xiph}lib/streamtuner/plugins/xiph.la
 share/applications/streamtuner.desktop
 share/doc/streamtuner/api-reference.html
 share/doc/streamtuner/ch01s02.html
@@ -66,12 +66,12 @@ share/locale/ja/LC_MESSAGES/streamtuner.mo
 share/locale/pt/LC_MESSAGES/streamtuner.mo
 share/omf/streamtuner/streamtuner-C.omf
 share/pixmaps/streamtuner.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/basic.ch.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/google-stations.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/punkcast.com.png
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/basic.ch.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/google-stations.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/punkcast.com.py
+${PLIST.python}share/streamtuner/python/icons/basic.ch.png
+${PLIST.python}share/streamtuner/python/icons/google-stations.png
+${PLIST.python}share/streamtuner/python/icons/punkcast.com.png
+${PLIST.python}share/streamtuner/python/scripts/basic.ch.py
+${PLIST.python}share/streamtuner/python/scripts/google-stations.py
+${PLIST.python}share/streamtuner/python/scripts/punkcast.com.py
 share/streamtuner/ui/applications.png
 share/streamtuner/ui/bookmarks.png
 share/streamtuner/ui/browse.png
@@ -84,7 +84,7 @@ share/streamtuner/ui/local.png
 share/streamtuner/ui/logo.png
 share/streamtuner/ui/main-category-running.png
 share/streamtuner/ui/main-category.png
-${PYTHON_PLUGIN}share/streamtuner/ui/python.png
+${PLIST.python}share/streamtuner/ui/python.png
 share/streamtuner/ui/preselections.png
 share/streamtuner/ui/record.png
 share/streamtuner/ui/search-category-running.png
@@ -95,9 +95,9 @@ share/streamtuner/ui/streamtuner.png
 share/streamtuner/ui/tune-in.png
 share/streamtuner/ui/xiph.png
 @dirrm share/streamtuner/ui
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/scripts
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/icons
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python
+${PLIST.python}@dirrm share/streamtuner/python/scripts
+${PLIST.python}@dirrm share/streamtuner/python/icons
+${PLIST.python}@dirrm share/streamtuner/python
 @dirrm share/streamtuner
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/streamtuner
diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk
index b7a93ede259..5e47d362531 100644
--- a/audio/streamtuner/options.mk
+++ b/audio/streamtuner/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/10/19 09:45:09 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.streamtuner
@@ -7,29 +7,28 @@ PKG_SUGGESTED_OPTIONS=	streamtuner-local streamtuner-xiph
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		local python xiph
+
 .if !empty(PKG_OPTIONS:Mstreamtuner-local)
-PLIST_SUBST+=		LOCAL_PLUGIN=
+PLIST.local=		yes
 CONFIGURE_ARGS+=	--enable-local
 .  include "../../audio/taglib/buildlink3.mk"
 .else
-PLIST_SUBST+=		LOCAL_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-local
 .endif
 
 .if !empty(PKG_OPTIONS:Mstreamtuner-xiph)
-PLIST_SUBST+=		XIPH_PLUGIN=
+PLIST.xiph=		yes
 CONFIGURE_ARGS+=	--enable-xiph
 .  include "../../textproc/libxml2/buildlink3.mk"
 .else
-PLIST_SUBST+=		XIPH_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-xiph
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
-PLIST_SUBST+=		PYTHON_PLUGIN=
+PLIST.python=		yes
 CONFIGURE_ARGS+=	--enable-python
 .  include "../../x11/py-gtk2/buildlink3.mk"
 .else
-PLIST_SUBST+=		PYTHON_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-python
 .endif