diff options
| -rw-r--r-- | audio/musicpd/Makefile | 8 | ||||
| -rw-r--r-- | audio/musicpd/PLIST | 3 | ||||
| -rw-r--r-- | audio/musicpd/distinfo | 8 | ||||
| -rw-r--r-- | audio/musicpd/options.mk | 13 |
4 files changed, 17 insertions, 15 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index ed497283ac4..95ad73d2e71 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2009/07/13 12:57:00 tonio Exp $ +# $NetBSD: Makefile,v 1.38 2009/07/27 20:08:38 drochner Exp $ -DISTNAME= mpd-0.14.2 +DISTNAME= mpd-0.15.1 PKGNAME= ${DISTNAME:S/mpd/musicpd/} -PKGREVISION= 1 CATEGORIES= audio #MASTER_SITES= http://musicpd.org/uploads/files/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} @@ -19,6 +18,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ .include "options.mk" @@ -30,7 +30,7 @@ LDFLAGS+= ${LIBOSSAUDIO} SUBST_CLASSES+= config paths SUBST_STAGE.config= pre-configure -SUBST_FILES.config= src/main.c +SUBST_FILES.config= src/cmdline.c SUBST_SED.config= -e s,/etc/mpd.conf,${PKG_SYSCONFDIR}/mpd.conf, SUBST_STAGE.paths= post-patch SUBST_FILES.paths= mpd.conf diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST index e4a8f3314ee..209fe3b120d 100644 --- a/audio/musicpd/PLIST +++ b/audio/musicpd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:32:19 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/07/27 20:08:38 drochner Exp $ bin/mpd man/man1/mpd.1 man/man5/mpd.conf.5 @@ -6,7 +6,6 @@ share/doc/mpd/AUTHORS share/doc/mpd/COPYING share/doc/mpd/NEWS share/doc/mpd/README -share/doc/mpd/TODO share/doc/mpd/UPGRADING share/doc/mpd/mpdconf.example share/examples/mpd/mpd.conf diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 02ee0af7ae0..f0447e51027 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.18 2009/03/19 21:35:14 asau Exp $ +$NetBSD: distinfo,v 1.19 2009/07/27 20:08:38 drochner Exp $ -SHA1 (mpd-0.14.2.tar.bz2) = 1ac9f6eff72c9e061af670e195da824310f3d922 -RMD160 (mpd-0.14.2.tar.bz2) = 4580907acdf361713bf3fe881a47871e84dfa864 -Size (mpd-0.14.2.tar.bz2) = 287115 bytes +SHA1 (mpd-0.15.1.tar.bz2) = eca8821e2c34b37232621b7219e39f0a6d67d190 +RMD160 (mpd-0.15.1.tar.bz2) = 595370f38b8f6fe80b14551214956088562f3d9c +Size (mpd-0.15.1.tar.bz2) = 385800 bytes diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index ebc52982cdf..f8a6ab85e98 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2009/03/19 21:35:14 asau Exp $ +# $NetBSD: options.mk,v 1.12 2009/07/27 20:08:38 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd PKG_SUPPORTED_OPTIONS= aac audiofile curl flac id3 libao jack libmikmod musepack ogg inet6 @@ -29,6 +29,9 @@ CONFIGURE_ARGS+= --disable-curl .if !empty(PKG_OPTIONS:Mflac) . include "../../audio/flac/buildlink3.mk" +# XXX whole album flac files can appearently be parsed without libcue, +# so I've yet to find out what libcue is good for +#. include "../../audio/libcue/buildlink3.mk" CONFIGURE_ARGS+= --enable-flac .else CONFIGURE_ARGS+= --disable-flac @@ -57,9 +60,9 @@ CONFIGURE_ARGS+= --disable-jack .if !empty(PKG_OPTIONS:Mlibmikmod) . include "../../audio/libmikmod/buildlink3.mk" -CONFIGURE_ARGS+= --enable-mod +CONFIGURE_ARGS+= --enable-mikmod .else -CONFIGURE_ARGS+= --disable-mod +CONFIGURE_ARGS+= --disable-mikmod .endif .if !empty(PKG_OPTIONS:Mmusepack) @@ -72,9 +75,9 @@ CONFIGURE_ARGS+= --disable-mpc .if !empty(PKG_OPTIONS:Mogg) . include "../../audio/libvorbis/buildlink3.mk" -CONFIGURE_ARGS+= --enable-oggvorbis +CONFIGURE_ARGS+= --enable-vorbis .else -CONFIGURE_ARGS+= --disable-oggvorbis +CONFIGURE_ARGS+= --disable-vorbis .endif .if !empty(PKG_OPTIONS:Minet6) |