[pkgsrc/trunk]: pkgsrc modular-xorg-xquartz, libAppleWM: Use predefined OSX_S...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c95edf5912e5
branches:  trunk
changeset: 447732:c95edf5912e5
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu Feb 25 12:30:58 2021 +0000

description:
modular-xorg-xquartz, libAppleWM: Use predefined OSX_SDK_PATH

The latest macOS Big Sur 11.2.1 and Xcode 12.4 as of 2021-02-24 do not
provide 11.2 SDK. They provide 11.1 SDK instead. mk/platform/Darwin.mk has
workaround for this situation. So use the workaround directly.

OSX_SDK_PATH may be internal, however it is accessible over 5 years.
It may not be a big problem hopefully.

diffstat:

 wm/libAppleWM/Makefile            |  7 ++-----
 x11/modular-xorg-xquartz/Makefile |  7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r 9d7014f93089 -r c95edf5912e5 wm/libAppleWM/Makefile
--- a/wm/libAppleWM/Makefile    Thu Feb 25 12:20:09 2021 +0000
+++ b/wm/libAppleWM/Makefile    Thu Feb 25 12:30:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/18 23:35:40 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2021/02/25 12:30:58 ryoon Exp $
 
 DISTNAME=      libAppleWM-1.4.1
 PKGREVISION=   1
@@ -21,10 +21,7 @@
 CONFIGURE_ENV+=                LIB_MAN_SUFFIX=3
 PKGCONFIG_OVERRIDE+=   applewm.pc.in
 
-.if exists(/usr/bin/xcrun)
-MY_XCODE_SDK_PATH!=    /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path
-.endif
-MAKE_ENV+=             OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
+MAKE_ENV+=             OSX_SDK_PATH=${XCODE_SDK_PATH}
 
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r 9d7014f93089 -r c95edf5912e5 x11/modular-xorg-xquartz/Makefile
--- a/x11/modular-xorg-xquartz/Makefile Thu Feb 25 12:20:09 2021 +0000
+++ b/x11/modular-xorg-xquartz/Makefile Thu Feb 25 12:30:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/22 10:56:48 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/02/25 12:30:58 ryoon Exp $
 
 DISTNAME=      xorg-server-1.17.2
 PKGNAME=       ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
@@ -81,10 +81,7 @@
 .include "../../security/nettle/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-sha1=libnettle
 
-.if exists(/usr/bin/xcrun)
-MY_XCODE_SDK_PATH!=    /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path
-MAKE_ENV+=             OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
-.endif
+MAKE_ENV+=             OSX_SDK_PATH=${XCODE_SDK_PATH}
 
 MESSAGE_SUBST+=                PREFIX=${PREFIX}