Update to 0.99.99 (one year later... :-)

0.99.99                                 December 21, 2004

        * Core changes:

                * Startup time has been greatly reduced (especially
                  when there are a lot of cached streams)
                * The cache format has changed (a binary cache has
                  been reintroduced, improving performance and
                  allowing to inline binary files into the cache)
                * Was sometimes locking up at startup: fixed
                * The preferences dialog has been reworked
                * A tab can now reload multiple categories
                  concurrently
                * The stop button now only stops the currently
                  selected tab
                * The stream columns can now be reordered
                * The stream columns menu item now displays a dialog
                * The plugin API has been enriched (handler
                  configuration, handler preferences widget, character
                  set handling in the transfer framework, utilities,
                  ...) and documented
                * Bookmarks now include a description, homepage and
                  URI list
                * The about dialog does not list the plugins and
                  handlers anymore
                * Hyperlinks can now be focused, and activated using
                  the keyboard
                * User interface images are now loaded from external
                  files, for smaller memory usage
                * When a plugin was disabled, its configuration was
                  lost: fixed
                * Now compiles cleanly even when -fstrict-aliasing is
                  in use (based on a patch by Philipp Thomas)
                * The stock preselections have been updated
                * The streamtuner icon now uses the new colour scheme
                * Other fixes, cleanups and improvements

pkgsrc changes:

* Make it use the options framework. The following options are
  recognized:

	o streamtuner-local (to enable the local metadata plugin)
	o streamtuner-xiph (to enable the xiph plugin)
	o python (to enable the python plugin)

The python option is off by default and the other ones are on.

4 files changed, 118 insertions, 29 deletions

diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 43ece1018f1..425eb620dfa 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/10/19 09:45:09 xtraeme Exp $
 #
 
-DISTNAME=	streamtuner-0.99
-PKGREVISION=	1
+DISTNAME=	streamtuner-0.99.99
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/
 
@@ -22,9 +21,11 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE=	extras/streamtuner.pc.in
 
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=	--disable-gtk-doc
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+
+.include "options.mk"
+
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST
index f155838c969..47c501b2455 100644
--- a/audio/streamtuner/PLIST
+++ b/audio/streamtuner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/25 09:05:27 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/10/19 09:45:09 xtraeme Exp $
 bin/streamtuner
 include/streamtuner/st-action-api.h
 include/streamtuner/st-category-api.h
@@ -8,6 +8,7 @@ include/streamtuner/st-handler-field-api.h
 include/streamtuner/st-handlers-api.h
 include/streamtuner/st-m3u-api.h
 include/streamtuner/st-pls-api.h
+include/streamtuner/st-plugin-api.h
 include/streamtuner/st-programs-api.h
 include/streamtuner/st-re-api.h
 include/streamtuner/st-settings-api.h
@@ -20,36 +21,88 @@ include/streamtuner/st-version-api.h
 include/streamtuner/streamtuner.h
 lib/pkgconfig/streamtuner.pc
 lib/streamtuner/plugins/live365.la
-lib/streamtuner/plugins/local.la
-lib/streamtuner/plugins/python.la
+${LOCAL_PLUGIN}lib/streamtuner/plugins/local.la
+${PYTHON_PLUGIN}lib/streamtuner/plugins/python.la
 lib/streamtuner/plugins/shoutcast.la
-lib/streamtuner/plugins/xiph.la
+${XIPH_PLUGIN}lib/streamtuner/plugins/xiph.la
 share/applications/streamtuner.desktop
