From 6534ba06a66bee6adf28e8589ec09ea931595c1a Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 1 Oct 2015 11:03:07 +0000 Subject: fix build with xcode 7 --- wm/libAppleWM/Makefile | 4 +++- wm/libAppleWM/distinfo | 3 ++- wm/libAppleWM/patches/patch-src_Makefile.in | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 wm/libAppleWM/patches/patch-src_Makefile.in (limited to 'wm') diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index 67594287905..1609cdfd2d5 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/11/16 20:14:59 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2015/10/01 11:03:07 tnn Exp $ DISTNAME= libAppleWM-1.4.1 CATEGORIES= x11 devel @@ -20,6 +20,8 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= applewm.pc.in +MAKE_ENV+= OSX_SDK_PATH=${OSX_SDK_PATH} + .include "../../wm/applewmproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/wm/libAppleWM/distinfo b/wm/libAppleWM/distinfo index 4383e705ccb..59541bfc74a 100644 --- a/wm/libAppleWM/distinfo +++ b/wm/libAppleWM/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2014/11/16 20:14:59 wiz Exp $ +$NetBSD: distinfo,v 1.3 2015/10/01 11:03:07 tnn Exp $ SHA1 (libAppleWM-1.4.1.tar.bz2) = 0db56a17df93683aef16c8e7779cd9527aa0ffc8 RMD160 (libAppleWM-1.4.1.tar.bz2) = 187f6efc2b1db31c034f1d2d9364b79692a0cf53 Size (libAppleWM-1.4.1.tar.bz2) = 249868 bytes +SHA1 (patch-src_Makefile.in) = abd2895ea9221e1f946a2f79989cce5932a3c0e8 diff --git a/wm/libAppleWM/patches/patch-src_Makefile.in b/wm/libAppleWM/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..661def1c420 --- /dev/null +++ b/wm/libAppleWM/patches/patch-src_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2015/10/01 11:03:07 tnn Exp $ + +--- src/Makefile.in.orig 2011-04-06 23:02:31.000000000 +0000 ++++ src/Makefile.in +@@ -258,7 +258,7 @@ AM_CFLAGS = \ + $(APPLEWM_CFLAGS) \ + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) \ +- -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \ ++ -F$(OSX_SDK_PATH)/System/Library/Frameworks/ApplicationServices.framework/Frameworks \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ + -I$(top_srcdir)/include/X11/extensions -- cgit v1.2.3