Re-work how we handle MacTypes.h. Older Darwin releases do not ship a copy in

/usr/include, whilst newer Xcode do not ship a copy in the SDK, and we somehow
need to handle both.  This package explicitly passes -mmacosx-version-min=10.4
meaning we cannot test the __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro
as we would normally.  So for now we perform a direct substitution based on
whether /usr/include/MacTypes.h exists.  Cleaner solutions welcome.

3 files changed, 16 insertions, 22 deletions

diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index aec2c035c67..b447955c63f 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/08/16 21:01:38 gls Exp $
+# $NetBSD: Makefile,v 1.29 2015/01/26 11:08:52 jperkin Exp $
 #
 
 DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
@@ -64,6 +64,20 @@ CONFIGURE_ARGS+=	--with-default-tmpdir=/dev/shm
 CONFIGURE_ARGS+=	--with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
 .endif
 
+#
+# Older Darwin releases do not ship /usr/include/MacTypes.h, newer ones do
+# not ship a copy in the SDK, we somehow need to handle both.  This package
+# explicitly passes -mmacosx-version-min=10.4 meaning we cannot test the
+# __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.  So for now we perform
+# a direct substitution - cleaner fixes welcome.
+#
+.if ${OPSYS} == "Darwin" && exists(/usr/include/MacTypes.h)
+SUBST_CLASSES+=		mactypes
+SUBST_FILES.mactypes=	config/os/macosx/pThreadUtilities.h
+SUBST_STAGE.mactypes=	pre-configure
+SUBST_SED.mactypes=	-e 's,CoreServices.*Headers/,,'
+.endif
+
 PLIST_VARS=		coreaudio oss sunaudio
 ###
 ### XXX	This is untested.  Please file a PR and/or commit a fix should
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index a162cc9d81e..937227293a8 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/01/14 12:10:13 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2015/01/26 11:08:52 jperkin Exp $
 
 SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
 RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
@@ -15,7 +15,6 @@ SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
 SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
 SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
 SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
-SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 53187940f17d92f691cb5fed81ed4c6ddd9b01ae
 SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02
 SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a
 SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1
diff --git a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h b/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h
deleted file mode 100644
index e32ebb1ea37..00000000000
--- a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.2 2015/01/14 12:10:13 jperkin Exp $
-
-Fix build on Mac OS X.  "1070" isn't necessarily the correct version to test
-against, but at least this fixes 1068.
-
---- config/os/macosx/pThreadUtilities.h.orig	2008-05-29 12:26:05.000000000 +0000
-+++ config/os/macosx/pThreadUtilities.h
-@@ -66,7 +66,11 @@
- #define __PTHREADUTILITIES_H__
- 
- #import "pthread.h"
-+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
- #import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
-+#else
-+#import <MacTypes.h>
-+#endif
- 
- #define THREAD_SET_PRIORITY			0
- #define THREAD_SCHEDULED_PRIORITY		1