CVS commit: pkgsrc

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Oct  7 13:22:10 UTC 2016

Modified Files:
        pkgsrc/sysutils/cdrtools: hacks.mk
        pkgsrc/x11/qt5-qtwebkit: Makefile

Log Message:
Use sanitized _USE_CWRAPPERS.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/cdrtools/hacks.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/qt5-qtwebkit/Makefile

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

Modified files:

Index: pkgsrc/sysutils/cdrtools/hacks.mk
diff -u pkgsrc/sysutils/cdrtools/hacks.mk:1.4 pkgsrc/sysutils/cdrtools/hacks.mk:1.5
--- pkgsrc/sysutils/cdrtools/hacks.mk:1.4       Thu Jul 21 19:38:31 2016
+++ pkgsrc/sysutils/cdrtools/hacks.mk   Fri Oct  7 13:22:10 2016
@@ -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

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.35 pkgsrc/x11/qt5-qtwebkit/Makefile:1.36
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.35       Thu Aug  4 17:03:32 2016
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Fri Oct  7 13:22:10 2016
@@ -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