10 files changed, 290 insertions, 147 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d48ebeda61b3..88f1c212ec3e 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -19,41 +19,63 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 
 CONFLICTS=	polypaudio-[1-9]*
 
-USE_GNOME=	gnometarget gnomehack glib20
-WANT_GNOME=	yes
+USE_GNOME=	gnometarget gnomehack glib20 ltverhack
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libltdl:15
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		LIBS="-lm"
 
-CONFIGURE_ARGS+=	--disable-lirc # untested
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--disable-lirc # untested
 
-OPTIONS=	JACK "JACK audio support" Off
+OPTIONS=	JACK "JACK audio support" Off \
+		AVAHI "Enable Avahi mDNS support" On \
+		HAL "Enable HAL support" On \
+		GCONF "Enable GConf support" On
+
+PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_JACK) || exists(${LOCALBASE}/lib/libjack.la)
+.if defined(WITH_JACK)
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
 PLIST_SUB+=	JACK="@comment "
+CONFIGURE_ARGS+=--disable-jack
 .endif
 
-.if (exists(${LOCALBASE}/lib/libavahi-core.a) || defined(PACKAGE_BUILDING) \
-	|| defined(WITH_AVAHI)) && !defined(WITHOUT_AVAHI)
+.if !defined(WITHOUT_AVAHI)
 LIB_DEPENDS+=	avahi-core.5:${PORTSDIR}/net/avahi
-CONFIGURE_ARGS+=	--enable-avahi
 PLIST_SUB+=	AVAHI=""
 .else
