- Update to 0.15.

PR:		ports/79970
Submitted by:	Ports Fury

5 files changed, 55 insertions, 38 deletions

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index ae7619865c3b..574941eaefc1 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	darkice
-PORTVERSION=	0.14
+PORTVERSION=	0.15
 CATEGORIES=	audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,21 +15,36 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
 
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-lame-prefix=${LOCALBASE} \
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--without-alsa \
 		--with-vorbis-prefix=${LOCALBASE}
 
 MAN1=		darkice.1
 MAN5=		darkice.cfg.5
 PLIST_FILES=	bin/darkice etc/darkice.cfg
 
+.if defined(WITH_LAME)
+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-lame
+.endif
+
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.else
+CONFIGURE_ARGS+=	--without-jack
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|PTHREAD_CFLAGS=.*$$|PTHREAD_CFLAGS=|g ; \
+		s|PTHREAD_LIBS=.*$$|PTHREAD_LIBS=|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 35ece3fbd3ac..ee779dcffb02 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,2 +1,2 @@
-MD5 (darkice-0.14.tar.gz) = e196487f376ab29c43277add33be15be
-SIZE (darkice-0.14.tar.gz) = 337956
+MD5 (darkice-0.15.tar.gz) = 313470008e387b70745ae2d75d5626c9
+SIZE (darkice-0.15.tar.gz) = 1181764
diff --git a/audio/darkice/files/patch-src_JackDspSource.cpp b/audio/darkice/files/patch-src_JackDspSource.cpp
new file mode 100644
index 000000000000..6e0035d1a1b1
--- /dev/null
+++ b/audio/darkice/files/patch-src_JackDspSource.cpp
@@ -0,0 +1,32 @@
+--- src/JackDspSource.cpp.orig Mon Apr  4 17:36:17 2005
++++ src/JackDspSource.cpp      Fri Apr 15 04:15:23 2005
+@@ -38,6 +38,18 @@
+ #include "config.h"
+ #endif
+ 
++#ifdef HAVE_STDIO_H
++#include <stdio.h>
++#else
++#error need stdio.h
++#endif
++
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#else
++#error need stdlib.h
++#endif
++
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #else
+@@ -60,6 +72,10 @@
+ #include <math.h>
+ #else
+ #error need math.h
++#endif
++
++#ifdef __FreeBSD__
++#define lrintf(x) rintf(x)
+ #endif
+ 
+ #include "Util.h"
diff --git a/audio/darkice/files/patch-src_Makefile.in b/audio/darkice/files/patch-src_Makefile.in
deleted file mode 100644
index b42463d0041f..000000000000
--- a/audio/darkice/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Mon Feb 16 07:33:35 2004
-+++ src/Makefile.in	Mon Feb 16 18:28:54 2004
-@@ -80,7 +80,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- bin_PROGRAMS = darkice
--CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
-+CXXFLAGS = @CXXFLAGS@ @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @ALSA_INCFLAGS@
- LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @ALSA_LDFLAGS@
- 
diff --git a/audio/darkice/files/patch-src_OssDspSource.cpp b/audio/darkice/files/patch-src_OssDspSource.cpp
deleted file mode 100644
index 18a73398bf2e..000000000000
--- a/audio/darkice/files/patch-src_OssDspSource.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/OssDspSource.cpp.orig	Thu Feb 13 00:48:22 2003
-+++ src/OssDspSource.cpp	Thu Jan  8 12:15:07 2004
-@@ -86,6 +86,13 @@
- #error need sys/soundcard.h
- #endif
- 
-+#if !defined(AFMT_S16_NE)
-+#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
-+#define AFMT_S16_NE AFMT_S16_BE
-+#else
-+#define AFMT_S16_NE AFMT_S16_LE
-+#endif
-+#endif
- 
- #include "Util.h"
- #include "Exception.h"