diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-22 20:02:36 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-22 20:02:36 +0000 |
| commit | b1a6465a86cd0271ede15c5704df6347d0090b45 (patch) | |
| tree | 5ac69b2f5aac39207fff3a63034132bf4daf9432 /x11 | |
| parent | 6efd2b0efae280e38f560444c1fb06fd86a5d867 (diff) | |
| download | pkgsrc-b1a6465a86cd0271ede15c5704df6347d0090b45.tar.gz | |
Use the system OSX_VERSION variable rather than rolling our own.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
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" |