-share/doc/streamtuner/C/documentation-license.xml
-share/doc/streamtuner/C/figures/main-window.png
-share/doc/streamtuner/C/software-license.xml
-share/doc/streamtuner/C/streamtuner.xml
+share/doc/streamtuner/api-reference.html
+share/doc/streamtuner/ch01s02.html
+share/doc/streamtuner/home.png
+share/doc/streamtuner/index.html
+share/doc/streamtuner/index.sgml
+share/doc/streamtuner/ix01.html
+share/doc/streamtuner/left.png
+share/doc/streamtuner/overview.html
+share/doc/streamtuner/right.png
+share/doc/streamtuner/streamtuner-STHandler.html
+share/doc/streamtuner/streamtuner-STPlugin.html
+share/doc/streamtuner/streamtuner-st-action-api.html
+share/doc/streamtuner/streamtuner-st-category-api.html
+share/doc/streamtuner/streamtuner-st-dialog-api.html
+share/doc/streamtuner/streamtuner-st-handler-field-api.html
+share/doc/streamtuner/streamtuner-st-handlers-api.html
+share/doc/streamtuner/streamtuner-st-m3u-api.html
+share/doc/streamtuner/streamtuner-st-pls-api.html
+share/doc/streamtuner/streamtuner-st-programs-api.html
+share/doc/streamtuner/streamtuner-st-re-api.html
+share/doc/streamtuner/streamtuner-st-settings-api.html
+share/doc/streamtuner/streamtuner-st-sgml-ref-api.html
+share/doc/streamtuner/streamtuner-st-state-api.html
+share/doc/streamtuner/streamtuner-st-stream-api.html
+share/doc/streamtuner/streamtuner-st-transfer-api.html
+share/doc/streamtuner/streamtuner-st-util-api.html
+share/doc/streamtuner/streamtuner-st-version-api.html
+share/doc/streamtuner/streamtuner.devhelp
+share/doc/streamtuner/up.png
+share/help/streamtuner/C/documentation-license.xml
+share/help/streamtuner/C/figures/main-window.png
+share/help/streamtuner/C/software-license.xml
+share/help/streamtuner/C/streamtuner.xml
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/streamtuner.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/streamtuner.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/streamtuner.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/streamtuner.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/streamtuner.mo
 share/omf/streamtuner/streamtuner-C.omf
 share/pixmaps/streamtuner.png
-share/streamtuner/python/icons/basic.ch.png
-share/streamtuner/python/icons/google-stations.png
-share/streamtuner/python/icons/punkcast.com.png
-share/streamtuner/python/scripts/basic.ch.py
-share/streamtuner/python/scripts/google-stations.py
-share/streamtuner/python/scripts/punkcast.com.py
-@dirrm share/streamtuner/python/scripts
-@dirrm share/streamtuner/python/icons
-@dirrm share/streamtuner/python
+${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
+share/streamtuner/ui/applications.png
+share/streamtuner/ui/bookmarks.png
+share/streamtuner/ui/browse.png
+share/streamtuner/ui/category-open-running.png
+share/streamtuner/ui/category-open.png
+share/streamtuner/ui/category-running.png
+share/streamtuner/ui/category.png
+share/streamtuner/ui/live365.png
+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
+share/streamtuner/ui/preselections.png
+share/streamtuner/ui/record.png
+share/streamtuner/ui/search-category-running.png
+share/streamtuner/ui/search-category.png
+share/streamtuner/ui/search.png
+share/streamtuner/ui/shoutcast.png
+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
 @dirrm share/streamtuner
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/streamtuner
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/doc/streamtuner/C/figures
-@dirrm share/doc/streamtuner/C
+@dirrm share/help/streamtuner/C/figures
 @dirrm share/doc/streamtuner
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/streamtuner/plugins
diff --git a/audio/streamtuner/distinfo b/audio/streamtuner/distinfo
index 5645f8bad8e..4b1d0365eed 100644
--- a/audio/streamtuner/distinfo
+++ b/audio/streamtuner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 20:39:52 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/10/19 09:45:09 xtraeme Exp $
 
-SHA1 (streamtuner-0.99.tar.gz) = 6d6d0315a360783be9729b0f035bd38df27230d8
-RMD160 (streamtuner-0.99.tar.gz) = f47696b174515a55f55c381f62db16138817c665
-Size (streamtuner-0.99.tar.gz) = 782084 bytes
+SHA1 (streamtuner-0.99.99.tar.gz) = d912dbe1741ba9d14342ab6d9d818f06e97f6b59
+RMD160 (streamtuner-0.99.99.tar.gz) = b2f7dbc47a148e4c195f85b8f5e77bb843bb7d4e
+Size (streamtuner-0.99.99.tar.gz) = 948075 bytes
diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk
new file mode 100644
index 00000000000..b7a93ede259
--- /dev/null
+++ b/audio/streamtuner/options.mk
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2005/10/19 09:45:09 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.streamtuner
+PKG_SUPPORTED_OPTIONS=	streamtuner-local streamtuner-xiph python
+PKG_SUGGESTED_OPTIONS=	streamtuner-local streamtuner-xiph
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mstreamtuner-local)
+PLIST_SUBST+=		LOCAL_PLUGIN=
+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=
+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=
+CONFIGURE_ARGS+=	--enable-python
+.  include "../../x11/py-gtk2/buildlink3.mk"
+.else
+PLIST_SUBST+=		PYTHON_PLUGIN='@comment '
+CONFIGURE_ARGS+=	--disable-python
+.endif