-CONFIGURE_ARGS+=	--disable-avahi
+CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	AVAHI="@comment "
 .endif
 
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+PLIST_SUB+=	HAL=""
+.else
+CONFIGURE_ARGS+=--disable-hal
+PLIST_SUB+=	HAL="@comment "
+.endif
+
+.if !defined(WITHOUT_GCONF)
+USE_GNOME+=	gconf2
+PLIST_SUB+=	GCONF=""
+.else
+CONFIGURE_ARGS+=--disable-gconf
+PLIST_SUB+=	GCONF="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/daemon/default.pa.in
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 6bee5647341f..95131ab945cb 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.4.tar.gz) = aadbbc68306653f9052872c11e0cc707
-SHA256 (pulseaudio-0.9.4.tar.gz) = 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd
-SIZE (pulseaudio-0.9.4.tar.gz) = 1111744
+MD5 (pulseaudio-0.9.5.tar.gz) = 99b5d9efd4fce35cabb4ae5d0ebb230d
+SHA256 (pulseaudio-0.9.5.tar.gz) = cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
+SIZE (pulseaudio-0.9.5.tar.gz) = 1145930
diff --git a/audio/pulseaudio/files/patch-libpulse-browse.pc.in b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
new file mode 100644
index 000000000000..96299a084b14
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-browse.pc.in.orig	Sun Apr 29 19:26:35 2007
++++ libpulse-browse.pc.in	Sun Apr 29 19:26:54 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-browse
+ Description: PulseAudio Network Browsing API
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-browse
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-browse
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
new file mode 100644
index 000000000000..8b99e2d57fa1
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-mainloop-glib.pc.in.orig	Sun Apr 29 19:27:05 2007
++++ libpulse-mainloop-glib.pc.in	Sun Apr 29 19:27:20 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-mainloop-glib
+ Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-mainloop-glib
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-mainloop-glib
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse glib-2.0
diff --git a/audio/pulseaudio/files/patch-libpulse-simple.pc.in b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
new file mode 100644
index 000000000000..623dbf713425
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-simple.pc.in.orig	Sun Apr 29 19:26:00 2007
++++ libpulse-simple.pc.in	Sun Apr 29 19:26:18 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-simple
+ Description: Simplified Synchronous Client Interface to PulseAudio
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-simple
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-simple
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse.pc.in b/audio/pulseaudio/files/patch-libpulse.pc.in
new file mode 100644
index 000000000000..9065bdd2cd14
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse.pc.in
@@ -0,0 +1,11 @@
+--- libpulse.pc.in.orig	Sun Apr 29 19:25:22 2007
++++ libpulse.pc.in	Sun Apr 29 19:25:46 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse
+ Description: Client Interface to PulseAudio
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires:
diff --git a/audio/pulseaudio/files/patch-src_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss-util.c
new file mode 100644
index 000000000000..bee800d5dc07
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_modules_oss-util.c
@@ -0,0 +1,25 @@
+--- src/modules/oss-util.c.orig	Sun Apr 29 19:53:31 2007
++++ src/modules/oss-util.c	Sun Apr 29 19:55:24 2007
+@@ -40,6 +40,22 @@
+ 
+ #include "oss-util.h"
+ 
++#ifndef DSP_CAP_COPROC
++#define DSP_CAP_COPROC 0x00000800
++#endif
++#ifndef DSP_CAP_TRIGGER
++#define DSP_CAP_TRIGGER 0x00001000
++#endif
++#ifndef DSP_CAP_MMAP
++#define DSP_CAP_MMAP 0x00002000
++#endif
++#ifndef DSP_CAP_MULTI
++#define DSP_CAP_MULTI 0x00004000
++#endif
++#ifndef DSP_CAP_BIND
++#define DSP_CAP_BIND  0x00008000
++#endif
++
+ int pa_oss_open(const char *device, int *mode, int* pcaps) {
+     int fd = -1;
+     int caps;
diff --git a/audio/pulseaudio/pkg-descr b/audio/pulseaudio/pkg-descr
index 4c2c80914e4e..45634a1f79e7 100644
--- a/audio/pulseaudio/pkg-descr
+++ b/audio/pulseaudio/pkg-descr
@@ -1,4 +1,4 @@
-PulseAudio, previously known as Polypaudio, is a sound server for POSIX and 
+PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
 Win32 systems. A sound server is basically a proxy for your sound applications.
 It allows you to do advanced operations on your sound data as it passes between
 your application and your hardware. Things like transferring the audio to a
diff --git a/audio/pulseaudio/pkg-install b/audio/pulseaudio/pkg-install
index f4d1fb1121fe..7460a0eab52d 100644
--- a/audio/pulseaudio/pkg-install
+++ b/audio/pulseaudio/pkg-install
@@ -2,21 +2,62 @@
 
 case $2 in
 POST-INSTALL)
-	GROUP=realtime
-	GID=557
+	RGROUP=realtime
+	SUSER=pulse
+	SGROUP=${SUSER}
+	AGROUP=pulse-access
+	SUID=563
+	RGID=557
+	SGID=${SUID}
+	AGID=564
 	PW=/usr/sbin/pw
 
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
+	if ${PW} group show "${RGROUP}" 2>/dev/null; then
+		echo "You already have a group \"${RGROUP}\", so I will use it."
 	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
+		if ${PW} groupadd ${RGROUP} -g ${RGID}; then
+			echo "Added group \"${RGROUP}\"."
 		else
-			echo "Adding group \"${GROUP}\" failed..."
+			echo "Adding group \"${RGROUP}\" failed..."
 			exit 1
 		fi
 	fi
 
