summaryrefslogtreecommitdiff
path: root/audio/musicpd
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-11 23:09:44 +0000
committerwiz <wiz@pkgsrc.org>2014-08-11 23:09:44 +0000
commit83b00fb2610b5fb54a830ead5530a68b2f177a16 (patch)
treedcf9dd704b954a6166618438d87abbe0365078c1 /audio/musicpd
parent3b5b85d1d1ac38ac85d7793e2f0d561ecbe896ab (diff)
downloadpkgsrc-83b00fb2610b5fb54a830ead5530a68b2f177a16.tar.gz
Switch to ffmpeg1 instead of ffmpeg.
Note: some of these packages didn't build for me, e.g. osg, so I couldn't verify them all.
Diffstat (limited to 'audio/musicpd')
-rw-r--r--audio/musicpd/Makefile3
-rw-r--r--audio/musicpd/options.mk4
2 files changed, 4 insertions, 3 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index a71bc91fbb0..2a8308d71e8 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2014/08/05 19:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2014/08/11 23:09:44 wiz Exp $
DISTNAME= mpd-0.18.12
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.musicpd.org/download/mpd/0.18/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index c6c8aca9572..2a0822e8cfa 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2014/04/18 12:47:19 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2014/08/11 23:09:44 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
PKG_SUPPORTED_OPTIONS= adplug audiofile avahi bzip2 curl faad ffmpeg flac fluidsynth id3 inet6 libao lame jack libmms libmpdclient libwildmidi mikmod modplug mpg123 musepack musicpd-soundcloud openal opus pulseaudio shout sqlite3 tremor twolame vorbis wavpack zziplib
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --disable-aac
.endif
.if !empty(PKG_OPTIONS:Mffmpeg)
-. include "../../multimedia/ffmpeg/buildlink3.mk"
+. include "../../multimedia/ffmpeg1/buildlink3.mk"
CONFIGURE_ARGS+= --enable-ffmpeg
.else
CONFIGURE_ARGS+= --disable-ffmpeg