Make this package build and work under Mac OS X (Leopard).

This fixes PR pkg/40424 by Torsten Harenberg.

5 files changed, 54 insertions, 6 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index d77dc33ddb5..6ff50bb5ea1 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/01/29 12:56:03 jmcneill Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/05 21:05:07 tron Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss@mail.0pointer.de>
@@ -56,6 +56,17 @@ SUBST_SED.padsp=	-e 's@libpulsedsp\.so@${PREFIX}/lib/&@'
 CONFIGURE_ENV+=		cc_cv_tls___thread=no
 .endif
 
+PLIST_VARS+=		hal oss
+
+.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM+=	rm:-Wl,-version-script=./map-file
+BUILDLINK_TRANSFORM+=	rm:-Wl,-no-undefined
+BUILDLINK_TRANSFORM+=	rm:-Wl,-z rm:-Wl,nodelete
+.else
+PLIST.hal=		yes
+PLIST.oss=		yes
+.endif
+
 PKG_GROUPS=             ${PULSE_GROUP}
 PKG_GROUPS+=		${PULSE_GROUP_REALTIME}
 PKG_GROUPS+=		${PULSE_GROUP_ACCESS}
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index e74e5541d54..dc8f7b4fa66 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2008/12/20 18:23:56 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/02/05 21:05:07 tron Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
 bin/pactl
-bin/padsp
+${PLIST.oss}bin/padsp
 bin/paplay
 bin/parec
 bin/pasuspender
@@ -86,7 +86,7 @@ lib/pulse-0.9/modules/module-esound-protocol-tcp.so
 lib/pulse-0.9/modules/module-esound-protocol-unix.so
 lib/pulse-0.9/modules/module-esound-sink.so
 lib/pulse-0.9/modules/module-gconf.so
-lib/pulse-0.9/modules/module-hal-detect.so
+${PLIST.hal}lib/pulse-0.9/modules/module-hal-detect.so
 lib/pulse-0.9/modules/module-http-protocol-tcp.so
 lib/pulse-0.9/modules/module-http-protocol-unix.so
 lib/pulse-0.9/modules/module-ladspa-sink.so
@@ -95,7 +95,7 @@ lib/pulse-0.9/modules/module-native-protocol-fd.so
 lib/pulse-0.9/modules/module-native-protocol-tcp.so
 lib/pulse-0.9/modules/module-native-protocol-unix.so
 lib/pulse-0.9/modules/module-null-sink.so
-lib/pulse-0.9/modules/module-oss.so
+${PLIST.oss}lib/pulse-0.9/modules/module-oss.so
 lib/pulse-0.9/modules/module-pipe-sink.so
 lib/pulse-0.9/modules/module-pipe-source.so
 lib/pulse-0.9/modules/module-position-event-sounds.so
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 4a019249a5b..93a63eabf85 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/01/21 15:40:20 drochner Exp $
+$NetBSD: distinfo,v 1.14 2009/02/05 21:05:07 tron Exp $
 
 SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4
 RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1
@@ -14,6 +14,8 @@ SHA1 (patch-ah) = 13cee1dc10be17f51978208843048ba9db7d9a3f
 SHA1 (patch-ai) = b8e9e2dee9d1c5d9de488cfa0d06440eedacb7c6
 SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec
 SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd
+SHA1 (patch-al) = 26999d41484421c0995282045783e3c9df36d4d4
+SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34
 SHA1 (patch-ba) = da9742d49ecb409cd13bee4468e64f982c03cffe
 SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a
 SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c
diff --git a/audio/pulseaudio/patches/patch-al b/audio/pulseaudio/patches/patch-al
new file mode 100644
index 00000000000..325e35121c5
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2009/02/05 21:05:07 tron Exp $
+
+--- src/pulsecore/core-util.c.orig	2009-02-05 14:21:35.000000000 +0000
++++ src/pulsecore/core-util.c	2009-02-05 14:42:02.000000000 +0000
+@@ -105,6 +105,10 @@
+ #define MSG_NOSIGNAL 0
+ #endif
+ 
++#ifdef __APPLE__
++#include <xlocale.h>
++#endif
++
+ #ifdef OS_IS_WIN32
+ 
+ #define PULSE_ROOTENV "PULSE_ROOT"
diff --git a/audio/pulseaudio/patches/patch-am b/audio/pulseaudio/patches/patch-am
new file mode 100644
index 00000000000..33dfc911312
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-am
@@ -0,0 +1,20 @@
+$NetBSD: patch-am,v 1.1 2009/02/05 21:05:07 tron Exp $
+
+--- src/pulsecore/proplist-util.c.orig	2009-01-12 23:10:34.000000000 +0000
++++ src/pulsecore/proplist-util.c	2009-02-05 19:59:17.000000000 +0000
+@@ -35,9 +35,14 @@
+ 
+ #include "proplist-util.h"
+ 
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ void pa_init_proplist(pa_proplist *p) {
+     int a, b;
+-#if !HAVE_DECL_ENVIRON
++#if !HAVE_DECL_ENVIRON && !defined(__APPLE__)
+     extern char **environ;
+ #endif
+     char **e;