ports/126540: [maintainer update] audio/musicpd: update to 0.13.2.

Thu Aug 14 23:20:02 UTC 2008

>Number:         126540
>Category:       ports
>Synopsis:       [maintainer update] audio/musicpd: update to 0.13.2.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 14 23:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Olof Lindqvist
>Release:        
>Organization:
http://www.jail.se
>Environment:
>Description:
Update to 0.13.2.

Options changed: 
Libsamplerate depend option added (ports/126492).
MP3 support now optional.
Jack option added.

Please note that I'm fairly new to maintaining ports. Review of port and feedback is highly appreciated.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN musicpd.old/Makefile musicpd/Makefile

--- musicpd.old/Makefile	2008-04-07 22:37:18.000000000 +0200
+++ musicpd/Makefile	2008-08-15 00:29:05.088058214 +0200
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.13.1
-PORTREVISION=	2
+PORTVERSION=	0.13.2
+PORTREVISION=	0
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://musicpd.org/uploads/files/ \
 		http://redundancy.redundancy.org/mirror/
@@ -17,47 +17,86 @@
 MAINTAINER=	jo.lindqvist at gmail.com
 COMMENT=	A remote-controllable music-daemon
 
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
-
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	musicpd.sh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-OPTIONS=	FLAC "Support for FLAC Audio" on \
-		VORBIS "Support for OGG Vorbis Audio" on \
-		WAV "Support for WAV Audio" on \
-		AAC "Support for MP4/AAC Audio" off \
-		MUSEPACK "Support for MPC Audio" off \
-		MOD "Support for MOD Audio" off \
-		ICONV "Support for international characters" on \
-	        ID3TAG "Support for id3v1 tag encoding" off \
-		IPV6 "Support for IPV6" on \
-		AO "Support for libao" off \
-		PULSE "Support for PulseAudio" off \
-		SHOUT "Support for Icecast and Shoutcast" on
+OPTIONS=	AO "Support for libao" off \
+		SHOUT "Support for streaming through shout" off \
+		ICONV "Support for iconv" on \
+		IPV6 "Support for IPv6" on \
+		OSS "Support for OSS" on \
+		JACK "Support for jack" off \
+		PULSE "Support for the PulseAudio sound server" off \
+		OGGVORBIS "Support for Ogg Vorbis" on \
+		FLAC "Support for FLAC" on \
+		MP3 "Support for MP3" on \
+		AAC "Support for AAC" on \
+		AUDIOFILE "Support for Audio File Library" on \
+		MOD "Support for MOD" off \
+		MPC "Support for Musepack" on \
+		ID3 "Support for ID3" on \
+		LSR "Support for libsamplerate" on
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
-.ifdef(WITHOUT_FLAC)
-CONFIGURE_ARGS+=--disable-flac \
-		--disable-oggflac
+.ifdef(WITH_AO)
+CONFIGURE_ARGS+=--enable-ao
+LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
+.endif
+
+.ifdef(WITH_SHOUT)
+LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
 .else
-LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=--disable-shout
 .endif
 
-.ifdef(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=--disable-ogg
+.ifdef(WITHOUT_ICONV)
+CONFIGURE_ARGS+=--disable-iconv
+.else
+USE_ICONV=	yes
+.endif
+
+.ifdef(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+.ifdef(WITHOUT_OSS)
+CONFIGURE_ARGS+=--disable-oss
+.endif
+
+.ifdef(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.else
+CONFIGURE_ARGS+=--disable-jack
+.endif
+
+.ifdef(WITH_PULSE)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=--disable-pulse
+.endif
+
+.ifdef(WITHOUT_OGGVORBIS)
+CONFIGURE_ARGS+=--disable-oggvorbis
 .else
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
-.ifdef(WITHOUT_WAV)
-CONFIGURE_ARGS+=--disable-audiofile
+.ifdef(WITHOUT_FLAC)
+CONFIGURE_ARGS+=--disable-flac \
+		--disable-oggflac
 .else
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
+.endif
+
+.ifdef(WITHOUT_MP3)
+CONFIGURE_ARGS+=--disable-mp3
+.else
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 .endif
 
 .ifdef(WITH_AAC)
@@ -66,10 +105,10 @@
 CONFIGURE_ARGS+=--disable-aac
 .endif
 
-.ifdef(WITH_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+.ifdef(WITHOUT_AUDIOFILE)
+CONFIGURE_ARGS+=--disable-audiofile
 .else
-CONFIGURE_ARGS+=--disable-mpc
+LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 .endif
 
 .ifdef(WITH_MOD)
@@ -78,35 +117,24 @@
 CONFIGURE_ARGS+=--disable-mod
 .endif
 
-.ifdef(WITHOUT_ICONV)
-CONFIGURE_ARGS+=--disable-iconv
+.ifdef(WITH_MPC)
+LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
 .else
-USE_ICONV=	yes
+CONFIGURE_ARGS+=--disable-mpc
 .endif
 
-.ifdef(WITH_ID3TAG)
+.ifdef(WITH_ID3)
 LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
-CONFIGURE_ARGS+=--enable-mpd-id3tag
-.endif
-
-.ifdef(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.ifdef(WITH_AO)
-CONFIGURE_ARGS+=--enable-ao
-LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
+.else
+CONFIGURE_ARGS+=--disable-id3
 .endif
 
-.ifdef(WITHOUT_PULSE)
-CONFIGURE_ARGS+=--disable-pulse
+.ifdef(WITHOUT_LSR)
+CONFIGURE_ARGS+=--disable-lsr
 .else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
 .endif
 
-.ifdef(WITHOUT_SHOUT)
-CONFIGURE_ARGS+=--disable-shout
-.endif
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff -ruN musicpd.old/distinfo musicpd/distinfo
--- musicpd.old/distinfo	2008-03-02 07:23:08.000000000 +0100
+++ musicpd/distinfo	2008-08-14 17:20:15.738671588 +0200
@@ -1,3 +1,3 @@
-MD5 (mpd-0.13.1.tar.bz2) = dbd219c8ba773bc9270e27bfafc798b5
-SHA256 (mpd-0.13.1.tar.bz2) = 678ce25c57c10afdfafe9e88d5d5100ba1bba112a82f1a044b1f1d0472e6960e
-SIZE (mpd-0.13.1.tar.bz2) = 435425
+MD5 (mpd-0.13.2.tar.bz2) = b461896369949ff3cff955692ead9f8b
+SHA256 (mpd-0.13.2.tar.bz2) = d98db80ec0bba7d4a82a8aecff965f6887f7b055ad064d8d5ccb55cc614cdfb5
+SIZE (mpd-0.13.2.tar.bz2) = 413347
diff -ruN musicpd.old/pkg-descr musicpd/pkg-descr
--- musicpd.old/pkg-descr	2004-03-25 20:27:40.000000000 +0100
+++ musicpd/pkg-descr	2008-08-15 00:45:51.397167483 +0200
@@ -1,6 +1,6 @@
 Music Player Daemon (MPD) allows remote access for playing music
-(MP3, MP4, Ogg, and Flac) and managing playlists.
-The design focus is on integrating a computer into a stereo system
+(MP3, Ogg, FLAC, AAC, Mod, and wave files) and managing playlists.
+MPD is designed for integrating a computer into a stereo system
 that provides control for music playback over a local network.
 
 WWW:	http://www.musicpd.org/


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

