ports/131914: musicpd update: 0.14.2 release, ffmpeg knob, options cleanup

[David Horn]

>Number:         131914
>Category:       ports
>Synopsis:       musicpd update:  0.14.2 release, ffmpeg knob, options cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 20 20:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     David Horn
>Release:        7.0
>Organization:
>Environment:
FreeBSD dhorn-bsd 7.0-RELEASE-p7 FreeBSD 7.0-RELEASE-p7 #0: Sun Dec 21 12:33:45 UTC 2008     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
This is an update to audio/musicpd port for a few things:

1)  Update to latest upstream release (0.14.2)
2)  Add new ffmpeg knob to options, and LIBDEPENDS for avcodec/avformat/avutil
3)  change wording on id3tag knob to specify id3 v1/v2 instead of just v1
4)  change shoutcast wording to specify ogg (so that it is clearer)
5)  change several configure args to sync with the upstream.  This includes 
--enable-mpd-id3tag, --disable-ogg, --disable-shout are now:
--disable-id3, --disable-oggvorbis, --disable-shout-ogg, and added --disable-shout-mp3.
6)  Removed outdated iconv knob as this is no longer a valid configure option in musicpd configure script
 

>How-To-Repeat:

>Fix:
Fix is attached as a unified diff patchfile.

Patch attached with submission follows:

--- Makefile.original	2009-02-20 12:41:41.000000000 -0500
+++ Makefile	2009-02-20 14:55:00.000000000 -0500
@@ -4,11 +4,11 @@
 #
 # $FreeBSD: ports/audio/musicpd/Makefile,v 1.40 2009/01/28 05:30:46 pgollucci Exp $
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.14.1
+PORTVERSION=	0.14.2
 CATEGORIES=	audio ipv6
 MASTER_SITES=   SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 DISTNAME=	mpd-${PORTVERSION}
@@ -41,17 +41,17 @@
 		TREMOR		"Support Tremor (integer-only Vorbis)"	off \
 		WAV		"Support WAV audio format"		on \
 		AAC		"Support MP4/AAC audio format"		off \
 		MUSEPACK	"Support MPC audio format"		off \
 		MOD		"Support MOD audio format"		off \
-		ICONV		"Support international characters"	on \
-	        ID3TAG		"Support id3v1 tag encoding"		off \
+		FFMPEG		"Support FFMPEG (wma aiff ac3 ape...)"	on \
+	        ID3TAG		"Support ID3 v1/v2 tags"		on \
 		IPV6		"Support IPv6 protocol"			on \
 		AO		"Support libao audio library"		off \
 		PULSEAUDIO	"Support PulseAudio sound server"	off \
 		JACK		"Support JACK audio server"		off \
-		SHOUTCAST	"Support for Icecast and Shoutcast"	off \
+		SHOUTCAST	"Support for OGG Icecast and Shoutcast"	off \
 		LAME		"Support for MP3 Icecast Streams"	off \
 		SAMPLERATE	"Support sample rate conversion"	off
 
 .include <bsd.port.pre.mk>
 
@@ -61,11 +61,11 @@
 .else
 LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 .endif
 
 .if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=--disable-ogg
+CONFIGURE_ARGS+=--disable-oggvorbis
 .else
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if defined(WITH_TREMOR)
@@ -78,11 +78,14 @@
 .else
 CONFIGURE_ARGS+=--disable-aac
 .endif
 
 .if defined(WITH_LAME)
+CONFIGURE_ARGS+=--enable-shout-mp3
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+.else
+CONFIGURE_ARGS+=--disable-shout-mp3
 .endif
 
 .if defined(WITHOUT_WAV)
 CONFIGURE_ARGS+=--disable-audiofile
 .else
@@ -99,19 +102,22 @@
 LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 .else
 CONFIGURE_ARGS+=--disable-mod
 .endif
 
-.if defined(WITHOUT_ICONV)
-CONFIGURE_ARGS+=--disable-iconv
+.if defined(WITHOUT_FFMPEG)
+CONFIGURE_ARGS+=--disable-ffmpeg
 .else
-USE_ICONV=	yes
+LIB_DEPENDS+=   avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+		avformat:${PORTSDIR}/multimedia/ffmpeg \
+		avutil.1:${PORTSDIR}/multimedia/ffmpeg 
 .endif
 
-.if defined(WITH_ID3TAG)
-LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
-CONFIGURE_ARGS+=--enable-mpd-id3tag
+.if defined(WITHOUT_ID3TAG)
+CONFIGURE_ARGS+=--disable-id3
+.else
+LIB_DEPENDS+=   id3tag.0:${PORTSDIR}/audio/libid3tag
 .endif
 
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
@@ -136,11 +142,11 @@
 # libshout streaming support will be disabled by configure script when built
 # also with tremor since the latter does not support vorbis encoding
 .if defined(WITH_SHOUTCAST) && !defined(WITH_TREMOR)
 LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
 .else
-CONFIGURE_ARGS+=--disable-shout
+CONFIGURE_ARGS+=--disable-shout-ogg
 .endif
 
 .if defined(WITHOUT_SAMPLERATE)
 CONFIGURE_ARGS+=--disable-lsr
 .else
--- distinfo.original	2009-02-20 12:39:01.000000000 -0500
+++ distinfo	2009-02-20 12:40:43.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (mpd-0.14.1.tar.bz2) = 4bc78cbc64728cddb0ace81867565204
-SHA256 (mpd-0.14.1.tar.bz2) = b7e1fc95701a84583077def6e1c507e2bfb759aa42e04d1eca498094bf0fc694
-SIZE (mpd-0.14.1.tar.bz2) = 286850
+MD5 (mpd-0.14.2.tar.bz2) = 66817a4b4c05454e6488f6b821f2a6a3 
+SHA256 (mpd-0.14.2.tar.bz2) = 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20 
+SIZE (mpd-0.14.2.tar.bz2) = 287115 


>Release-Note:
>Audit-Trail:
>Unformatted: