16 files changed, 159 insertions, 306 deletions
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 5747860ff78..26da9fb667f 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.21 2012/09/11 23:59:30 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/02/22 14:51:03 wiedi Exp $
 #
 
-DISTNAME=	darkice-0.17.1
-PKGREVISION=	1
+DISTNAME=	darkice-1.2
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darkice/}
+MASTER_SITES=	https://darkice.googlecode.com/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://darkice.tyrell.hu/
 COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
+LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
@@ -38,8 +38,6 @@ do-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
-	cd ${WRKSRC}/doc/doxygen/html && ${INSTALL_DATA} *.html \
-		${DESTDIR}${HTMLDIR}
 
 .include "../../audio/faac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff --git a/audio/darkice/PLIST b/audio/darkice/PLIST
index 5dc49c46e4f..3a166b5496c 100644
--- a/audio/darkice/PLIST
+++ b/audio/darkice/PLIST
@@ -1,221 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:32:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/02/22 14:51:03 wiedi 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
-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/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
-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/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
-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/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
-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/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
-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/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
-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
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index b3ae66349d9..4b6c60e3c55 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.12 2012/02/08 00:19:42 sbd Exp $
+$NetBSD: distinfo,v 1.13 2014/02/22 14:51:03 wiedi Exp $
 
