4 files changed, 15 insertions, 41 deletions

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 63d2e4ff9ced..ba10f2cdd798 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	darkice
-PORTVERSION=	0.17.1
+PORTVERSION=	0.18
 CATEGORIES=	audio net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://darkice.tyrell.hu/dist/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
@@ -24,8 +24,8 @@ OPTIONS=	VORBIS "Ogg Vorbis support" on \
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--without-alsa \
-		--with-vorbis-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
+		--without-alsa
 
 MAN1=		darkice.1
 MAN5=		darkice.cfg.5
@@ -33,9 +33,14 @@ PLIST_FILES=	bin/darkice etc/darkice.cfg
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile on 4.x
+.endif
+
 .if defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--without-vorbis
 .else
+CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE}
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .endif
 
@@ -62,6 +67,7 @@ CONFIGURE_ARGS+=	--without-faac
 
 .if defined(WITH_JACK)
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 348717511169..935ade02e2a7 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,3 +1,3 @@
-MD5 (darkice-0.17.1.tar.gz) = 91221134cec3d52af842a9d50c06ee7d
-SHA256 (darkice-0.17.1.tar.gz) = 905f0d928e8ef009c864f6ac89884bb1bf773e6a91e625b37888d444f5115c45
-SIZE (darkice-0.17.1.tar.gz) = 1407826
+MD5 (darkice-0.18.tar.gz) = 52ef0c181372e1cb4a1e42a3b65ebaab
+SHA256 (darkice-0.18.tar.gz) = e7228918de0b2092f633e01c5b9078c902ea4be95e31a5b102bfa02740c1e4d5
+SIZE (darkice-0.18.tar.gz) = 286159
diff --git a/audio/darkice/files/patch-src_JackDspSource.cpp b/audio/darkice/files/patch-src_JackDspSource.cpp
deleted file mode 100644
index 6e0035d1a1b1..000000000000
--- a/audio/darkice/files/patch-src_JackDspSource.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/pkg-descr b/audio/darkice/pkg-descr
index 1d35355de6f9..bab6eaea5268 100644
--- a/audio/darkice/pkg-descr
+++ b/audio/darkice/pkg-descr
@@ -14,4 +14,4 @@ DarkIce can send the encoded stream to the following streaming servers:
  IceCast 1.3.x and 2.x
  Darwin Streaming Server
 
-WWW: http://darkice.sourceforge.net/
+WWW: http://darkice.tyrell.hu/