CVS commit: pkgsrc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Feb 25 12:30:58 UTC 2021

Modified Files:
        pkgsrc/wm/libAppleWM: Makefile
        pkgsrc/x11/modular-xorg-xquartz: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/libAppleWM/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/modular-xorg-xquartz/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/libAppleWM/Makefile
diff -u pkgsrc/wm/libAppleWM/Makefile:1.8 pkgsrc/wm/libAppleWM/Makefile:1.9
--- pkgsrc/wm/libAppleWM/Makefile:1.8   Sat Jan 18 23:35:40 2020
+++ pkgsrc/wm/libAppleWM/Makefile       Thu Feb 25 12:30:58 2021
@@ -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 @@ USE_TOOLS+=          pkg-config
 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"

Index: pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.13 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.14
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.13       Fri May 22 10:56:48 2020
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile    Thu Feb 25 12:30:58 2021
@@ -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 @@ CONFIGURE_ENV+=              ac_cv_path_RAWCPP="${PR
 .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}