Update to 0.9.10

5 files changed, 36 insertions, 24 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 807fe790e379..782d42009d5c 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.9.10
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -23,7 +22,8 @@ CONFLICTS=	polypaudio-[1-9]*
 USE_GNOME=	gnometarget gnomehack glib20 ltverhack
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index aa4f5aff7cbf..3e593a3491da 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.9.tar.gz) = 8fa6f7a9611bb194d94311764022b197
-SHA256 (pulseaudio-0.9.9.tar.gz) = 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
-SIZE (pulseaudio-0.9.9.tar.gz) = 1063448
+MD5 (pulseaudio-0.9.10.tar.gz) = 9187ac1b302b9ab45f355242f453882e
+SHA256 (pulseaudio-0.9.10.tar.gz) = 1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
+SIZE (pulseaudio-0.9.10.tar.gz) = 1081546
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
index 32d08b68d904..ffac463e64cc 100644
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Jul  8 18:17:17 2007
-+++ configure	Sun Jul  8 18:41:18 2007
-@@ -25255,6 +25255,7 @@ echo $ECHO_N "checking whether to check 
+--- configure.orig	2008-03-31 07:31:37.381987526 -0400
++++ configure	2008-03-31 07:31:37.771922603 -0400
+@@ -23902,6 +23902,7 @@
     check_inconsistencies=yes
     case "${host_cpu}-${host_os}" in
       *-darwin*) check_inconsistencies=no ;;
@@ -8,29 +8,29 @@
     esac
     if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
        { echo "$as_me:$LINENO: result: no" >&5
-@@ -28924,9 +28925,9 @@ _ACEOF
+@@ -30280,9 +30281,9 @@
  
  else
  
--{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
+-   { { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
 -echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
 -   { (exit 1); exit 1; }; }
-+#{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
++#   { { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
 +#echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
 +#   { (exit 1); exit 1; }; }
  
  fi
  
-@@ -28934,9 +28935,9 @@ done
+@@ -30290,9 +30291,9 @@
  
  
- # Win32 does not need the lib and breaks horribly if we try to include it
--if test "x$os_is_win32" != "x1" ; then
--    LIBS="$LIBS -latomic_ops"
--fi
-+#if test "x$os_is_win32" != "x1" ; then
-+#    LIBS="$LIBS -latomic_ops"
-+#fi
- 
- #### OSS support (optional) ####
- 
+    # Win32 does not need the lib and breaks horribly if we try to include it
+-   if test "x$os_is_win32" != "x1" ; then
+-       LIBS="$LIBS -latomic_ops"
+-   fi
++#   if test "x$os_is_win32" != "x1" ; then
++#       LIBS="$LIBS -latomic_ops"
++#   fi
+ else
+    { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_daemon_caps.h b/audio/pulseaudio/files/patch-src_daemon_caps.h
new file mode 100644
index 000000000000..517da35b6e23
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_caps.h
@@ -0,0 +1,12 @@
+--- src/daemon/caps.h.orig	2008-03-31 07:34:39.290608458 -0400
++++ src/daemon/caps.h	2008-03-31 07:36:12.728192195 -0400
+@@ -25,7 +25,8 @@
+ ***/
+ 
+ void pa_drop_root(void);
+-void pa_drop_caps(void);
++/* Defined in caps.c */
++/* void pa_drop_caps(void); */
+ int pa_limit_caps(void);
+ 
+ #endif
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 2178b8d2d092..00d4a0b31c26 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -136,7 +136,7 @@ libdata/pkgconfig/libpulse-mainloop-glib.pc
 libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
 %%GCONF%%libexec/pulse/gconf-helper
-%%HAL%%share/PolicyKit/policy/PulseAudio.policy
+%%HAL%%share/PolicyKit/policy/org.pulseaudio.policy
 %%GCONF%%@dirrm libexec/pulse
 @dirrm lib/pulse-%%PULSE_VERSION%%/modules
 @dirrm lib/pulse-%%PULSE_VERSION%%