try even harder to remove paths on darwin

3 files changed, 38 insertions, 20 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index a805c3fbb8e..4cdf8636248 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2014/08/07 07:43:48 spz Exp $
+# $NetBSD: Makefile,v 1.93 2015/01/27 04:04:50 dbj Exp $
 
 DISTNAME=	pulseaudio-5.0
 PKGREVISION=	2
@@ -59,11 +59,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 PLIST.evdev=		yes
 .endif
 
-# Find the appropriate SDK
-.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
-CONFIGURE_ARGS+=	--with-mac-sysroot=/Developer/SDKs/MacOSX10.6.sdk
-.endif
-
 .include "options.mk"
 
 PKGCONFIG_OVERRIDE+=	libpulse-mainloop-glib.pc.in
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 9289d54558f..e272dc90120 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.47 2015/01/26 14:08:21 jperkin Exp $
+$NetBSD: distinfo,v 1.48 2015/01/27 04:04:50 dbj Exp $
 
 SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85
 RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991
 Size (pulseaudio-5.0.tar.xz) = 1455428 bytes
 SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
-SHA1 (patch-configure.ac) = 6de1f6eea165f4019b6894f3484532bb813e6994
+SHA1 (patch-configure.ac) = e5c90f38f3d06af64579176495a4023281ac0699
 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
 SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac
index d87106e8f85..cd1b2bb1e27 100644
--- a/audio/pulseaudio/patches/patch-configure.ac
+++ b/audio/pulseaudio/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $
+$NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $
 
 * Don't assume sys/capability.h is guaranteed present on Linux.
 * Fix NetBSD detection for libatomics_ops check.
@@ -58,7 +58,25 @@ $NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $
      AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
  
  
-@@ -988,7 +988,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -512,15 +512,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
+ if test "x$os_is_darwin" = "x1" ; then
+     AC_MSG_CHECKING([looking for Apple CoreService Framework])
+     # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
+-    AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h],
++    AC_CHECK_HEADER([CoreServices/CoreServices.h],
+         [LIBS="$LIBS -framework CoreServices"],
+-        [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h],
+-            [LIBS="$LIBS -framework CoreServices"],
+-            [AC_MSG_ERROR([CoreServices.h header file not found])]
+-        )]
+-    )
+-
+-    AC_MSG_RESULT([ok])
++        [AC_MSG_ERROR([CoreServices.h header file not found])])
+     AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
+     HAVE_BONJOUR=1
+ fi
+@@ -988,7 +982,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
  
  PA_MACHINE_ID="${sysconfdir}/machine-id"
  AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@@ -67,7 +85,7 @@ $NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $
  AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
  	      [Fallback machine-id file])
  
-@@ -1234,9 +1234,9 @@ fi
+@@ -1234,9 +1228,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -79,7 +97,7 @@ $NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $
  AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
  
  PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1248,8 +1248,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1248,8 +1242,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -91,16 +109,21 @@ $NetBSD: patch-configure.ac,v 1.3 2015/01/26 14:08:21 jperkin Exp $
  
  #### Mac OSX specific stuff #####
  
-@@ -1266,8 +1267,10 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1265,17 +1260,6 @@ AC_ARG_WITH(mac-sysroot,
+     AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]),
      mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk")
  
- if test "x$os_is_darwin" = "x1" ; then
+-if test "x$os_is_darwin" = "x1" ; then
 -    LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
 -    CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
-+    if test -d "$mac_sysroot" ; then
-+        LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
-+        CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
-+    fi
+-
+-    if test "x$enable_mac_universal" = "xyes" ; then
+-        mac_arches="-arch i386 -arch x86_64"
+-        LDFLAGS="$LDFLAGS $mac_arches"
+-        CFLAGS="$CFLAGS $mac_arches"
+-    fi
+-fi
+-
+ AC_ARG_ENABLE([webrtc-aec],
+     AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
  
-     if test "x$enable_mac_universal" = "xyes" ; then
-         mac_arches="-arch i386 -arch x86_64"