-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
-SHA1 (patch-aa) = 6f58c2ae94a9b199ac733fd4b0742178f46dc961
-SHA1 (patch-ab) = 51cf308b209b933fe003775116d8b7d986e92476
-SHA1 (patch-ac) = 4ba61f7544da079a6e6aaaf49e03ef7c6c3fb8ca
-SHA1 (patch-src_Makefile_in) = 5627f74907abe9ab0dc297ca8ae7378fe004d3cf
-SHA1 (patch-src_Util.cpp) = fe609e7f0c03e4c0b667b054a2035dae57e2dff8
+SHA1 (darkice-1.2.tar.gz) = 508eb0560a7cdf0990a8793f4b8d324ae74bc343
+RMD160 (darkice-1.2.tar.gz) = cc627a716efc49275f3dc3e56011c4d62d0b176d
+Size (darkice-1.2.tar.gz) = 357026 bytes
+SHA1 (patch-configure) = cf4b34f3a995cec6256385908a9eeb9dfb870875
+SHA1 (patch-rc.darkice) = c8ea98936ad36768014b3fb1410b9c8a902f3a83
+SHA1 (patch-src_FaacEncoder.cpp) = a3ef45fbe17e8d59c09cc93b20665b4589ddc51b
+SHA1 (patch-src_IceCast.cpp) = 91e1920d9e12e9b317468fe64513cc13b75e9ce4
+SHA1 (patch-src_LameLibEncoder.cpp) = 9202aa7d5219dd24dddb7faa58e5edeeb26d6a18
+SHA1 (patch-src_Makefile.in) = ae028bf6e4616b615c4d1d50eb932077a287379d
+SHA1 (patch-src_SerialUlaw.cpp) = 259b99b7e772f743b32b94ace664451df28f90dd
+SHA1 (patch-src_TwoLameLibEncoder.cpp) = bd9774c98789ccdcd14b843d46ddf30f0c5da047
diff --git a/audio/darkice/patches/patch-aa b/audio/darkice/patches/patch-aa
deleted file mode 100644
index c2f5f1d1d46..00000000000
--- a/audio/darkice/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/10/10 20:09:22 rillig Exp $
-
---- configure.orig	2006-10-10 22:01:05.000000000 +0200
-+++ configure	2006-10-10 22:07:44.000000000 +0200
-@@ -6750,7 +6750,7 @@ else
-   USE_DEBUG="no"
- fi;
- 
--if test "x${USE_DEBUG}" == "xyes" ; then
-+if test "x${USE_DEBUG}" = "xyes" ; then
-     DEBUG_CXXFLAGS="-g"
-     echo "$as_me:$LINENO: result: compiling in debug mode" >&5
- echo "${ECHO_T}compiling in debug mode" >&6
diff --git a/audio/darkice/patches/patch-ab b/audio/darkice/patches/patch-ab
deleted file mode 100644
index 34ef3814857..00000000000
--- a/audio/darkice/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/08/02 17:43:56 dholland Exp $
-
---- src/LameLibEncoder.cpp~	2006-05-19 08:35:25.000000000 -0400
-+++ src/LameLibEncoder.cpp	2008-08-02 13:37:41.000000000 -0400
-@@ -79,10 +79,10 @@
-     lameGlobalFlags = lame_init();
- 
-     // ugly lame returns -1 in a pointer on allocation errors
--    if ( !lameGlobalFlags || ((int)lameGlobalFlags) == -1 ) {
-+    if ( !lameGlobalFlags || lameGlobalFlags == (lame_global_flags *)-1 ) {
-         throw Exception( __FILE__, __LINE__,
-                          "lame lib init error",
--                         (int) lameGlobalFlags);
-+                         (int)(intptr_t)lameGlobalFlags);
-     }
- 
-     if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {
diff --git a/audio/darkice/patches/patch-ac b/audio/darkice/patches/patch-ac
deleted file mode 100644
index bd0619b76e4..00000000000
--- a/audio/darkice/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/08/02 17:43:56 dholland Exp $
-
---- src/TwoLameLibEncoder.cpp~	2006-01-25 17:49:59.000000000 -0500
-+++ src/TwoLameLibEncoder.cpp	2008-08-02 13:42:36.000000000 -0400
-@@ -116,9 +116,9 @@ TwoLameLibEncoder :: open ( void )
-     // ugly twolame returns -1 in a pointer on allocation errors
-     if ( !twolame_opts  ) {
-         throw Exception( __FILE__, __LINE__,
-                          "TwoLAME lib init error",
--                         (int) twolame_opts);
-+                         /*(int) twolame_opts*/ /* why? */  0);
-     }
- 
-     if ( 0 > twolame_set_num_channels( twolame_opts, getInChannel()) ) {
-         throw Exception( __FILE__, __LINE__,
diff --git a/audio/darkice/patches/patch-configure b/audio/darkice/patches/patch-configure
new file mode 100644
index 00000000000..1ff4a3c6b1e
--- /dev/null
+++ b/audio/darkice/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+== portability
+--- configure.orig	2013-07-15 05:53:19.000000000 +0000
++++ configure
+@@ -6400,7 +6400,7 @@ else
+ fi
+ 
+ 
+-if test "x${USE_DEBUG}" == "xyes" ; then
++if test "x${USE_DEBUG}" = "xyes" ; then
+     DEBUG_CXXFLAGS="-g"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling in debug mode" >&5
+ $as_echo "compiling in debug mode" >&6; }
diff --git a/audio/darkice/patches/patch-rc.darkice b/audio/darkice/patches/patch-rc.darkice
new file mode 100644
index 00000000000..76b063426fb
--- /dev/null
+++ b/audio/darkice/patches/patch-rc.darkice
@@ -0,0 +1,32 @@
+$NetBSD: patch-rc.darkice,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+== portability
+--- rc.darkice.orig	2013-07-15 05:50:01.000000000 +0000
++++ rc.darkice
+@@ -40,7 +40,7 @@ case $1 in
+ 	if [ -f $pidfile ]; then
+                 PID=`cat $pidfile`
+                 running=`ps --no-headers -o "%c" -p $PID`
+-                if ( [ "$progname" == "$running" ] ); then
++                if ( [ "$progname" = "$running" ] ); then
+ 			echo "$progname is still running"
+ 		else
+ 			echo "$progname seems crashed - PID ($PID) does not match the deamon"
+@@ -85,7 +85,7 @@ case $1 in
+ 	if [ -f $pidfile ]; then
+ 		PID=`cat $pidfile` 		
+ 		running=`ps --no-headers -o "%c" -p $PID`
+-		if ( [ "$progname" == "$running" ] ); then
++		if ( [ "$progname" = "$running" ] ); then
+ 			echo "$progname IS running with PID `cat $pidfile`."
+ 		else
+ 			echo "$progname process is dead or stale PID File $pidfile"
+@@ -106,7 +106,7 @@ case $1 in
+ 	if [ -f $pidfile ]; then
+                 PID=`cat $pidfile`
+                 running=`ps --no-headers -o "%c" -p $PID`
+-                if ( [ "$progname" == "$running" ] ); then
++                if ( [ "$progname" = "$running" ] ); then
+                         echo "$progname IS running with PID `cat $pidfile` - no restart."
+                 else
+ 			echo "$progname PID $PID seems dead - restart"
diff --git a/audio/darkice/patches/patch-src_FaacEncoder.cpp b/audio/darkice/patches/patch-src_FaacEncoder.cpp
new file mode 100644
index 00000000000..0ac3f722aca
--- /dev/null
+++ b/audio/darkice/patches/patch-src_FaacEncoder.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_FaacEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+string.h is needed for memmove()
+--- src/FaacEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
++++ src/FaacEncoder.cpp
+@@ -37,7 +37,7 @@
+ #ifdef HAVE_FAAC_LIB
+ 
+ 
+-
++#include <string.h>
+ #include "Exception.h"
+ #include "Util.h"
+ #include "FaacEncoder.h"
diff --git a/audio/darkice/patches/patch-src_IceCast.cpp b/audio/darkice/patches/patch-src_IceCast.cpp
new file mode 100644
index 00000000000..84666d0af2b
--- /dev/null
+++ b/audio/darkice/patches/patch-src_IceCast.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_IceCast.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+Fix "log10(int) is ambigous" on SunOS
+--- src/IceCast.cpp.orig	2013-07-15 05:50:42.000000000 +0000
++++ src/IceCast.cpp
+@@ -145,7 +145,7 @@ IceCast :: sendLogin ( void )
+     /* send the x-audiocast headers */
+     str = "\nx-audiocast-bitrate: ";
+     sink->write( str, strlen( str));
+-    if ( log10(getBitRate()) >= (STRBUF_SIZE-2) ) {
++    if ( log10((double)getBitRate()) >= (STRBUF_SIZE-2) ) {
+         throw Exception( __FILE__, __LINE__,
+                          "bitrate does not fit string buffer", getBitRate());
+     }
diff --git a/audio/darkice/patches/patch-src_LameLibEncoder.cpp b/audio/darkice/patches/patch-src_LameLibEncoder.cpp
new file mode 100644
index 00000000000..40b08ec4e3a
--- /dev/null
+++ b/audio/darkice/patches/patch-src_LameLibEncoder.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_LameLibEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+Fix broken amd64 build
+--- src/LameLibEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
++++ src/LameLibEncoder.cpp
+@@ -81,10 +81,10 @@ LameLibEncoder :: open ( void )
+     // ugly lame returns -1 in a pointer on allocation errors
+     // this is cast to (long int) so that the pointer can be handled
+     // on 64 bit systems as well
+-    if ( !lameGlobalFlags || ((long int)lameGlobalFlags) == -1 ) {
++    if ( !lameGlobalFlags || lameGlobalFlags == (lame_global_flags *)-1 ) {
+         throw Exception( __FILE__, __LINE__,
+                          "lame lib init error",
+-                         (long int) lameGlobalFlags);
++                         (long int)(intptr_t) lameGlobalFlags);
+     }
+ 
+     if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {
diff --git a/audio/darkice/patches/patch-src_Makefile.in b/audio/darkice/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..e9173a65878
--- /dev/null
+++ b/audio/darkice/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+Don't build with -pedantic; it causes g++ to reject "long long" so
+32-bit builds fail.
+--- src/Makefile.in.orig	2013-07-15 05:53:19.000000000 +0000
++++ src/Makefile.in
+@@ -253,7 +253,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
++AM_CXXFLAGS = -O2 -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
+ INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @OPUS_INCFLAGS@ @FAAC_INCFLAGS@ @AACPLUS_INCFLAGS@ @TWOLAME_INCFLAGS@ \
+ 		@ALSA_INCFLAGS@ @PULSEAUDIO_INCFLAGS@ @JACK_INCFLAGS@ @SRC_INCFLAGS@
+ 
diff --git a/audio/darkice/patches/patch-src_Makefile_in b/audio/darkice/patches/patch-src_Makefile_in
deleted file mode 100644
index 457f8726b1c..00000000000
--- a/audio/darkice/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_Makefile_in,v 1.1 2011/06/19 04:50:09 dholland Exp $
-
-Don't build with -pedantic; it causes g++ to reject "long long" so
-32-bit builds fail.
-
---- src/Makefile.in~	2006-05-19 13:08:33.000000000 +0000
-+++ src/Makefile.in
-@@ -138,7 +138,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- bin_PROGRAMS = darkice
--AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
-+AM_CXXFLAGS = -O2 -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @FAAC_INCFLAGS@ @TWOLAME_INCFLAGS@ @ALSA_INCFLAGS@
- LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @FAAC_LDFLAGS@ @TWOLAME_LDFLAGS@ \
- 		@ALSA_LDFLAGS@ @JACK_LIBS@
diff --git a/audio/darkice/patches/patch-src_SerialUlaw.cpp b/audio/darkice/patches/patch-src_SerialUlaw.cpp
new file mode 100644
index 00000000000..f03376b817f
--- /dev/null
+++ b/audio/darkice/patches/patch-src_SerialUlaw.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_SerialUlaw.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+cfmakeraw is not portable to SunOS
+--- src/SerialUlaw.cpp.orig	2013-07-15 05:50:42.000000000 +0000
++++ src/SerialUlaw.cpp
+@@ -232,7 +232,15 @@ SerialUlaw :: open ( void )
+     }
+ 
+     cfsetispeed(&ts, B115200);
++#if defined(__sun)
++    ts.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
++    ts.c_oflag &= ~OPOST;
++    ts.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
++    ts.c_cflag &= ~(CSIZE|PARENB);
++    ts.c_cflag |= CS8;
++#else
+     cfmakeraw(&ts);
++#endif
+     ts.c_cflag |= CLOCAL;
+     if(tcsetattr(fileDescriptor, TCSANOW, &ts) < 0) {
+         close();
diff --git a/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp b/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp
new file mode 100644
index 00000000000..752124d47b6
--- /dev/null
+++ b/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_TwoLameLibEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+
+Fix broken amd64 build.
+--- src/TwoLameLibEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
++++ src/TwoLameLibEncoder.cpp
+@@ -116,7 +116,7 @@ TwoLameLibEncoder :: open ( void )
+     if ( !twolame_opts  ) {
+         throw Exception( __FILE__, __LINE__,
+                          "TwoLAME lib init error",
+-                         (long int) twolame_opts);
++                         /* (long int) twolame_opts */ /* why? */ 0);
+     }
+ 
+     if ( 0 > twolame_set_num_channels( twolame_opts, getInChannel()) ) {
diff --git a/audio/darkice/patches/patch-src_Util.cpp b/audio/darkice/patches/patch-src_Util.cpp
deleted file mode 100644
index 22ee5c33ca8..00000000000
--- a/audio/darkice/patches/patch-src_Util.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Util.cpp,v 1.2 2012/02/08 00:19:42 sbd Exp $
-
---- src/Util.cpp.orig	2005-04-17 10:58:09.000000000 +0000
-+++ src/Util.cpp
-@@ -276,7 +276,7 @@ Util :: fileAddDate ( const char * str )
-     unsigned int    size;
-     char          * s;
-     char          * strdate;
--    char          * last;
-+    const char    * last;
-     time_t          now;
-     
-     if ( !str ) {