CVS commit: pkgsrc/x11/py-sip

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Sep 18 03:33:21 UTC 2018

Modified Files:
        pkgsrc/x11/py-sip: Makefile distinfo
        pkgsrc/x11/py-sip/patches: patch-siputils.py

Log Message:
py-sip: we call the libraries Qt5Things in pkgsrc for everyone,
not just linux.

from Anthony Mallet in PR pkg/53594.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/py-sip/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/py-sip/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-sip/patches/patch-siputils.py

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-sip/Makefile
diff -u pkgsrc/x11/py-sip/Makefile:1.53 pkgsrc/x11/py-sip/Makefile:1.54
--- pkgsrc/x11/py-sip/Makefile:1.53     Sat Apr 14 20:07:11 2018
+++ pkgsrc/x11/py-sip/Makefile  Tue Sep 18 03:33:20 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2018/04/14 20:07:11 adam Exp $
+# $NetBSD: Makefile,v 1.54 2018/09/18 03:33:20 maya Exp $
 
 DISTNAME=      sip-4.19.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    x11 devel python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
 

Index: pkgsrc/x11/py-sip/distinfo
diff -u pkgsrc/x11/py-sip/distinfo:1.42 pkgsrc/x11/py-sip/distinfo:1.43
--- pkgsrc/x11/py-sip/distinfo:1.42     Sat Apr 14 20:07:11 2018
+++ pkgsrc/x11/py-sip/distinfo  Tue Sep 18 03:33:20 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2018/04/14 20:07:11 adam Exp $
+$NetBSD: distinfo,v 1.43 2018/09/18 03:33:20 maya Exp $
 
 SHA1 (sip-4.19.8.tar.gz) = 2055f455cf90fd1e43c6b0af956a50fdf6dc1112
 RMD160 (sip-4.19.8.tar.gz) = 064948f2cd178191a00fd691f292a85b7360f2a5
@@ -6,4 +6,4 @@ SHA512 (sip-4.19.8.tar.gz) = 9c0a9722a9a
 Size (sip-4.19.8.tar.gz) = 1024548 bytes
 SHA1 (patch-configure.py) = 813eeed9d8608a2049e3cc819d31876afdada3aa
 SHA1 (patch-sipgen_sipgen.sbf) = a331efb38a1fadd799e00be34f076c8b8f6e3071
-SHA1 (patch-siputils.py) = fa69e6b957697cdb9afb3c44d9d4b42ab8a604f3
+SHA1 (patch-siputils.py) = 39436983efbf6719b376084a14b8c71b708ed329

Index: pkgsrc/x11/py-sip/patches/patch-siputils.py
diff -u pkgsrc/x11/py-sip/patches/patch-siputils.py:1.3 pkgsrc/x11/py-sip/patches/patch-siputils.py:1.4
--- pkgsrc/x11/py-sip/patches/patch-siputils.py:1.3     Fri Jan 26 15:47:18 2018
+++ pkgsrc/x11/py-sip/patches/patch-siputils.py Tue Sep 18 03:33:21 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-siputils.py,v 1.3 2018/01/26 15:47:18 jperkin Exp $
+$NetBSD: patch-siputils.py,v 1.4 2018/09/18 03:33:21 maya Exp $
 
 Fix build on Darwin with pkgsrc python.
 Fix SunOS/clang.
@@ -15,6 +15,15 @@ Fix SunOS/clang.
          # Make sure the destination directory is an absolute path.
          if dir:
              self.dir = os.path.abspath(dir)
+@@ -880,7 +883,7 @@
+                     qt5_rename = True
+                 else:
+                     lib = lib + "4"
+-        elif sys.platform.startswith("linux") and qt_version >= 0x050000:
++        elif qt_version >= 0x050000:
+             qt5_rename = True
+ 
+         if qt5_rename:
 @@ -1596,10 +1599,10 @@ class ModuleMakefile(Makefile):
                      if sys.platform[:5] == 'linux':
                          self.LFLAGS.extend(['-Wl,--version-script=%s.exp' % self._target])