Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 115AD1A9239 for ; Sun, 7 Nov 2021 11:38:29 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 64FA084E86; Sun, 7 Nov 2021 11:38:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9EB9084D41 for ; Sun, 7 Nov 2021 11:38:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1J7eBkqybz_o for ; Sun, 7 Nov 2021 11:38:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0669084D25 for ; Sun, 7 Nov 2021 11:38:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 002D5FAEC; Sun, 7 Nov 2021 11:38:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636285106229160" MIME-Version: 1.0 Date: Sun, 7 Nov 2021 11:38:26 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/x11/py-sip To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20211107113827.002D5FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636285106229160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Nov 7 11:38:26 UTC 2021 Modified Files: pkgsrc/x11/py-sip: Makefile.common distinfo pkgsrc/x11/py-sip/patches: patch-configure.py Log Message: py-sip: correcly handle Python versions 3.10+ To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/py-sip/Makefile.common cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/py-sip/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/py-sip/patches/patch-configure.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636285106229160 Content-Disposition: inline Content-Length: 3272 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/py-sip/Makefile.common diff -u pkgsrc/x11/py-sip/Makefile.common:1.10 pkgsrc/x11/py-sip/Makefile.common:1.11 --- pkgsrc/x11/py-sip/Makefile.common:1.10 Fri Nov 5 00:51:47 2021 +++ pkgsrc/x11/py-sip/Makefile.common Sun Nov 7 11:38:26 2021 @@ -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 @@ MASTER_SITES= https://www.riverbankcompu # Apparently, there are problems with 5 and 6 with qgis 3.16 as of # 2021-11. MAINTAINER= pkgsrc-users@NetBSD.org -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 Index: pkgsrc/x11/py-sip/distinfo diff -u pkgsrc/x11/py-sip/distinfo:1.52 pkgsrc/x11/py-sip/distinfo:1.53 --- pkgsrc/x11/py-sip/distinfo:1.52 Tue Oct 26 11:34:20 2021 +++ pkgsrc/x11/py-sip/distinfo Sun Nov 7 11:38:26 2021 @@ -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 Index: pkgsrc/x11/py-sip/patches/patch-configure.py diff -u pkgsrc/x11/py-sip/patches/patch-configure.py:1.2 pkgsrc/x11/py-sip/patches/patch-configure.py:1.3 --- pkgsrc/x11/py-sip/patches/patch-configure.py:1.2 Sun Oct 7 09:00:09 2018 +++ pkgsrc/x11/py-sip/patches/patch-configure.py Sun Nov 7 11:38:26 2021 @@ -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 @@ Add PYVERSSUFFIX. 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 @@ Add PYVERSSUFFIX. "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, --_----------=_1636285106229160--