+	if ${PW} group show "${SGROUP}" 2>/dev/null; then
+		echo "You already have a group \"${SGROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${SGROUP} -g ${SGID}; then
+			echo "Added group \"${SGROUP}\"."
+		else
+			echo "Adding group \"${SGROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} group show "${AGROUP}" 2>/dev/null; then
+		echo "You already have a group \"${AGROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${AGROUP} -g ${AGID}; then
+			echo "Added group \"${AGROUP}\"."
+		else
+			echo "Adding group \"${AGROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${SUSER}" 2>/dev/null; then
+	    echo "You already have a user \"${SUSER}\", so I will use it."
+	else
+	    if ${PW} useradd ${SUSER} -u ${SUID} -g ${SGROUP} -h - \
+		-d "/nonexistent" -s /sbin/nologin -c "PulseAudio System User"
+	    then
+		echo "Added user \"${SUSER}\"."
+	    else
+		echo "Adding user \"${SUSER}\" failed..."
+		exit 1
+	    fi
+	fi
+
 	exit 0
 	;;
 esac
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index a104acb49e8f..425d2d6bb527 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -76,6 +76,7 @@ include/pulsecore/packet.h
 include/pulsecore/parseaddr.h
 include/pulsecore/pdispatch.h
 include/pulsecore/pid.h
+include/pulsecore/play-memblockq.h
 include/pulsecore/play-memchunk.h
 include/pulsecore/props.h
 include/pulsecore/protocol-cli.h
@@ -90,6 +91,7 @@ include/pulsecore/random.h
 include/pulsecore/resampler.h
 include/pulsecore/sample-util.h
 include/pulsecore/sconv.h
+include/pulsecore/shm.h
 include/pulsecore/sink-input.h
 include/pulsecore/sink.h
 include/pulsecore/sioman.h
@@ -109,7 +111,7 @@ include/pulsecore/x11wrap.h
 %%AVAHI%%lib/libpulse-browse.a
 %%AVAHI%%lib/libpulse-browse.la
 %%AVAHI%%lib/libpulse-browse.so
-%%AVAHI%%lib/libpulse-browse.so.1
+%%AVAHI%%lib/libpulse-browse.so.0
 lib/libpulse-mainloop-glib.a
 lib/libpulse-mainloop-glib.la
 lib/libpulse-mainloop-glib.so
@@ -125,134 +127,143 @@ lib/libpulse.so.0
 lib/libpulsecore.a
 lib/libpulsecore.la
 lib/libpulsecore.so
-lib/libpulsecore.so.1
+lib/libpulsecore.so.2
 lib/libpulsedsp.so
