py-sip: updated to 4.19.13

SIP v4.19.13 has been released. This is a minor bug-fix release.
SIP v4.19.12 has been released. This is both a bug-fix release and a minor functional release.
SIP v4.19.11 has been released. This is a minor functional release.
SIP v4.19.8 has been released. This is a minor bug-fix release.

5 files changed, 29 insertions, 53 deletions

diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile
index d85120ab4e0..9a962bab606 100644
--- a/x11/py-sip/Makefile
+++ b/x11/py-sip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2018/09/18 03:33:20 maya Exp $
+# $NetBSD: Makefile,v 1.55 2018/10/07 09:00:09 adam Exp $
 
-DISTNAME=	sip-4.19.8
+DISTNAME=	sip-4.19.13
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11 devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
@@ -57,9 +56,8 @@ SUBST_FILES.pyversfx=	sipgen/sipgen.sbf
 SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
 
 do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-sip/PLIST b/x11/py-sip/PLIST
index 796ec71697e..6c92d7c4a93 100644
--- a/x11/py-sip/PLIST
+++ b/x11/py-sip/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/17 19:16:05 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/10/07 09:00:09 adam Exp $
 bin/sip${PYVERSSUFFIX}
 ${PYINC}/sip.h
+${PYSITELIB}/sip-${PKGVERSION}.dist-info/INSTALLER
+${PYSITELIB}/sip-${PKGVERSION}.dist-info/METADATA
+${PYSITELIB}/sip-${PKGVERSION}.dist-info/RECORD
 ${PYSITELIB}/sip.pyi
 ${PYSITELIB}/sip.so
 ${PYSITELIB}/sipconfig.py
-${PYSITELIB}/sipconfig.pyc
 ${PYSITELIB}/sipdistutils.py
diff --git a/x11/py-sip/distinfo b/x11/py-sip/distinfo
index e3ad5128c32..f381fb2b30b 100644
--- a/x11/py-sip/distinfo
+++ b/x11/py-sip/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2018/09/18 03:33:20 maya Exp $
+$NetBSD: distinfo,v 1.44 2018/10/07 09:00:09 adam Exp $
 
-SHA1 (sip-4.19.8.tar.gz) = 2055f455cf90fd1e43c6b0af956a50fdf6dc1112
-RMD160 (sip-4.19.8.tar.gz) = 064948f2cd178191a00fd691f292a85b7360f2a5
-SHA512 (sip-4.19.8.tar.gz) = 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-Size (sip-4.19.8.tar.gz) = 1024548 bytes
-SHA1 (patch-configure.py) = 813eeed9d8608a2049e3cc819d31876afdada3aa
-SHA1 (patch-sipgen_sipgen.sbf) = a331efb38a1fadd799e00be34f076c8b8f6e3071
+SHA1 (sip-4.19.13.tar.gz) = acb826ca1a49742d17686cef246cceabcc87e3b9
+RMD160 (sip-4.19.13.tar.gz) = ac47c0e695f9f74aff1ca466718890305094a30c
+SHA512 (sip-4.19.13.tar.gz) = eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
+Size (sip-4.19.13.tar.gz) = 1038815 bytes
+SHA1 (patch-configure.py) = 822a5fd4b23dde511fb9268a32458d7cd46d91ea
+SHA1 (patch-sipgen_sipgen.sbf) = f90554d3d0e4cdcf33e69f492281a028ed6975fb
 SHA1 (patch-siputils.py) = 39436983efbf6719b376084a14b8c71b708ed329
diff --git a/x11/py-sip/patches/patch-configure.py b/x11/py-sip/patches/patch-configure.py
index 964aae370e7..c323a01a9e0 100644
--- a/x11/py-sip/patches/patch-configure.py
+++ b/x11/py-sip/patches/patch-configure.py
@@ -1,50 +1,24 @@
-$NetBSD: patch-configure.py,v 1.1 2018/02/01 21:03:09 adam Exp $
+$NetBSD: patch-configure.py,v 1.2 2018/10/07 09:00:09 adam Exp $
 
---- configure.py.orig	2014-07-03 10:08:46.000000000 +0000
+Add PYVERSSUFFIX.
+
+--- configure.py.orig	2018-10-01 13:22:40.000000000 +0000
 +++ configure.py
-@@ -19,6 +19,7 @@ import sys
- import os
- import glob
- import optparse
-+import imp
- from distutils import sysconfig
- 
- try:
-@@ -220,7 +221,7 @@ def set_platform_directories():
+@@ -250,7 +250,7 @@ def set_platform_directories():
  
          plat_py_lib_dir = lib_dir + "/config"
          plat_bin_dir = sys.exec_prefix + "/bin"
 -        plat_sip_dir = sys.prefix + "/share/sip"
-+        plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3]
++        plat_sip_dir = sys.prefix + "/share/sip{}".format(sys.version[0:3])
  
  
- def patch_files():
-@@ -273,7 +274,7 @@ def create_config(module, template, macr
+ def create_config(module, template, macros):
+@@ -268,7 +268,7 @@ def create_config(module, template, macr
          "sip_version":      sip_version,
          "sip_version_str":  sip_version_str,
          "platform":         build_platform,
 -        "sip_bin":          os.path.join(sip_bin_dir, "sip"),
-+        "sip_bin":          os.path.join(sip_bin_dir, "sip%s" % sys.version[0:3]),
++        "sip_bin":          os.path.join(sip_bin_dir, "sip{}".format(sys.version[0:3])),
          "sip_inc_dir":      sip_inc_dir,
-         "sip_mod_dir":      sip_module_dir,
-         "default_bin_dir":  plat_bin_dir,
-@@ -310,9 +311,17 @@ def create_makefiles(macros):
-         subdirs = ["siplib"]
-         installs = None
-     else:
-+        pyc_file = "sipconfig.pyc"
-+        pyc_dir = cfg.sip_mod_dir
-+        try:
-+            pyc_file = imp.cache_from_source("sipconfig.py")
-+            pyc_dir = os.path.join(cfg.sip_mod_dir, "__pycache__")
-+        except AttributeError:
-+            pass
-+
-         subdirs = ["sipgen", "siplib"]
--        installs = (["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
--                cfg.sip_mod_dir)
-+        installs = [(["sipconfig.py", os.path.join(src_dir, "sipdistutils.py")],
-+                cfg.sip_mod_dir), ([pyc_file], pyc_dir)]
- 
-     if opts.use_qmake:
-         sipconfig.inform("Creating top level .pro file...")
+         "sip_root_dir":     sip_root_dir,
+         "sip_module_dir":   sip_module_dir,
diff --git a/x11/py-sip/patches/patch-sipgen_sipgen.sbf b/x11/py-sip/patches/patch-sipgen_sipgen.sbf
index 1c175d03a7e..60a2eac9e6e 100644
--- a/x11/py-sip/patches/patch-sipgen_sipgen.sbf
+++ b/x11/py-sip/patches/patch-sipgen_sipgen.sbf
@@ -1,4 +1,6 @@
-$NetBSD: patch-sipgen_sipgen.sbf,v 1.1 2018/02/01 21:03:09 adam Exp $
+$NetBSD: patch-sipgen_sipgen.sbf,v 1.2 2018/10/07 09:00:09 adam Exp $
+
+Use PYVERSSUFFIX.
 
 --- sipgen/sipgen.sbf.orig	2017-02-15 12:37:11.000000000 +0000
 +++ sipgen/sipgen.sbf