pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/bmp Fixed a suble quoting bug. CONFIGURE_ARGS (a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3fc59543480
branches:  trunk
changeset: 497609:b3fc59543480
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Aug 01 00:09:35 2005 +0000

description:
Fixed a suble quoting bug. CONFIGURE_ARGS (and probably others) must not
be used with the := assignment operator when they contain quoted
components.

diffstat:

 audio/bmp/Makefile        |   8 +++-----
 audio/bmp/Makefile.common |  10 ++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 0d9ec5e42a26 -r b3fc59543480 audio/bmp/Makefile
--- a/audio/bmp/Makefile        Sun Jul 31 23:54:04 2005 +0000
+++ b/audio/bmp/Makefile        Mon Aug 01 00:09:35 2005 +0000
@@ -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 -r 0d9ec5e42a26 -r b3fc59543480 audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Sun Jul 31 23:54:04 2005 +0000
+++ b/audio/bmp/Makefile.common Mon Aug 01 00:09:35 2005 +0000
@@ -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 @@
 
 CONFIGURE_ARGS+=       --disable-alsa
 CONFIGURE_ARGS+=       --disable-esd
+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-opengl
 CONFIGURE_ARGS+=       --disable-oss
 CONFIGURE_ARGS+=       --disable-vorbis
+.endif
 
 PKGCONFIG_OVERRIDE+=   bmp.pc
 



Home | Main Index | Thread Index | Old Index