Update MASTER_SITE

Don't pickup linux/input.h, this should fix plist failure because the evdev
modules is build (which is useless for us). [2]
Disable alsa support..
Remove FreeBSD 6.x patch.
Disable mmap support on FreeBSD versions that don't have support for it. [1]

PR:		ports/161567 [2]
Submitted by:	avg@ [1]
Reported by:	Takefu <takefu@airport.fm> [2]

5 files changed, 24 insertions, 62 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 8057703cedb0..74e67ca2a8c1 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -12,9 +12,9 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
+MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound server for UNIX
@@ -38,12 +38,17 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto -lssl" \
-		LIBS="-lm -lintl"
+		LIBS="-lm -lintl" \
+		ac_cv_header_linux_input_h=
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-database=gdbm \
+		--without-caps \
+		--disable-alsa \
+		--disable-udev \
+		--disable-gtk2 \
 		--disable-lirc # untested
 
 USERS=		pulse
@@ -63,19 +68,6 @@ MAN5=		default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
 
 .include <bsd.port.pre.mk>
 
-#.if ${ARCH} == "sparc64"
-#BROKEN=		Does not compile on sparc64
-#.endif
-
-.if ( ${OSVERSION} > 800000 && ${OSVERSION} < 800080 ) || \
-    ${OSVERSION} < 702000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_daemon_main.c \
-		${FILESDIR}/extra-patch-src_daemon_start-pulseaudio-x11.in \
-		${FILESDIR}/extra-patch-src_pulse_context.c
-.endif
-
-CONFIGURE_ARGS+=	--without-caps
-
 .if defined(WITH_JACK)
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
@@ -108,13 +100,14 @@ CONFIGURE_ARGS+=--disable-gconf
 PLIST_SUB+=	GCONF="@comment "
 .endif
 
+.if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \
+	((${OSVERSION} >= 900000) && (${OSVERSION} < 900037))
+EXTRA_PATCHES+=	${FILESDIR}/extra-src_modules_oss_module-oss.c
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/daemon/default.pa.in
-.if ${OSVERSION} < 700042
-	@${REINPLACE_CMD} -e 's|-Wl,-no-undefined||' \
-	    	${WRKSRC}/src/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
diff --git a/audio/pulseaudio/files/extra-patch-src_daemon_main.c b/audio/pulseaudio/files/extra-patch-src_daemon_main.c
deleted file mode 100644
index 8c6ae410f238..000000000000
--- a/audio/pulseaudio/files/extra-patch-src_daemon_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/daemon/main.c.orig	2009-01-12 18:11:38.000000000 -0500
-+++ src/daemon/main.c	2009-03-07 19:56:16.000000000 -0500
-@@ -689,7 +690,7 @@ int main(int argc, char *argv[]) {
-          * first take the autospawn lock to make things
-          * synchronous. */
- 
--        if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
-+        /*if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
-             pa_log("Failed to initialize autospawn lock");
-             goto finish;
-         }
-@@ -699,7 +700,7 @@ int main(int argc, char *argv[]) {
-             goto finish;
-         }
- 
--        autospawn_locked = TRUE;
-+        autospawn_locked = TRUE;*/
-     }
- 
-     if (conf->daemonize) {
diff --git a/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in
deleted file mode 100644
index 65001b57236c..000000000000
--- a/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemon/start-pulseaudio-x11.in.orig	2009-03-07 19:48:47.000000000 -0500
-+++ src/daemon/start-pulseaudio-x11.in	2009-03-07 19:48:56.000000000 -0500
-@@ -19,7 +19,7 @@
- 
- set -e
- 
--@PA_BINARY@ --start "$@"
-+@PA_BINARY@ -D "$@"
- 
- if [ x"$DISPLAY" != x ] ; then
- 
diff --git a/audio/pulseaudio/files/extra-patch-src_pulse_context.c b/audio/pulseaudio/files/extra-patch-src_pulse_context.c
deleted file mode 100644
index fda93a2a65c7..000000000000
--- a/audio/pulseaudio/files/extra-patch-src_pulse_context.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pulse/context.c.orig	2009-03-08 14:33:36.000000000 -0400
-+++ src/pulse/context.c	2009-03-08 14:33:42.000000000 -0400
-@@ -664,7 +664,7 @@ static int context_autospawn(pa_context 
-         n = 0;
- 
-         argv[n++] = c->conf->daemon_binary;
--        argv[n++] = "--start";
-+        argv[n++] = "-D";
- 
-         while (n < MAX_ARGS) {
-             char *a;
diff --git a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c b/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c
new file mode 100644
index 000000000000..f16573727007
--- /dev/null
+++ b/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c
@@ -0,0 +1,11 @@
+--- src/modules/oss/module-oss.c.orig	2010-11-26 01:45:23.000000000 +0100
++++ src/modules/oss/module-oss.c	2011-03-11 10:14:04.000000000 +0100
+@@ -1164,7 +1164,7 @@ int pa__init(pa_module*m) {
+     int fd = -1;
+     int nfrags, orig_frag_size, frag_size;
+     int mode, caps;
+-    pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE;
++    pa_bool_t record = TRUE, playback = TRUE, use_mmap = FALSE;
+     pa_sample_spec ss;
+     pa_channel_map map;
+     pa_modargs *ma = NULL;