summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/bmp-esound/Makefile8
-rw-r--r--audio/bmp/Makefile.common8
2 files changed, 10 insertions, 6 deletions
diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
index 081334b71d8..e34e5c39fc9 100644
--- a/audio/bmp-esound/Makefile
+++ b/audio/bmp-esound/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 14:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/31 09:12:18 rillig Exp $
#
+BMP_USE_ESD:= yes
.include "../../audio/bmp/Makefile.common"
PKGNAME= ${DISTNAME:S/bmp/bmp-esound/}
@@ -11,10 +12,7 @@ COMMENT= BMP plugin to output sound through the esound daemon
DEPENDS+= bmp>=0.9.7:../../audio/bmp
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-esd/--enable-esd/}
-
-BUILD_DIRS= ${WRKSRC}/Output/esd
-INSTALL_DIRS= ${WRKSRC}/Output/esd
+BUILD_DIRS= Output/esd
.include "../../audio/esound/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 73a666dd064..e70bb429967 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2006/03/09 21:04:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/05/31 09:12:18 rillig Exp $
#
DISTNAME= bmp-0.9.7
@@ -22,8 +22,14 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
+BMP_USE_ESD?= no
+
CONFIGURE_ARGS+= --disable-alsa
+.if !empty(BMP_USE_ESD:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-esd
+.else
CONFIGURE_ARGS+= --disable-esd
+.endif
CONFIGURE_ARGS+= --disable-opengl
.if defined(BMP_ENABLE_ENCODERS) && !empty(BMP_ENABLE_ENCODERS:M[Yy][Ee][Ss])
CONFIGURE_ARGS+= --enable-mp3