diff options
-rw-r--r-- | wm/libAppleWM/Makefile | 10 | ||||
-rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 13 |
2 files changed, 8 insertions, 15 deletions
diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile index 1294c413f58..6d69a7eaf76 100644 --- a/wm/libAppleWM/Makefile +++ b/wm/libAppleWM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/10/25 20:05:01 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2016/02/22 20:02:36 jperkin Exp $ DISTNAME= libAppleWM-1.4.1 CATEGORIES= x11 devel @@ -20,12 +20,8 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 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 +.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} diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index d7d7d915974..c6ce257a7de 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:40 dholland Exp $ +# $NetBSD: Makefile,v 1.5 2016/02/22 20:02:36 jperkin Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} @@ -80,14 +80,11 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" .include "../../security/nettle/buildlink3.mk" 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 +.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 + MESSAGE_SUBST+= PREFIX=${PREFIX} .include "../../devel/ncurses/buildlink3.mk" |