pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/py-qt5



Module Name:    pkgsrc
Committed By:   dbj
Date:           Tue Jan 23 16:42:02 UTC 2018

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

Log Message:
it was pointed out that python27 is a build only dependency for qt5-qtwebkit
revert previous


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.1 -r0 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.

Modified files:

Index: pkgsrc/x11/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.27 pkgsrc/x11/py-qt5/Makefile:1.28
--- pkgsrc/x11/py-qt5/Makefile:1.27     Mon Jan 22 04:36:08 2018
+++ pkgsrc/x11/py-qt5/Makefile  Tue Jan 23 16:42:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/01/22 04:36:08 dbj Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/23 16:42:02 dbj Exp $
 
 DISTNAME=      PyQt5_gpl-${PYQT_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -65,15 +65,6 @@ 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}
@@ -90,9 +81,7 @@ 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"



Home | Main Index | Thread Index | Old Index