-lib/pulse-0.9/modules/libauthkey-prop.la
-lib/pulse-0.9/modules/libauthkey-prop.so
-lib/pulse-0.9/modules/libauthkey.la
-lib/pulse-0.9/modules/libauthkey.so
-%%AVAHI%%lib/pulse-0.9/modules/libavahi-wrap.la
-%%AVAHI%%lib/pulse-0.9/modules/libavahi-wrap.so
-lib/pulse-0.9/modules/libcli.la
-lib/pulse-0.9/modules/libcli.so
-lib/pulse-0.9/modules/libiochannel.la
-lib/pulse-0.9/modules/libiochannel.so
-lib/pulse-0.9/modules/libioline.la
-lib/pulse-0.9/modules/libioline.so
-lib/pulse-0.9/modules/libipacl.la
-lib/pulse-0.9/modules/libipacl.so
-%%JACK%%lib/pulse-0.9/modules/module-jack-sink.la
-%%JACK%%lib/pulse-0.9/modules/module-jack-sink.so
-%%JACK%%lib/pulse-0.9/modules/module-jack-source.la
-%%JACK%%lib/pulse-0.9/modules/module-jack-source.so
-lib/pulse-0.9/modules/liboss-util.la
-lib/pulse-0.9/modules/liboss-util.so
-lib/pulse-0.9/modules/libpacket.la
-lib/pulse-0.9/modules/libpacket.so
-lib/pulse-0.9/modules/libparseaddr.la
-lib/pulse-0.9/modules/libparseaddr.so
-lib/pulse-0.9/modules/libpdispatch.la
-lib/pulse-0.9/modules/libpdispatch.so
-lib/pulse-0.9/modules/libprotocol-cli.la
-lib/pulse-0.9/modules/libprotocol-cli.so
-lib/pulse-0.9/modules/libprotocol-esound.la
-lib/pulse-0.9/modules/libprotocol-esound.so
-lib/pulse-0.9/modules/libprotocol-http.la
-lib/pulse-0.9/modules/libprotocol-http.so
-lib/pulse-0.9/modules/libprotocol-native.la
-lib/pulse-0.9/modules/libprotocol-native.so
-lib/pulse-0.9/modules/libprotocol-simple.la
-lib/pulse-0.9/modules/libprotocol-simple.so
-lib/pulse-0.9/modules/libpstream-util.la
-lib/pulse-0.9/modules/libpstream-util.so
-lib/pulse-0.9/modules/libpstream.la
-lib/pulse-0.9/modules/libpstream.so
-lib/pulse-0.9/modules/librtp.la
-lib/pulse-0.9/modules/librtp.so
-lib/pulse-0.9/modules/libsocket-client.la
-lib/pulse-0.9/modules/libsocket-client.so
-lib/pulse-0.9/modules/libsocket-server.la
-lib/pulse-0.9/modules/libsocket-server.so
-lib/pulse-0.9/modules/libsocket-util.la
-lib/pulse-0.9/modules/libsocket-util.so
-lib/pulse-0.9/modules/libstrlist.la
-lib/pulse-0.9/modules/libstrlist.so
-lib/pulse-0.9/modules/libtagstruct.la
-lib/pulse-0.9/modules/libtagstruct.so
-lib/pulse-0.9/modules/libx11prop.la
-lib/pulse-0.9/modules/libx11prop.so
-lib/pulse-0.9/modules/libx11wrap.la
-lib/pulse-0.9/modules/libx11wrap.so
-lib/pulse-0.9/modules/module-cli-protocol-tcp.la
-lib/pulse-0.9/modules/module-cli-protocol-tcp.so
-lib/pulse-0.9/modules/module-cli-protocol-unix.la
-lib/pulse-0.9/modules/module-cli-protocol-unix.so
-lib/pulse-0.9/modules/module-cli.la
-lib/pulse-0.9/modules/module-cli.so
-lib/pulse-0.9/modules/module-combine.la
-lib/pulse-0.9/modules/module-combine.so
-lib/pulse-0.9/modules/module-detect.la
-lib/pulse-0.9/modules/module-detect.so
-lib/pulse-0.9/modules/module-esound-compat-spawnfd.la
-lib/pulse-0.9/modules/module-esound-compat-spawnfd.so
-lib/pulse-0.9/modules/module-esound-compat-spawnpid.la
-lib/pulse-0.9/modules/module-esound-compat-spawnpid.so
-lib/pulse-0.9/modules/module-esound-protocol-tcp.la
-lib/pulse-0.9/modules/module-esound-protocol-tcp.so
-lib/pulse-0.9/modules/module-esound-protocol-unix.la
-lib/pulse-0.9/modules/module-esound-protocol-unix.so
-lib/pulse-0.9/modules/module-esound-sink.la
-lib/pulse-0.9/modules/module-esound-sink.so
-lib/pulse-0.9/modules/module-http-protocol-tcp.la
-lib/pulse-0.9/modules/module-http-protocol-tcp.so
-lib/pulse-0.9/modules/module-http-protocol-unix.la
-lib/pulse-0.9/modules/module-http-protocol-unix.so
-lib/pulse-0.9/modules/module-match.la
-lib/pulse-0.9/modules/module-match.so
-lib/pulse-0.9/modules/module-native-protocol-fd.la
-lib/pulse-0.9/modules/module-native-protocol-fd.so
-lib/pulse-0.9/modules/module-native-protocol-tcp.la
-lib/pulse-0.9/modules/module-native-protocol-tcp.so
-lib/pulse-0.9/modules/module-native-protocol-unix.la
-lib/pulse-0.9/modules/module-native-protocol-unix.so
-lib/pulse-0.9/modules/module-null-sink.la
-lib/pulse-0.9/modules/module-null-sink.so
-lib/pulse-0.9/modules/module-oss-mmap.la
-lib/pulse-0.9/modules/module-oss-mmap.so
-lib/pulse-0.9/modules/module-oss.la
-lib/pulse-0.9/modules/module-oss.so
-lib/pulse-0.9/modules/module-pipe-sink.la
-lib/pulse-0.9/modules/module-pipe-sink.so
-lib/pulse-0.9/modules/module-pipe-source.la
-lib/pulse-0.9/modules/module-pipe-source.so
-lib/pulse-0.9/modules/module-rtp-recv.la
-lib/pulse-0.9/modules/module-rtp-recv.so
-lib/pulse-0.9/modules/module-rtp-send.la
-lib/pulse-0.9/modules/module-rtp-send.so
-lib/pulse-0.9/modules/module-simple-protocol-tcp.la
-lib/pulse-0.9/modules/module-simple-protocol-tcp.so
-lib/pulse-0.9/modules/module-simple-protocol-unix.la
-lib/pulse-0.9/modules/module-simple-protocol-unix.so
-lib/pulse-0.9/modules/module-sine.la
-lib/pulse-0.9/modules/module-sine.so
-lib/pulse-0.9/modules/module-tunnel-sink.la
-lib/pulse-0.9/modules/module-tunnel-sink.so
-lib/pulse-0.9/modules/module-tunnel-source.la
-lib/pulse-0.9/modules/module-tunnel-source.so
-lib/pulse-0.9/modules/module-volume-restore.la
-lib/pulse-0.9/modules/module-volume-restore.so
-lib/pulse-0.9/modules/module-x11-bell.la
-lib/pulse-0.9/modules/module-x11-bell.so
-lib/pulse-0.9/modules/module-x11-publish.la
-lib/pulse-0.9/modules/module-x11-publish.so
-%%AVAHI%%lib/pulse-0.9/modules/module-zeroconf-publish.la
-%%AVAHI%%lib/pulse-0.9/modules/module-zeroconf-publish.so
+lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.la
+lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.so
+lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.la
+lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.la
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/libcli.la
+lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
+%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.la
+%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.so
+lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.la
+lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.so
+lib/pulse-%%PULSE_VERSION%%/modules/libioline.la
+lib/pulse-%%PULSE_VERSION%%/modules/libioline.so
+lib/pulse-%%PULSE_VERSION%%/modules/libipacl.la
+lib/pulse-%%PULSE_VERSION%%/modules/libipacl.so
+lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.la
+lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
+lib/pulse-%%PULSE_VERSION%%/modules/libpacket.la
+lib/pulse-%%PULSE_VERSION%%/modules/libpacket.so
+lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.la
+lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.so
+lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.la
+lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.la
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.la
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.la
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.la
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.la
+lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
+lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.la
+lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.so
+lib/pulse-%%PULSE_VERSION%%/modules/libpstream.la
+lib/pulse-%%PULSE_VERSION%%/modules/libpstream.so
+lib/pulse-%%PULSE_VERSION%%/modules/librtp.la
+lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.la
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.so
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.la
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.so
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.la
+lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.so
+lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.la
+lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.so
+lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.la
+lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.so
+lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.la
+lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.so
+lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.la
+lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-combine.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-detect.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
+%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.la
+%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
+%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.la
+%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.la
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.la
+%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-match.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-oss.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-sine.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.la
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 %%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
 libdata/pkgconfig/libpulse-mainloop-glib.pc
 libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
-@dirrm lib/pulse-0.9/modules
-@dirrm lib/pulse-0.9
+%%GCONF%%libexec/pulse/gconf-helper
+@dirrm lib/pulse-%%PULSE_VERSION%%/modules
+@dirrm lib/pulse-%%PULSE_VERSION%%
 @dirrm include/pulsecore
 @dirrm include/pulse
 @dirrm etc/pulse