Update to 0.17.1:

    o bugfix: automatic reconnect works more reliably
    o added check for bufferSecs set to 0
    o added realtime parameter to the general section
    o added MPEG2 support through the TwoLame library.
    o added AAC support through the faac codec, http://www.audiocoding.com
    o bug fix: icecast2 sections didn't honor lowpass or highpass filters
      when using the mp3 format

3 files changed, 34 insertions, 11 deletions

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 782e362f160..e3e189ef1f3 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/04/12 21:12:48 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/05/21 10:27:01 xtraeme Exp $
 #
 
-DISTNAME=	darkice-0.15
+DISTNAME=	darkice-0.17.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darkice/}
 
@@ -10,31 +10,36 @@ HOMEPAGE=	http://darkice.sourceforge.net/
 COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
 
 GNU_CONFIGURE=		yes
+USE_LANGUAGES+=		c++
 USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
 CONFIGURE_ARGS+=	--with-lame-prefix=${BUILDLINK_PREFIX.lame}
+CONFIGURE_ARGS+=	--with-twolame-prefix=${BUILDLINK_PREFIX.twolame}
+CONFIGURE_ARGS+=	--with-faac-prefix=${BUILDLINK_PREFIX.faac}
+CONFIGURE_ARGS+=	--without-jack
 LIBS+=			${LIBOSSAUDIO:Q}
 
 EGDIR=		${PREFIX}/share/examples/darkice
 HTMLDIR=	${PREFIX}/share/doc/darkice
 
-CONF_FILES=	${EGDIR}/darkice.conf.default ${PKG_SYSCONFDIR}/darkice.conf
+CONF_FILES=	${EGDIR}/darkice.conf ${PKG_SYSCONFDIR}/darkice.conf
 
 INSTALLATION_DIRS=	bin man/man1 man/man5
 
 do-install:
 	${INSTALL_DATA_DIR} ${EGDIR} ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf.default
+	${INSTALL_DATA} ${WRKSRC}/darkice.cfg ${EGDIR}/darkice.conf
 	${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
 		${PREFIX}/man/man5/darkice.conf.5
 	cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html ${HTMLDIR}
 
+.include "../../audio/faac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/jack/buildlink3.mk"
+.include "../../audio/twolame/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST
index 0a746abcaf0..937d2096ec3 100644
--- a/audio/darkice/PLIST
+++ b/audio/darkice/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/12 21:12:48 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/21 10:27:01 xtraeme Exp $
 bin/darkice
 man/man1/darkice.1
 man/man5/darkice.conf.5
+share/doc/darkice/AacEncoder_8cpp-source.html
+share/doc/darkice/AacEncoder_8cpp.html
+share/doc/darkice/AacEncoder_8h-source.html
+share/doc/darkice/AacEncoder_8h.html
 share/doc/darkice/AlsaDspSource_8cpp-source.html
 share/doc/darkice/AlsaDspSource_8cpp.html
 share/doc/darkice/AlsaDspSource_8h-source.html
@@ -40,6 +44,10 @@ 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/FaacEncoder_8cpp-source.html
+share/doc/darkice/FaacEncoder_8cpp.html
+share/doc/darkice/FaacEncoder_8h-source.html
+share/doc/darkice/FaacEncoder_8h.html
 share/doc/darkice/FileCast_8cpp-source.html
 share/doc/darkice/FileCast_8cpp.html
 share/doc/darkice/FileCast_8h-source.html
@@ -96,6 +104,10 @@ 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/TwoLameLibEncoder_8cpp-source.html
+share/doc/darkice/TwoLameLibEncoder_8cpp.html
+share/doc/darkice/TwoLameLibEncoder_8h-source.html
+share/doc/darkice/TwoLameLibEncoder_8h.html
 share/doc/darkice/Util_8cpp-source.html
 share/doc/darkice/Util_8cpp.html
 share/doc/darkice/Util_8h-source.html
@@ -117,6 +129,8 @@ 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/classAacEncoder-members.html
+share/doc/darkice/classAacEncoder.html
 share/doc/darkice/classAlsaDspSource-members.html
 share/doc/darkice/classAlsaDspSource.html
 share/doc/darkice/classAudioEncoder-members.html
@@ -139,6 +153,8 @@ 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/classFaacEncoder-members.html
+share/doc/darkice/classFaacEncoder.html
 share/doc/darkice/classFileCast-members.html
 share/doc/darkice/classFileCast.html
 share/doc/darkice/classFileSink-members.html
@@ -171,6 +187,8 @@ 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/classTwoLameLibEncoder-members.html
+share/doc/darkice/classTwoLameLibEncoder.html
 share/doc/darkice/classUtil-members.html
 share/doc/darkice/classUtil.html
 share/doc/darkice/classVorbisLibEncoder-members.html
@@ -200,6 +218,6 @@ 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
+share/examples/darkice/darkice.conf
 @dirrm share/examples/darkice
 @dirrm share/doc/darkice
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 7dfeec7f0e1..914cfce2366 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2006/04/12 21:12:48 rillig Exp $
+$NetBSD: distinfo,v 1.6 2006/05/21 10:27:01 xtraeme Exp $
 
-SHA1 (darkice-0.15.tar.gz) = d43320081031ce9e70092f8e75c96d947c093387
-RMD160 (darkice-0.15.tar.gz) = e02a396e4d7a7cebac31b883e097fc1a1bdec525
-Size (darkice-0.15.tar.gz) = 1181764 bytes
+SHA1 (darkice-0.17.1.tar.gz) = 2952961c8e99412d831ca619f152ba6774efefac
+RMD160 (darkice-0.17.1.tar.gz) = b6575b28190276d77e721e2ef15e8a93162693cc
+Size (darkice-0.17.1.tar.gz) = 1407826 bytes