CVS commit: pkgsrc/x11

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jan 26 12:53:34 UTC 2020

Modified Files:
        pkgsrc/x11/py-qt5: Makefile PLIST
        pkgsrc/x11/py-qt5-qscintilla: Makefile PLIST
Added Files:
        pkgsrc/x11/py-qt5: ALTERNATIVES

Log Message:
Python-version some more files to avoid conflicts.

This package installs once per python version. A few files were not
versioned and caused conflicts.  These files now have the python version
number in their path.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-qt5/ALTERNATIVES
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/py-qt5/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-qt5-qscintilla/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/py-qt5-qscintilla/PLIST

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.50 pkgsrc/x11/py-qt5/Makefile:1.51
--- pkgsrc/x11/py-qt5/Makefile:1.50     Sat Jan 18 21:51:14 2020
+++ pkgsrc/x11/py-qt5/Makefile  Sun Jan 26 12:53:34 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2020/01/18 21:51:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2020/01/26 12:53:34 rhialto Exp $
 
 DISTNAME=      PyQt5-5.13.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 python
 MASTER_SITES=  https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PKGVERSION_NOREV}/
 
@@ -22,9 +22,12 @@ USE_TOOLS+=          gmake pkg-config
 CONFIGURE_ARGS+=       -b ${PREFIX}/bin
 CONFIGURE_ARGS+=       -d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=       --sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
+CONFIGURE_ARGS+=       --qml-plugindir ${PREFIX}/qt5/plugins/PyQt5-${PYVERSSUFFIX}/
+CONFIGURE_ARGS+=       --designer-plugindir ${PREFIX}/qt5/plugins/designer${PYVERSSUFFIX}/
 CONFIGURE_ARGS+=       -q ${QTDIR}/bin/qmake
 CONFIGURE_ARGS+=       --confirm-license
 CONFIGURE_ARGS+=       --qsci-api
+CONFIGURE_ARGS+=       --qsci-api-destdir ${PREFIX}/qt5/qsci${PYVERSSUFFIX}
 CONFIGURE_ARGS+=       --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 CONFIGURE_ARGS+=       --verbose
 
@@ -61,6 +64,13 @@ fix-darwin-install-name:
 .else
 PLIST.x11=     yes
 .endif
+post-install: fix-alternatives
+
+fix-alternatives:
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} pylupdate5 pylupdate5-${PYVERSSUFFIX} && \
+       ${MV} pyrcc5 pyrcc5-${PYVERSSUFFIX} && \
+       ${MV} pyuic5 pyuic5-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/dbus-python-common/buildlink3.mk"

Index: pkgsrc/x11/py-qt5/PLIST
diff -u pkgsrc/x11/py-qt5/PLIST:1.13 pkgsrc/x11/py-qt5/PLIST:1.14
--- pkgsrc/x11/py-qt5/PLIST:1.13        Tue Oct 29 19:17:09 2019
+++ pkgsrc/x11/py-qt5/PLIST     Sun Jan 26 12:53:34 2020
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.13 2019/10/29 19:17:09 bouyer Exp $
-bin/pylupdate5
-bin/pyrcc5
-bin/pyuic5
+@comment $NetBSD: PLIST,v 1.14 2020/01/26 12:53:34 rhialto Exp $
+bin/pylupdate5-${PYVERSSUFFIX}
+bin/pyrcc5-${PYVERSSUFFIX}
+bin/pyuic5-${PYVERSSUFFIX}
 ${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/INSTALLER
 ${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/METADATA
 ${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/RECORD
@@ -106,9 +106,9 @@ ${PYSITELIB}/PyQt5/uic/widget-plugins/qt
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebenginewidgets.py
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebkit.py
 ${PYSITELIB}/dbus/mainloop/pyqt5.so
-qt5/plugins/PyQt5/libpyqt5qmlplugin.so
-qt5/plugins/designer/libpyqt5.so
-qt5/qsci/api/python/PyQt5.api
+qt5/plugins/PyQt5-${PYVERSSUFFIX}/libpyqt5qmlplugin.so
+qt5/plugins/designer${PYVERSSUFFIX}/libpyqt5.so
+qt5/qsci${PYVERSSUFFIX}/api/python/PyQt5.api
 share/sip${PYVERSSUFFIX}/PyQt5/Enginio/Enginiomod.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Enginio/enginio.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Enginio/enginioclient.sip

Index: pkgsrc/x11/py-qt5-qscintilla/Makefile
diff -u pkgsrc/x11/py-qt5-qscintilla/Makefile:1.3 pkgsrc/x11/py-qt5-qscintilla/Makefile:1.4
--- pkgsrc/x11/py-qt5-qscintilla/Makefile:1.3   Sat Jan 18 21:48:34 2020
+++ pkgsrc/x11/py-qt5-qscintilla/Makefile       Sun Jan 26 12:53:34 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 21:48:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/26 12:53:34 rhialto Exp $
 
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 
 PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:tl:S/_gpl-/-/}
 COMMENT=       QScintilla -- Python bindings
-PKGREVISION=   2
+PKGREVISION=   3
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
 
@@ -22,7 +22,8 @@ do-configure:
            --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
            --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
            --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-           --qsci-libdir=${QTDIR}/lib
+           --qsci-libdir=${QTDIR}/lib \
+           --apidir=${QTDIR}/qsci${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-sip/buildlink3.mk"

Index: pkgsrc/x11/py-qt5-qscintilla/PLIST
diff -u pkgsrc/x11/py-qt5-qscintilla/PLIST:1.2 pkgsrc/x11/py-qt5-qscintilla/PLIST:1.3
--- pkgsrc/x11/py-qt5-qscintilla/PLIST:1.2      Tue Oct 29 19:17:09 2019
+++ pkgsrc/x11/py-qt5-qscintilla/PLIST  Sun Jan 26 12:53:34 2020
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2019/10/29 19:17:09 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/26 12:53:34 rhialto Exp $
 ${PYSITELIB}/PyQt5/Qsci.pyi
 ${PYSITELIB}/PyQt5/Qsci.so
 ${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/INSTALLER
 ${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/METADATA
 ${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/RECORD
-qt5/qsci/api/python/QScintilla2.api
+qt5/qsci${PYVERSSUFFIX}/api/python/QScintilla2.api
 share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciabstractapis.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciapis.sip
 share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommand.sip

Added files:

Index: pkgsrc/x11/py-qt5/ALTERNATIVES
diff -u /dev/null pkgsrc/x11/py-qt5/ALTERNATIVES:1.1
--- /dev/null   Sun Jan 26 12:53:34 2020
+++ pkgsrc/x11/py-qt5/ALTERNATIVES      Sun Jan 26 12:53:34 2020
@@ -0,0 +1,3 @@
+bin/pylupdate5 @PREFIX@/bin/pylupdate5-${PYVERSSUFFIX}
+bin/pyrcc5 @PREFIX@/bin/pyrcc5-${PYVERSSUFFIX}
+bin/pyuic5 @PREFIX@/bin/pyuic5-${PYVERSSUFFIX}