CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Fri Jul 10 20:02:23 UTC 2020

Modified Files:
        pkgsrc/x11: Makefile
        pkgsrc/x11/py-qt4: Makefile
        pkgsrc/x11/py-sip: Makefile.common
Added Files:
        pkgsrc/x11/py-sip-qt4: DESCR Makefile PLIST

Log Message:
x11/py-sip-qt4: added, similar to py-sip-qt5.

Also add it as a dependency to py-qt4 (again, like py-qt5).
It is needed by some packages using py-qt4; I noticed it for devel/qbzr.


To generate a diff of this commit:
cvs rdiff -u -r1.901 -r1.902 pkgsrc/x11/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/x11/py-qt4/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/py-sip/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-sip-qt4/DESCR \
    pkgsrc/x11/py-sip-qt4/Makefile pkgsrc/x11/py-sip-qt4/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/Makefile
diff -u pkgsrc/x11/Makefile:1.901 pkgsrc/x11/Makefile:1.902
--- pkgsrc/x11/Makefile:1.901   Mon Jun 29 18:36:33 2020
+++ pkgsrc/x11/Makefile Fri Jul 10 20:02:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.901 2020/06/29 18:36:33 pin Exp $
+# $NetBSD: Makefile,v 1.902 2020/07/10 20:02:23 rhialto Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -330,6 +330,7 @@ SUBDIR+=    py-qt5
 SUBDIR+=       py-qt5-qscintilla
 SUBDIR+=       py-qwt-qt4
 SUBDIR+=       py-sip
+SUBDIR+=       py-sip-qt4
 SUBDIR+=       py-sip-qt5
 SUBDIR+=       py-terminator
 SUBDIR+=       py-terminator-plugins

Index: pkgsrc/x11/py-qt4/Makefile
diff -u pkgsrc/x11/py-qt4/Makefile:1.90 pkgsrc/x11/py-qt4/Makefile:1.91
--- pkgsrc/x11/py-qt4/Makefile:1.90     Sun Mar  8 16:51:47 2020
+++ pkgsrc/x11/py-qt4/Makefile  Fri Jul 10 20:02:23 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2020/03/08 16:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2020/07/10 20:02:23 rhialto Exp $
 
 DISTNAME=      PyQt4_gpl_${PYQT_SYS}-4.12.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt4_gpl_${PYQT_SYS}/qt4/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11 python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
@@ -11,6 +11,8 @@ COMMENT=      Python binding for Qt4
 HOMEPAGE=      https://riverbankcomputing.com/software/pyqt/intro
 LICENSE=       gnu-gpl-v3
 
+DEPENDS+=      ${PYPKGPREFIX}-sip-qt4>=4.19.23:../../x11/py-sip-qt4
+
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES=         c c++

Index: pkgsrc/x11/py-sip/Makefile.common
diff -u pkgsrc/x11/py-sip/Makefile.common:1.6 pkgsrc/x11/py-sip/Makefile.common:1.7
--- pkgsrc/x11/py-sip/Makefile.common:1.6       Thu Jun 11 14:49:15 2020
+++ pkgsrc/x11/py-sip/Makefile.common   Fri Jul 10 20:02:23 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2020/06/11 14:49:15 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2020/07/10 20:02:23 rhialto Exp $
 #
 # used by x11/py-sip/Makefile
+# used by x11/py-sip-qt4/Makefile
 # used by x11/py-sip-qt5/Makefile
 
 DISTNAME=      sip-4.19.23

Added files:

Index: pkgsrc/x11/py-sip-qt4/DESCR
diff -u /dev/null pkgsrc/x11/py-sip-qt4/DESCR:1.1
--- /dev/null   Fri Jul 10 20:02:23 2020
+++ pkgsrc/x11/py-sip-qt4/DESCR Fri Jul 10 20:02:23 2020
@@ -0,0 +1 @@
+SIP bindings for C and C++ libraries (PyQt4 version)
Index: pkgsrc/x11/py-sip-qt4/Makefile
diff -u /dev/null pkgsrc/x11/py-sip-qt4/Makefile:1.1
--- /dev/null   Fri Jul 10 20:02:23 2020
+++ pkgsrc/x11/py-sip-qt4/Makefile      Fri Jul 10 20:02:23 2020
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2020/07/10 20:02:23 rhialto Exp $
+
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/sip/sip-qt4/}
+COMMENT=       SIP bindings for C and C++ libraries (PyQt4 version)
+
+.include "../../x11/py-sip/Makefile.common"
+
+do-configure:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+               ${PYTHONBIN} configure.py ${CONFIGURE_ARGS} --sip-module PyQt4.sip --no-tools
+
+.include "../../lang/python/extension.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/py-sip-qt4/PLIST
diff -u /dev/null pkgsrc/x11/py-sip-qt4/PLIST:1.1
--- /dev/null   Fri Jul 10 20:02:23 2020
+++ pkgsrc/x11/py-sip-qt4/PLIST Fri Jul 10 20:02:23 2020
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2020/07/10 20:02:23 rhialto Exp $
+${PYSITELIB}/PyQt4/sip.pyi
+${PYSITELIB}/PyQt4/sip.so
+${PYSITELIB}/PyQt4_sip-${PKGVERSION}.dist-info/INSTALLER
+${PYSITELIB}/PyQt4_sip-${PKGVERSION}.dist-info/METADATA
+${PYSITELIB}/PyQt4_sip-${PKGVERSION}.dist-info/RECORD