Sun Jan 11 20:57:20 2009 UTC ()
Enable shoutcast support.

Patch from Gergo Szakal.


(ahoka)
diff -r1.31 -r1.32 pkgsrc/audio/musicpd/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/musicpd/options.mk
cvs diff -r1.31 -r1.32 pkgsrc/audio/musicpd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2008/11/02 22:25:09 1.31
+++ pkgsrc/audio/musicpd/Makefile 2009/01/11 20:57:20 1.32
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.31 2008/11/02 22:25:09 snj Exp $ 1# $NetBSD: Makefile,v 1.32 2009/01/11 20:57:20 ahoka Exp $
2 2
3DISTNAME= mpd-0.13.1 3DISTNAME= mpd-0.13.1
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://musicpd.org/uploads/files/ 7MASTER_SITES= http://musicpd.org/uploads/files/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10CONFLICTS= mpd-[0-9]* 10CONFLICTS= mpd-[0-9]*
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://musicpd.org/ 13HOMEPAGE= http://musicpd.org/
14COMMENT= Remote controllable audio player 14COMMENT= Remote controllable audio player
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18 18
cvs diff -r1.7 -r1.8 pkgsrc/audio/musicpd/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/options.mk 2007/02/01 14:52:43 1.7
+++ pkgsrc/audio/musicpd/options.mk 2009/01/11 20:57:20 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.7 2007/02/01 14:52:43 cbiere Exp $ 1# $NetBSD: options.mk,v 1.8 2009/01/11 20:57:20 ahoka Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
4PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg 4PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg shout
5PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg 5PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg shout
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Maac) 9.if !empty(PKG_OPTIONS:Maac)
10. include "../../audio/faad2/buildlink3.mk" 10. include "../../audio/faad2/buildlink3.mk"
11CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2} 11CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2}
12.else 12.else
13CONFIGURE_ARGS+= --disable-aac 13CONFIGURE_ARGS+= --disable-aac
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Maudiofile) 16.if !empty(PKG_OPTIONS:Maudiofile)
17. include "../../audio/libaudiofile/buildlink3.mk" 17. include "../../audio/libaudiofile/buildlink3.mk"
18CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile} 18CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile}
@@ -54,19 +54,26 @@ CONFIGURE_ARGS+= --disable-libmikmod @@ -54,19 +54,26 @@ CONFIGURE_ARGS+= --disable-libmikmod
54CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec} 54CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec}
55CONFIGURE_ARGS+= --enable-mpc 55CONFIGURE_ARGS+= --enable-mpc
56.else 56.else
57CONFIGURE_ARGS+= --disable-mpc 57CONFIGURE_ARGS+= --disable-mpc
58.endif 58.endif
59 59
60.if !empty(PKG_OPTIONS:Mogg) 60.if !empty(PKG_OPTIONS:Mogg)
61. include "../../audio/libvorbis/buildlink3.mk" 61. include "../../audio/libvorbis/buildlink3.mk"
62CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis} 62CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis}
63.else 63.else
64CONFIGURE_ARGS+= --disable-ogg 64CONFIGURE_ARGS+= --disable-ogg
65.endif 65.endif
66 66
 67.if !empty(PKG_OPTIONS:Mshout)
 68. include "../../audio/libshout/buildlink3.mk"
 69CONFIGURE_ARGS+= --enable-shout
 70.else
 71CONFIGURE_ARGS+= --enable-shout
 72.endif
 73
67# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address. 74# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address.
68#.if !empty(PKG_OPTIONS:Minet6) 75#.if !empty(PKG_OPTIONS:Minet6)
69#CONFIGURE_ARGS+= --enable-ipv6 76#CONFIGURE_ARGS+= --enable-ipv6
70#.else 77#.else
71CONFIGURE_ARGS+= --disable-ipv6 78CONFIGURE_ARGS+= --disable-ipv6
72#.endif 79#.endif