summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-10-07 13:22:10 +0000
committerjoerg <joerg@pkgsrc.org>2016-10-07 13:22:10 +0000
commit1b8b447b5ae8bfbe89c67e33b0a4d3d87f430383 (patch)
tree9a190707afbd39ad79a713fa1af9a8d08511ae55
parent15f8d8ccfaa4df3ca3f8f01409d25c634322a45a (diff)
downloadpkgsrc-1b8b447b5ae8bfbe89c67e33b0a4d3d87f430383.tar.gz
Use sanitized _USE_CWRAPPERS.
-rw-r--r--sysutils/cdrtools/hacks.mk4
-rw-r--r--x11/qt5-qtwebkit/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/cdrtools/hacks.mk b/sysutils/cdrtools/hacks.mk
index d8dedf1e232..4c0668ceb1f 100644
--- a/sysutils/cdrtools/hacks.mk
+++ b/sysutils/cdrtools/hacks.mk
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.4 2016/07/21 19:38:31 tron Exp $
+# $NetBSD: hacks.mk,v 1.5 2016/10/07 13:22:10 joerg Exp $
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin" && defined(ABI) && ${ABI} == "64" && \
- ${USE_CWRAPPERS:tl} != "no"
+ ${_USE_CWRAPPERS} == "yes"
#
# PR pkg/51257: "sysutils/cdrtools" fails to build under Mac OS X 64bit
# when cwrappers are used
diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile
index 0f7de6e9779..cd0a0baf6dc 100644
--- a/x11/qt5-qtwebkit/Makefile
+++ b/x11/qt5-qtwebkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/08/04 17:03:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2016/10/07 13:22:10 joerg Exp $
DISTNAME= qtwebkit-opensource-src-${QTVERSION}
PKGNAME= qt5-qtwebkit-${QTVERSION}
@@ -16,7 +16,7 @@ INSTALLATION_DIRS+= lib/pkgconfig
.include "../../x11/qt5-qtbase/Makefile.common"
-.if ${USE_CWRAPPERS:Uno} == "yes"
+.if ${_USE_CWRAPPERS} == "yes"
BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib
.else
BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib