Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1516595768169310"
MIME-Version: 1.0
Date: Mon, 22 Jan 2018 04:36:08 +0000
From: "Darrin B. Jewell" <dbj@netbsd.org>
Subject: CVS commit: pkgsrc/x11/py-qt5
To: pkgsrc-changes@NetBSD.org
Reply-To: dbj@netbsd.org
Message-Id: <20180122043608.61FBFFBDE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1516595768169310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dbj
Date:		Mon Jan 22 04:36:08 UTC 2018

Modified Files:
	pkgsrc/x11/py-qt5: Makefile PLIST
Added Files:
	pkgsrc/x11/py-qt5: PLIST.qtwebkit

Log Message:
if PYPKGPREFIX is not py27, disable QtWebKit and remove it as a dependency


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/py-qt5/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-qt5/PLIST.qtwebkit

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


--_----------=_1516595768169310
Content-Disposition: inline
Content-Length: 2688
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.26 pkgsrc/x11/py-qt5/Makefile:1.27
--- pkgsrc/x11/py-qt5/Makefile:1.26	Sun Jan 21 23:32:45 2018
+++ pkgsrc/x11/py-qt5/Makefile	Mon Jan 22 04:36:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/01/21 23:32:45 markd Exp $
+# $NetBSD: Makefile,v 1.27 2018/01/22 04:36:08 dbj Exp $
 
 DISTNAME=	PyQt5_gpl-${PYQT_VERSION}
 PKGNAME=	${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -65,6 +65,15 @@ SUBST_FILES.x11lib+=    configure.py
 SUBST_FILES.x11lib+=    designer/designer.pro-in
 SUBST_FILES.x11lib+=    qmlscene/qmlscene.pro-in
 
+.include "../../lang/python/pyversion.mk"
+
+.if "${PYPKGPREFIX}" == "py27"
+PLIST_SRC+=		PLIST.qtwebkit
+.else
+CONFIGURE_ARGS+=	--disable QtWebKit
+CONFIGURE_ARGS+=	--disable QtWebKitWidgets
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
@@ -81,7 +90,9 @@ BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPR
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
+.if "${PYPKGPREFIX}" == "py27"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.endif
 .include "../../x11/qt5-qtwebsockets/buildlink3.mk"
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/py-qt5/PLIST
diff -u pkgsrc/x11/py-qt5/PLIST:1.5 pkgsrc/x11/py-qt5/PLIST:1.6
--- pkgsrc/x11/py-qt5/PLIST:1.5	Sun Jan 21 23:32:45 2018
+++ pkgsrc/x11/py-qt5/PLIST	Mon Jan 22 04:36:08 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/21 23:32:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/01/22 04:36:08 dbj Exp $
 bin/pylupdate5
 bin/pyrcc5
 bin/pyuic5
@@ -43,10 +43,6 @@ ${PLIST.py3x}${PYSITELIB}/PyQt5/QtTest.p
 ${PYSITELIB}/PyQt5/QtTest.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebChannel.pyi
 ${PYSITELIB}/PyQt5/QtWebChannel.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi
-${PYSITELIB}/PyQt5/QtWebKit.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi
-${PYSITELIB}/PyQt5/QtWebKitWidgets.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebSockets.pyi
 ${PYSITELIB}/PyQt5/QtWebSockets.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWidgets.pyi

Added files:

Index: pkgsrc/x11/py-qt5/PLIST.qtwebkit
diff -u /dev/null pkgsrc/x11/py-qt5/PLIST.qtwebkit:1.1
--- /dev/null	Mon Jan 22 04:36:08 2018
+++ pkgsrc/x11/py-qt5/PLIST.qtwebkit	Mon Jan 22 04:36:08 2018
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.qtwebkit,v 1.1 2018/01/22 04:36:08 dbj Exp $
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi
+${PYSITELIB}/PyQt5/QtWebKit.so
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi
+${PYSITELIB}/PyQt5/QtWebKitWidgets.so


--_----------=_1516595768169310--