5 files changed, 29 insertions, 21 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 181f34583b53..9a84700f5cf4 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -29,7 +29,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LIBS="-lm"
+		LIBS="-lm -lintl"
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-lirc # untested
@@ -90,7 +90,7 @@ post-patch:
 .endif
 
 post-install:
-.for ii in default.pa daemon.conf client.conf
+.for ii in default.pa daemon.conf client.conf system.pa
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${PREFIX}/etc/pulse/${ii}-dist
 .endfor
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 3f17dc81c7ef..5fd1c3df236d 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.11.tar.gz) = fa121f8e5dd4b98d65096de1b6c84021
-SHA256 (pulseaudio-0.9.11.tar.gz) = 6cc4aff778275f087cfbd65d2040b1587cafc588749499a452eb496329505ab0
-SIZE (pulseaudio-0.9.11.tar.gz) = 1166430
+MD5 (pulseaudio-0.9.12.tar.gz) = b8851d52152c5c3b65f4f31ee1ab7631
+SHA256 (pulseaudio-0.9.12.tar.gz) = 1f3740b96c062a9718cb5f5e2c37cf3b6e4d895fdf66a64b7bc686b249d6eafc
+SIZE (pulseaudio-0.9.12.tar.gz) = 1270635
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index 7abc21071d35..77ba7306a63c 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -1,15 +1,15 @@
---- src/daemon/default.pa.in.orig	2007-10-28 13:18:27.000000000 -0400
-+++ src/daemon/default.pa.in	2008-01-01 15:59:59.000000000 -0500
-@@ -19,10 +19,10 @@
+--- src/daemon/default.pa.in.orig	2008-08-19 17:25:03.000000000 -0400
++++ src/daemon/default.pa.in	2008-09-28 19:48:14.000000000 -0400
+@@ -22,10 +22,10 @@
  .nofail
  
  ### Load something into the sample cache
 -#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
--load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
+-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
 -#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
 -#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
 +#load-sample-lazy x11-bell %%LOCALBASE%%/sounds/gtk-events/activate.wav
-+load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav
++#load-sample-lazy pulse-hotplug %%LOCALBASE%%/sounds/startup3.wav
 +#load-sample-lazy pulse-coldplug %%LOCALBASE%%/sounds/startup3.wav
 +#load-sample-lazy pulse-access %%LOCALBASE%%/sounds/generic.wav
  
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
index 56ae5acc2ea9..34142c948114 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
@@ -1,5 +1,5 @@
---- src/pulsecore/core-util.c.orig	2008-06-21 13:25:57.000000000 -0400
-+++ src/pulsecore/core-util.c	2008-07-26 17:01:01.000000000 -0400
+--- src/pulsecore/core-util.c.orig	2008-09-08 19:33:30.000000000 -0400
++++ src/pulsecore/core-util.c	2008-09-28 19:50:24.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <time.h>
  #include <ctype.h>
@@ -8,15 +8,15 @@
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <dirent.h>
-@@ -548,6 +549,7 @@ int pa_make_realtime(int rtprio) {
- #else
+@@ -567,6 +568,7 @@ int pa_make_realtime(int rtprio) {
+     errno = ENOTSUP;
      return -1;
  #endif
 +    ;
  }
  
  /* This is merely used for giving the user a hint. This is not correct
-@@ -1036,22 +1038,22 @@ int pa_check_in_group(gid_t g) {
+@@ -1131,22 +1133,22 @@ int pa_check_in_group(gid_t g) {
    (advisory on UNIX, mandatory on Windows) */
  int pa_lock_fd(int fd, int b) {
  #ifdef F_SETLKW
@@ -25,11 +25,11 @@
  
      /* Try a R/W lock first */
  
--    flock.l_type = b ? F_WRLCK : F_UNLCK;
+-    flock.l_type = (short) (b ? F_WRLCK : F_UNLCK);
 -    flock.l_whence = SEEK_SET;
 -    flock.l_start = 0;
 -    flock.l_len = 0;
-+    pa_flock.l_type = b ? F_WRLCK : F_UNLCK;
++    pa_flock.l_type = (short) (b ? F_WRLCK : F_UNLCK);
 +    pa_flock.l_whence = SEEK_SET;
 +    pa_flock.l_start = 0;
 +    pa_flock.l_len = 0;
@@ -47,7 +47,7 @@
              return 0;
      }
  
-@@ -1990,7 +1992,11 @@ int pa_reset_sigs(int except, ...) {
+@@ -2334,7 +2336,11 @@ int pa_reset_sigs(int except, ...) {
  int pa_reset_sigsv(const int except[]) {
      int sig;
  
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 0aa8c7464eeb..473a6e47cb1c 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -16,6 +16,8 @@ etc/pulse/client.conf-dist
 etc/pulse/daemon.conf-dist
 @unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
 etc/pulse/default.pa-dist
+@unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
+etc/pulse/system.pa-dist
 etc/xdg/autostart/pulseaudio.desktop
 %%AVAHI%%include/pulse/browser.h
 include/pulse/cdecl.h
@@ -23,6 +25,7 @@ include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
 include/pulse/error.h
+include/pulse/ext-stream-restore.h
 include/pulse/gccmacro.h
 include/pulse/glib-mainloop.h
 include/pulse/introspect.h
@@ -63,9 +66,9 @@ lib/libpulse.so.0
 lib/libpulsecore.a
 lib/libpulsecore.la
 lib/libpulsecore.so
-lib/libpulsecore.so.6
+lib/libpulsecore.so.7
 lib/libpulsedsp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.so
+lib/pulse-%%PULSE_VERSION%%/modules/libauth-cookie.so
 lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
@@ -129,6 +132,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
@@ -144,6 +148,10 @@ libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
 %%GCONF%%libexec/pulse/gconf-helper
 %%HAL%%share/PolicyKit/policy/org.pulseaudio.policy
+share/locale/de/LC_MESSAGES/pulseaudio.mo
+share/locale/el/LC_MESSAGES/pulseaudio.mo
+share/locale/fr/LC_MESSAGES/pulseaudio.mo
+share/locale/sv/LC_MESSAGES/pulseaudio.mo
 %%GCONF%%@dirrm libexec/pulse
 @dirrm lib/pulse-%%PULSE_VERSION%%/modules
 @dirrm lib/pulse-%%PULSE_VERSION%%