[pkgsrc/trunk]: pkgsrc/x11/py-sip py-sip: correcly handle Python versions 3.10+

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43be9771b8d4
branches:  trunk
changeset: 769055:43be9771b8d4
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Nov 07 11:38:26 2021 +0000

description:
py-sip: correcly handle Python versions 3.10+

diffstat:

 x11/py-sip/Makefile.common            |  4 ++--
 x11/py-sip/distinfo                   |  4 ++--
 x11/py-sip/patches/patch-configure.py |  6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 34fafb08edcc -r 43be9771b8d4 x11/py-sip/Makefile.common
--- a/x11/py-sip/Makefile.common        Sun Nov 07 11:32:51 2021 +0000
+++ b/x11/py-sip/Makefile.common        Sun Nov 07 11:38:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2021/11/05 00:51:47 gdt Exp $
+# $NetBSD: Makefile.common,v 1.11 2021/11/07 11:38:26 adam Exp $
 #
 # used by x11/py-sip/Makefile
 # used by x11/py-sip-qt4/Makefile
@@ -12,7 +12,7 @@
 # Apparently, there are problems with 5 and 6 with qgis 3.16 as of
 # 2021-11.
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.riverbankcomputing.com/software/sip/
+HOMEPAGE=      https://riverbankcomputing.com/software/sip/
 
 DISTINFO_FILE= ${.CURDIR}/../../x11/py-sip/distinfo
 PATCHDIR=      ${.CURDIR}/../../x11/py-sip/patches
diff -r 34fafb08edcc -r 43be9771b8d4 x11/py-sip/distinfo
--- a/x11/py-sip/distinfo       Sun Nov 07 11:32:51 2021 +0000
+++ b/x11/py-sip/distinfo       Sun Nov 07 11:38:26 2021 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2021/10/26 11:34:20 nia Exp $
+$NetBSD: distinfo,v 1.53 2021/11/07 11:38:26 adam Exp $
 
 BLAKE2s (sip-4.19.25.tar.gz) = fb9290de418db91c8597c0210dea5738eba23950ba469766ee427cb813c6d05b
 SHA512 (sip-4.19.25.tar.gz) = 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 Size (sip-4.19.25.tar.gz) = 1056384 bytes
-SHA1 (patch-configure.py) = 822a5fd4b23dde511fb9268a32458d7cd46d91ea
+SHA1 (patch-configure.py) = b200e5dc1b33e21d866136efa3809fc7a2ce4d82
 SHA1 (patch-sipgen_sipgen.sbf) = f90554d3d0e4cdcf33e69f492281a028ed6975fb
 SHA1 (patch-siputils.py) = 39436983efbf6719b376084a14b8c71b708ed329
diff -r 34fafb08edcc -r 43be9771b8d4 x11/py-sip/patches/patch-configure.py
--- a/x11/py-sip/patches/patch-configure.py     Sun Nov 07 11:32:51 2021 +0000
+++ b/x11/py-sip/patches/patch-configure.py     Sun Nov 07 11:38:26 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.py,v 1.2 2018/10/07 09:00:09 adam Exp $
+$NetBSD: patch-configure.py,v 1.3 2021/11/07 11:38:26 adam Exp $
 
 Add PYVERSSUFFIX.
 
@@ -9,7 +9,7 @@
          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{}".format(sys.version[0:3])
++        plat_sip_dir = sys.prefix + "/share/sip{}.{}".format(sys.version_info.major, sys.version_info.minor)
  
  
  def create_config(module, template, macros):
@@ -18,7 +18,7 @@
          "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{}".format(sys.version[0:3])),
++        "sip_bin":          os.path.join(sip_bin_dir, "sip{}.{}".format(sys.version_info.major, sys.version_info.minor)),
          "sip_inc_dir":      sip_inc_dir,
          "sip_root_dir":     sip_root_dir,
          "sip_module_dir":   sip_module_dir,