svn commit: r323460 - in head/audio/darkice: . files

[Martin Wilke]

Author: miwi
Date: Mon Jul 22 15:18:53 2013
New Revision: 323460
URL: http://svnweb.freebsd.org/changeset/ports/323460

Log:
  - Update to 1.2
  
  PR:		180692
  Submitted by:	oorts fury

Added:
  head/audio/darkice/files/patch-configure.in   (contents, props changed)
Deleted:
  head/audio/darkice/files/patch-Makefile.in
  head/audio/darkice/files/patch-man-Makefile.in
Modified:
  head/audio/darkice/Makefile
  head/audio/darkice/distinfo   (contents, props changed)

Modified: head/audio/darkice/Makefile
==============================================================================
--- head/audio/darkice/Makefile	Mon Jul 22 15:07:30 2013	(r323459)
+++ head/audio/darkice/Makefile	Mon Jul 22 15:18:53 2013	(r323460)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	darkice
-PORTVERSION=	1.1
-PORTREVISION?=	2
+PORTVERSION=	1.2
+PORTREVISION?=	0
 CATEGORIES=	audio net
 MASTER_SITES=	GOOGLE_CODE
 
@@ -12,19 +12,18 @@ COMMENT=	IceCast, IceCast2, and ShoutCas
 
 LICENSE=	GPLv3
 
-OPTIONS_DEFINE=	JACK
+OPTIONS_DEFINE=	JACK PULSEAUDIO
 OPTIONS_MULTI=	CODEC
-OPTIONS_MULTI_CODEC=	VORBIS LAME TWOLAME FAAC AACPLUS
+OPTIONS_MULTI_CODEC=	VORBIS OPUS LAME TWOLAME FAAC AACPLUS
 OPTIONS_DEFAULT=	VORBIS
 
+OPUS_DESC=	Ogg Opus audio codec support
 AACPLUS_DESC=	AAC HEv2 and libsamplerate support
 
-USE_AUTOTOOLS=	aclocal autoconf
-AUTOMAKE_ARGS=	--add-missing
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal automake autoconf
+ACLOCAL_ARGS=	# none
+AUTOMAKE_ARGS=	--add-missing --copy --foreign
 CONFIGURE_ENV=	ac_cv_prog_acx_pthread_config=no
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--without-alsa
 
 SUB_FILES=	pkg-message
@@ -35,6 +34,20 @@ MAN5=		darkice.cfg.5
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MJACK}
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-jack
+.endif
+
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=	--with-pulseaudio-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-pulseaudio
+.endif
+
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE}
@@ -42,6 +55,13 @@ CONFIGURE_ARGS+=	--with-vorbis-prefix=${
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
+.if ${PORT_OPTIONS:MOPUS}
+LIB_DEPENDS+=	opus:${PORTSDIR}/audio/opus
+CONFIGURE_ARGS+=	--with-opus-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-opus
+.endif
+
 .if ${PORT_OPTIONS:MLAME}
 LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
@@ -63,13 +83,6 @@ CONFIGURE_ARGS+=	--with-faac-prefix=${LO
 CONFIGURE_ARGS+=	--without-faac
 .endif
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
-CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-jack
-.endif
-
 .if ${PORT_OPTIONS:MAACPLUS}
 LIB_DEPENDS+=	aacplus:${PORTSDIR}/audio/libaacplus \
 		samplerate:${PORTSDIR}/audio/libsamplerate
@@ -80,9 +93,7 @@ CONFIGURE_ARGS+=	--without-aacplus --wit
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/test/s|==|=|g'\
-	 -e 's/sbr_main.h/libaacplus\/sbr_main.h/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.am
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin

Modified: head/audio/darkice/distinfo
==============================================================================
--- head/audio/darkice/distinfo	Mon Jul 22 15:07:30 2013	(r323459)
+++ head/audio/darkice/distinfo	Mon Jul 22 15:18:53 2013	(r323460)
@@ -1,2 +1,2 @@
-SHA256 (darkice-1.1.tar.gz) = 170342cb4dbb0b44a62e37d0db1515fa7799c410fc4995bf8f32aaa6614f5f79
-SIZE (darkice-1.1.tar.gz) = 344568
+SHA256 (darkice-1.2.tar.gz) = b3fba9be2d9c72f36b0659cd9ce0652c8f973b5c6498407f093da9a364fdb254
+SIZE (darkice-1.2.tar.gz) = 357026

Added: head/audio/darkice/files/patch-configure.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/darkice/files/patch-configure.in	Mon Jul 22 15:18:53 2013	(r323460)
@@ -0,0 +1,15 @@
+--- configure.in.orig
++++ configure.in
+@@ -260,10 +260,11 @@
+ dnl-----------------------------------------------------------------------------
+ if test "x${LAME_LDFLAGS}" = "x" \
+      -a "x${VORBIS_LDFLAGS}" = "x" \
++     -a "x${OPUS_LDFLAGS}" = "x" \
+      -a "x${FAAC_LDFLAGS}" = "x" \
+      -a "x${AACPLUS_LDFLAGS}" = "x" \
+      -a "x${TWOLAME_LDFLAGS}" = "x"; then
+-    AC_MSG_ERROR([neither lame, Ogg Vorbis, faac, aac+ nor twolame configured])
++    AC_MSG_ERROR([neither lame, Ogg Vorbis, Ogg Opus, faac, aac+ nor twolame configured])
+ fi
+ 
+