From a0771359b0ecb246a8d75a91b660dcc2116f08f9 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 19 Sep 2011 13:48:15 +0000
Subject: [PATCH] explicitly disable pulseaudio in these ports so they won't
 pick it up when it becomes available.

thanks to sthen@ for grepping the sources
---
 audio/fluidsynth/Makefile | 5 +++--
 audio/lmms/Makefile       | 4 ++--
 audio/xmp/Makefile        | 3 ++-
 x11/mplayer/Makefile      | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 2158a81405b..fa0aa475331 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/01/16 10:31:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/19 13:48:15 jasper Exp $
 
 COMMENT =		SoundFont2 software synthesizer
 DISTNAME =		fluidsynth-1.0.9
@@ -38,7 +38,8 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-lash \
 			--disable-ladcca \
 			--disable-oss-support \
-			--disable-portaudio-support
+			--disable-portaudio-support \
+			--disable-pulse-support
 
 post-patch:
 	cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index c9ccaa443db..283edb16775 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/16 08:26:10 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/19 13:48:15 jasper Exp $
 
 SHARED_ONLY =		Yes
 
@@ -43,7 +43,7 @@ USE_X11 =		Yes
 CONFIGURE_ENV =		CFLAGS="${CFLAGS} -I${X11BASE}/include" \
 			CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
-CONFIGURE_ARGS =	-DWANT_OSS=OFF -DWANT_SDL=OFF
+CONFIGURE_ARGS =	-DWANT_OSS=OFF -DWANT_SDL=OFF -DWANT_PULSEAUDIO=OFF
 
 # these are all available as separate ports
 CONFIGURE_ARGS +=	-DWANT_CALF=OFF -DWANT_CAPS=OFF -DWANT_CMT=OFF \
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index fa5779fb4ad..434e1e548ae 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2011/09/16 08:26:11 espie Exp $
+# $OpenBSD: Makefile,v 1.45 2011/09/19 13:48:15 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -67,6 +67,7 @@ CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts
 CONFIGURE_ARGS+=	--disable-oss \
 			--disable-alsa \
+			--disable-pulseaudio \
 			--enable-audacious-plugin \
 			--enable-bmp-plugin \
 			--enable-xmms-plugin
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 4e4a7eb4d59..a74cc1554bb 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.194 2011/08/17 15:12:15 edd Exp $
+# $OpenBSD: Makefile,v 1.195 2011/09/19 13:48:15 jasper Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS =	alpha amd64 arm i386 mips64 mips64el powerpc sparc64
@@ -97,6 +97,7 @@ CONFIGURE_ARGS += --disable-alsa \
 		--disable-select \
 		--disable-libcdio \
 		--disable-libmpeg2-internal
+		--disable-pulse \
 # seems stable dvdnav does not work with a new mplayer.
 # if they make a release in the future, maybe we can pull that in,
 # but for now we have to use the internal one.