summaryrefslogtreecommitdiff
path: root/audio/bmp
diff options
context:
space:
mode:
authorrillig <rillig>2005-08-01 00:09:35 +0000
committerrillig <rillig>2005-08-01 00:09:35 +0000
commitc11f2755a13f17c7bdbca322815227915da1789d (patch)
tree710a3da0a1f3eacc34eb867e0914b4f256756799 /audio/bmp
parentde1ecba6eaf8c7d57a3d179410c8a157bc9df74b (diff)
downloadpkgsrc-c11f2755a13f17c7bdbca322815227915da1789d.tar.gz
Fixed a suble quoting bug. CONFIGURE_ARGS (and probably others) must not
be used with the := assignment operator when they contain quoted components.
Diffstat (limited to 'audio/bmp')
-rw-r--r--audio/bmp/Makefile8
-rw-r--r--audio/bmp/Makefile.common10
2 files changed, 11 insertions, 7 deletions
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 85b819a3d5b..20aedf9d156 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2005/03/16 21:27:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/01 00:09:35 rillig Exp $
#
+BMP_ENABLE_ENCODERS= yes
+
.include "Makefile.common"
PKGREVISION= 1
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-mp3/--enable-mp3/}
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-oss/--enable-oss/}
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-vorbis/--enable-vorbis/}
-
# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
# any open plugin. libstdc++ gets dynamically linked in when the id3lib
# library is loaded, and is the one causing problems. See PR pkg/26846
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 5f9f3b277ad..1614bea0b7d 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/08/01 00:09:35 rillig Exp $
#
DISTNAME= bmp-0.9.7
@@ -20,10 +20,16 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-esd
-CONFIGURE_ARGS+= --disable-mp3
CONFIGURE_ARGS+= --disable-opengl
+.if defined(BMP_ENABLE_ENCODERS) && !empty(BMP_ENABLE_ENCODERS:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-mp3
+CONFIGURE_ARGS+= --enable-ogg
+CONFIGURE_ARGS+= --enable-vorbis
+.else
+CONFIGURE_ARGS+= --disable-mp3
CONFIGURE_ARGS+= --disable-oss
CONFIGURE_ARGS+= --disable-vorbis
+.endif
PKGCONFIG_OVERRIDE+= bmp.pc