diff options
| -rw-r--r-- | wm/libAppleWM/Makefile | 5 | ||||
| -rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index db1f6eccb23..1294c413f58 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/10/12 17:51:02 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2015/10/25 20:05:01 tnn Exp $ DISTNAME= libAppleWM-1.4.1 CATEGORIES= x11 devel @@ -22,6 +22,9 @@ PKGCONFIG_OVERRIDE+= applewm.pc.in .if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers) MY_OSX_VERS!= /usr/bin/sw_vers -productVersion +. if ${MY_OSX_VERS:R:R} != ${MY_OSX_VERS:R} +MY_OSX_VERS:= ${MY_OSX_VERS:R} +. endif MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${MY_OSX_VERS} --show-sdk-path .endif MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index 02cea828a42..294c1b50351 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/10/12 17:51:02 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2015/10/25 20:05:01 tnn Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} @@ -82,6 +82,9 @@ CONFIGURE_ARGS+= --with-sha1=libnettle .if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers) MY_OSX_VERS!= /usr/bin/sw_vers -productVersion +. if ${MY_OSX_VERS:R:R} != ${MY_OSX_VERS:R} +MY_OSX_VERS:= ${MY_OSX_VERS:R} +. endif MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk macosx${MY_OSX_VERS} --show-sdk-path .endif MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH} |