Updated darkice to 0.15.

14-04-2005 DarkIce 0.15 released

    o ported to OpenBSD and NetBSD, though real-time scheduling not supported,
      since it is not implemented in OpenBSD / NetBSD
    o added possibility to downsample from stereo to mono when encoding
      to Ogg Vorbis, thanks to Deti Fliegl, <deti@fliegl.de>
    o added support for Jack inputs, enabling a lot of interesting usage,
      including support for MacOS X.
      Thanks to Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
    o various improvements by Joel Ebel <jbebel@ncsu.edu>
    o added option to turn off automatic reconnect feature
    o added IPv6 support, thanks to <jochen2@users.sourceforge.net>

4 files changed, 210 insertions, 151 deletions

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index b2e73bdfd23..782e362f160 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/12 21:12:48 rillig Exp $
 #
 
-DISTNAME=	darkice-0.14
-PKGREVISION=	2
+DISTNAME=	darkice-0.15
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darkice/}
 
@@ -15,10 +14,10 @@ USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
 CONFIGURE_ARGS+=	--with-lame-prefix=${BUILDLINK_PREFIX.lame}
-LIBS+=			${LIBOSSAUDIO}
+LIBS+=			${LIBOSSAUDIO:Q}
 
 EGDIR=		${PREFIX}/share/examples/darkice
-HTMLDIR=	${PREFIX}/share/doc/html/darkice
+HTMLDIR=	${PREFIX}/share/doc/darkice
 
 CONF_FILES=	${EGDIR}/darkice.conf.default ${PKG_SYSCONFDIR}/darkice.conf
 
@@ -31,12 +30,11 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
 		${PREFIX}/man/man5/darkice.conf.5
-	for f in ${WRKSRC}/kdoc/*.html; do \
-		${INSTALL_DATA} $$f ${HTMLDIR}; \
-	done
+	cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html ${HTMLDIR}
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/jack/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST
index b576380d474..0a746abcaf0 100644
--- a/audio/darkice/PLIST
+++ b/audio/darkice/PLIST
@@ -1,103 +1,205 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/16 09:51:47 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/12 21:12:48 rillig Exp $
 bin/darkice
 man/man1/darkice.1
 man/man5/darkice.conf.5
-share/doc/html/darkice/AlsaDspSource.html
-share/doc/html/darkice/AlsaDspSource_h.html
-share/doc/html/darkice/AudioEncoder.html
-share/doc/html/darkice/AudioEncoder_h.html
-share/doc/html/darkice/AudioSource.html
-share/doc/html/darkice/AudioSource_h.html
-share/doc/html/darkice/BufferedSink.html
-share/doc/html/darkice/BufferedSink_h.html
-share/doc/html/darkice/CastSink.html
-share/doc/html/darkice/CastSink_h.html
-share/doc/html/darkice/Config.html
-share/doc/html/darkice/ConfigSection.html
-share/doc/html/darkice/ConfigSection_h.html
-share/doc/html/darkice/Config_h.html
-share/doc/html/darkice/Connector.html
-share/doc/html/darkice/Connector_h.html
-share/doc/html/darkice/DarkIce.html
-share/doc/html/darkice/DarkIce_h.html
-share/doc/html/darkice/Exception.html
-share/doc/html/darkice/Exception_h.html
-share/doc/html/darkice/FileCast.html
-share/doc/html/darkice/FileCast_h.html
-share/doc/html/darkice/FileSink.html
-share/doc/html/darkice/FileSink_h.html
-share/doc/html/darkice/IceCast.html
-share/doc/html/darkice/IceCast2.html
-share/doc/html/darkice/IceCast2_h.html
-share/doc/html/darkice/IceCast_h.html
-share/doc/html/darkice/LameLibEncoder.html
-share/doc/html/darkice/LameLibEncoder_h.html
-share/doc/html/darkice/MultiThreadedConnector.html
-share/doc/html/darkice/MultiThreadedConnector__ThreadData.html
-share/doc/html/darkice/MultiThreadedConnector_h.html
-share/doc/html/darkice/OssDspSource.html
-share/doc/html/darkice/OssDspSource_h.html
-share/doc/html/darkice/Ref.html
-share/doc/html/darkice/Ref_h.html
-share/doc/html/darkice/Referable.html
-share/doc/html/darkice/Referable_h.html
-share/doc/html/darkice/Reporter.html
-share/doc/html/darkice/Reporter_h.html
-share/doc/html/darkice/ShoutCast.html
-share/doc/html/darkice/ShoutCast_h.html
-share/doc/html/darkice/Sink.html
-share/doc/html/darkice/Sink_h.html
-share/doc/html/darkice/SolarisDspSource.html
-share/doc/html/darkice/SolarisDspSource_h.html
-share/doc/html/darkice/Source.html
-share/doc/html/darkice/Source_h.html
-share/doc/html/darkice/TcpSocket.html
-share/doc/html/darkice/TcpSocket_h.html
-share/doc/html/darkice/Util.html
-share/doc/html/darkice/Util_h.html
-share/doc/html/darkice/VorbisLibEncoder.html
-share/doc/html/darkice/VorbisLibEncoder_h.html
-share/doc/html/darkice/aflibConverter.html
-share/doc/html/darkice/aflibConverterLargeFilter_h.html
-share/doc/html/darkice/aflibConverterSmallFilter_h.html
-share/doc/html/darkice/aflibConverter_h.html
-share/doc/html/darkice/aflibDebug.html
-share/doc/html/darkice/aflibDebug_h.html
-share/doc/html/darkice/all-globals.html
-share/doc/html/darkice/full-list-AlsaDspSource.html
-share/doc/html/darkice/full-list-AudioEncoder.html
-share/doc/html/darkice/full-list-AudioSource.html
-share/doc/html/darkice/full-list-BufferedSink.html
-share/doc/html/darkice/full-list-CastSink.html
-share/doc/html/darkice/full-list-Config.html
-share/doc/html/darkice/full-list-ConfigSection.html
-share/doc/html/darkice/full-list-Connector.html
-share/doc/html/darkice/full-list-DarkIce.html
-share/doc/html/darkice/full-list-Exception.html
-share/doc/html/darkice/full-list-FileCast.html
-share/doc/html/darkice/full-list-FileSink.html
-share/doc/html/darkice/full-list-IceCast.html
-share/doc/html/darkice/full-list-IceCast2.html
-share/doc/html/darkice/full-list-LameLibEncoder.html
-share/doc/html/darkice/full-list-MultiThreadedConnector.html
-share/doc/html/darkice/full-list-MultiThreadedConnector__ThreadData.html
-share/doc/html/darkice/full-list-OssDspSource.html
-share/doc/html/darkice/full-list-Ref.html
-share/doc/html/darkice/full-list-Referable.html
-share/doc/html/darkice/full-list-Reporter.html
-share/doc/html/darkice/full-list-ShoutCast.html
-share/doc/html/darkice/full-list-Sink.html
-share/doc/html/darkice/full-list-SolarisDspSource.html
-share/doc/html/darkice/full-list-Source.html
-share/doc/html/darkice/full-list-TcpSocket.html
-share/doc/html/darkice/full-list-Util.html
-share/doc/html/darkice/full-list-VorbisLibEncoder.html
-share/doc/html/darkice/full-list-aflibConverter.html
-share/doc/html/darkice/full-list-aflibDebug.html
-share/doc/html/darkice/header-list.html
-share/doc/html/darkice/hier.html
-share/doc/html/darkice/index-long.html
-share/doc/html/darkice/index.html
+share/doc/darkice/AlsaDspSource_8cpp-source.html
+share/doc/darkice/AlsaDspSource_8cpp.html
+share/doc/darkice/AlsaDspSource_8h-source.html
+share/doc/darkice/AlsaDspSource_8h.html
+share/doc/darkice/AudioEncoder_8h-source.html
+share/doc/darkice/AudioEncoder_8h.html
+share/doc/darkice/AudioSource_8cpp-source.html
+share/doc/darkice/AudioSource_8cpp.html
+share/doc/darkice/AudioSource_8h-source.html
+share/doc/darkice/AudioSource_8h.html
+share/doc/darkice/BufferedSink_8cpp-source.html
+share/doc/darkice/BufferedSink_8cpp.html
+share/doc/darkice/BufferedSink_8h-source.html
+share/doc/darkice/BufferedSink_8h.html
+share/doc/darkice/CastSink_8cpp-source.html
+share/doc/darkice/CastSink_8cpp.html
+share/doc/darkice/CastSink_8h-source.html
+share/doc/darkice/CastSink_8h.html
+share/doc/darkice/ConfigSection_8cpp-source.html
+share/doc/darkice/ConfigSection_8cpp.html
+share/doc/darkice/ConfigSection_8h-source.html
+share/doc/darkice/ConfigSection_8h.html
+share/doc/darkice/Connector_8cpp-source.html
+share/doc/darkice/Connector_8cpp.html
+share/doc/darkice/Connector_8h-source.html
+share/doc/darkice/Connector_8h.html
+share/doc/darkice/DarkIceConfig_8cpp-source.html
+share/doc/darkice/DarkIceConfig_8cpp.html
+share/doc/darkice/DarkIceConfig_8h-source.html
+share/doc/darkice/DarkIceConfig_8h.html
+share/doc/darkice/DarkIce_8cpp-source.html
+share/doc/darkice/DarkIce_8cpp.html
+share/doc/darkice/DarkIce_8h-source.html
+share/doc/darkice/DarkIce_8h.html
+share/doc/darkice/Exception_8cpp-source.html
+share/doc/darkice/Exception_8cpp.html
+share/doc/darkice/Exception_8h-source.html
+share/doc/darkice/Exception_8h.html
+share/doc/darkice/FileCast_8cpp-source.html
+share/doc/darkice/FileCast_8cpp.html
+share/doc/darkice/FileCast_8h-source.html
+share/doc/darkice/FileCast_8h.html
+share/doc/darkice/FileSink_8cpp-source.html
+share/doc/darkice/FileSink_8cpp.html
+share/doc/darkice/FileSink_8h-source.html
+share/doc/darkice/FileSink_8h.html
+share/doc/darkice/IceCast2_8cpp-source.html
+share/doc/darkice/IceCast2_8cpp.html
+share/doc/darkice/IceCast2_8h-source.html
+share/doc/darkice/IceCast2_8h.html
+share/doc/darkice/IceCast_8cpp-source.html
+share/doc/darkice/IceCast_8cpp.html
+share/doc/darkice/IceCast_8h-source.html
+share/doc/darkice/IceCast_8h.html
+share/doc/darkice/JackDspSource_8cpp-source.html
+share/doc/darkice/JackDspSource_8cpp.html
+share/doc/darkice/JackDspSource_8h-source.html
+share/doc/darkice/JackDspSource_8h.html
+share/doc/darkice/LameLibEncoder_8cpp-source.html
+share/doc/darkice/LameLibEncoder_8cpp.html
+share/doc/darkice/LameLibEncoder_8h-source.html
+share/doc/darkice/LameLibEncoder_8h.html
+share/doc/darkice/MultiThreadedConnector_8cpp-source.html
+share/doc/darkice/MultiThreadedConnector_8cpp.html
+share/doc/darkice/MultiThreadedConnector_8h-source.html
+share/doc/darkice/MultiThreadedConnector_8h.html
+share/doc/darkice/OssDspSource_8cpp-source.html
+share/doc/darkice/OssDspSource_8cpp.html
+share/doc/darkice/OssDspSource_8h-source.html
+share/doc/darkice/OssDspSource_8h.html
+share/doc/darkice/Ref_8h-source.html
+share/doc/darkice/Ref_8h.html
+share/doc/darkice/Referable_8h-source.html
+share/doc/darkice/Referable_8h.html
+share/doc/darkice/Reporter_8cpp-source.html
+share/doc/darkice/Reporter_8cpp.html
+share/doc/darkice/Reporter_8h-source.html
+share/doc/darkice/Reporter_8h.html
+share/doc/darkice/ShoutCast_8cpp-source.html
+share/doc/darkice/ShoutCast_8cpp.html
+share/doc/darkice/ShoutCast_8h-source.html
+share/doc/darkice/ShoutCast_8h.html
+share/doc/darkice/Sink_8h-source.html
+share/doc/darkice/Sink_8h.html
+share/doc/darkice/SolarisDspSource_8cpp-source.html
+share/doc/darkice/SolarisDspSource_8cpp.html
+share/doc/darkice/SolarisDspSource_8h-source.html
+share/doc/darkice/SolarisDspSource_8h.html
+share/doc/darkice/Source_8h-source.html
+share/doc/darkice/Source_8h.html
+share/doc/darkice/TcpSocket_8cpp-source.html
+share/doc/darkice/TcpSocket_8cpp.html
+share/doc/darkice/TcpSocket_8h-source.html
+share/doc/darkice/TcpSocket_8h.html
+share/doc/darkice/Util_8cpp-source.html
+share/doc/darkice/Util_8cpp.html
+share/doc/darkice/Util_8h-source.html
+share/doc/darkice/Util_8h.html
+share/doc/darkice/VorbisLibEncoder_8cpp-source.html
+share/doc/darkice/VorbisLibEncoder_8cpp.html
+share/doc/darkice/VorbisLibEncoder_8h-source.html
+share/doc/darkice/VorbisLibEncoder_8h.html
+share/doc/darkice/aflibConverterLargeFilter_8h-source.html
+share/doc/darkice/aflibConverterLargeFilter_8h.html
+share/doc/darkice/aflibConverterSmallFilter_8h-source.html
+share/doc/darkice/aflibConverterSmallFilter_8h.html
+share/doc/darkice/aflibConverter_8cc-source.html
+share/doc/darkice/aflibConverter_8cc.html
+share/doc/darkice/aflibConverter_8h-source.html
+share/doc/darkice/aflibConverter_8h.html
+share/doc/darkice/aflibDebug_8cc-source.html
+share/doc/darkice/aflibDebug_8cc.html
+share/doc/darkice/aflibDebug_8h-source.html
+share/doc/darkice/aflibDebug_8h.html
+share/doc/darkice/annotated.html
+share/doc/darkice/classAlsaDspSource-members.html
+share/doc/darkice/classAlsaDspSource.html
+share/doc/darkice/classAudioEncoder-members.html
+share/doc/darkice/classAudioEncoder.html
+share/doc/darkice/classAudioSource-members.html
+share/doc/darkice/classAudioSource.html
+share/doc/darkice/classBufferedSink-members.html
+share/doc/darkice/classBufferedSink.html
+share/doc/darkice/classCastSink-members.html
+share/doc/darkice/classCastSink.html
+share/doc/darkice/classConfig-members.html
+share/doc/darkice/classConfig.html
+share/doc/darkice/classConfigSection-members.html
+share/doc/darkice/classConfigSection.html
+share/doc/darkice/classConnector-members.html
+share/doc/darkice/classConnector.html
+share/doc/darkice/classDarkIce-members.html
+share/doc/darkice/classDarkIce.html
+share/doc/darkice/classDebugInitFromEnv-members.html
+share/doc/darkice/classDebugInitFromEnv.html
+share/doc/darkice/classException-members.html
+share/doc/darkice/classException.html
+share/doc/darkice/classFileCast-members.html
+share/doc/darkice/classFileCast.html
+share/doc/darkice/classFileSink-members.html
+share/doc/darkice/classFileSink.html
+share/doc/darkice/classIceCast-members.html
+share/doc/darkice/classIceCast.html
+share/doc/darkice/classIceCast2-members.html
+share/doc/darkice/classIceCast2.html
+share/doc/darkice/classJackDspSource-members.html
+share/doc/darkice/classJackDspSource.html
+share/doc/darkice/classLameLibEncoder-members.html
+share/doc/darkice/classLameLibEncoder.html
+share/doc/darkice/classMultiThreadedConnector-members.html
+share/doc/darkice/classMultiThreadedConnector.html
+share/doc/darkice/classOssDspSource-members.html
+share/doc/darkice/classOssDspSource.html
+share/doc/darkice/classRef-members.html
+share/doc/darkice/classRef.html
+share/doc/darkice/classReferable-members.html
+share/doc/darkice/classReferable.html
+share/doc/darkice/classReporter-members.html
+share/doc/darkice/classReporter.html
+share/doc/darkice/classShoutCast-members.html
+share/doc/darkice/classShoutCast.html
+share/doc/darkice/classSink-members.html
+share/doc/darkice/classSink.html
+share/doc/darkice/classSolarisDspSource-members.html
+share/doc/darkice/classSolarisDspSource.html
+share/doc/darkice/classSource-members.html
+share/doc/darkice/classSource.html
+share/doc/darkice/classTcpSocket-members.html
+share/doc/darkice/classTcpSocket.html
+share/doc/darkice/classUtil-members.html
+share/doc/darkice/classUtil.html
+share/doc/darkice/classVorbisLibEncoder-members.html
+share/doc/darkice/classVorbisLibEncoder.html
+share/doc/darkice/classaflibConverter-members.html
+share/doc/darkice/classaflibConverter.html
+share/doc/darkice/classaflibDebug-members.html
+share/doc/darkice/classaflibDebug.html
+share/doc/darkice/classes.html
+share/doc/darkice/config_8h-source.html
+share/doc/darkice/config_8h.html
+share/doc/darkice/dir_000000.html
+share/doc/darkice/dirs.html
+share/doc/darkice/files.html
+share/doc/darkice/functions.html
+share/doc/darkice/functions_enum.html
+share/doc/darkice/functions_eval.html
+share/doc/darkice/functions_func.html
+share/doc/darkice/functions_vars.html
+share/doc/darkice/globals.html
+share/doc/darkice/globals_defs.html
+share/doc/darkice/globals_func.html
+share/doc/darkice/globals_vars.html
+share/doc/darkice/graph_legend.html
+share/doc/darkice/hierarchy.html
+share/doc/darkice/index.html
+share/doc/darkice/inherits.html
+share/doc/darkice/main_8cpp-source.html
+share/doc/darkice/main_8cpp.html
 share/examples/darkice/darkice.conf.default
 @dirrm share/examples/darkice
-@dirrm share/doc/html/darkice
+@dirrm share/doc/darkice
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 7aafe2ad5be..7dfeec7f0e1 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/03/11 21:27:17 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/04/12 21:12:48 rillig Exp $
 
-SHA1 (darkice-0.14.tar.gz) = 3c86c1f68ee7b1616911345ede1515652603b34f
-RMD160 (darkice-0.14.tar.gz) = 05f712fe8e2bb27dcd33543c4d9cd7cf696fd58e
-Size (darkice-0.14.tar.gz) = 337956 bytes
-SHA1 (patch-aa) = 9eba63fbc55e84f72adab2ec4bdd0c8bf97295f2
+SHA1 (darkice-0.15.tar.gz) = d43320081031ce9e70092f8e75c96d947c093387
+RMD160 (darkice-0.15.tar.gz) = e02a396e4d7a7cebac31b883e097fc1a1bdec525
+Size (darkice-0.15.tar.gz) = 1181764 bytes
diff --git a/audio/darkice/patches/patch-aa b/audio/darkice/patches/patch-aa
deleted file mode 100644
index d1e9319e122..00000000000
--- a/audio/darkice/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/11 21:27:17 rillig Exp $
-
-This patch disables the priority scheduling if it is not available.
-
-Needed at least for NetBSD-1.6.2.
-
---- src/DarkIce.cpp.orig	Sun Feb 15 13:14:38 2004
-+++ src/DarkIce.cpp	Fri Mar 11 18:01:41 2005
-@@ -873,6 +873,7 @@ DarkIce :: configFileCast (  const Confi
- void
- DarkIce :: setRealTimeScheduling ( void )               throw ( Exception )
- {
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-     uid_t   euid;
- 
-     euid = geteuid();
-@@ -917,6 +918,7 @@ DarkIce :: setRealTimeScheduling ( void 
-         reportEvent( 1,
-         "It is recommended that you run this program as super-user");
-     }
-+#endif
- }
- 
- 
-@@ -928,6 +930,7 @@ DarkIce :: setRealTimeScheduling ( void 
- void
- DarkIce :: setOriginalScheduling ( void )               throw ( Exception )
- {
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-     uid_t   euid;
- 
-     euid = geteuid();
-@@ -947,6 +950,7 @@ DarkIce :: setOriginalScheduling ( void 
- 
-         reportEvent( 5, "reverted to original scheduling");
-     }
-+#endif
- }
- 
-