Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1636284771195130"
MIME-Version: 1.0
Date: Sun, 7 Nov 2021 11:32:51 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/www/py-curl
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20211107113251.E7240FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1636284771195130
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:32:51 UTC 2021

Modified Files:
	pkgsrc/www/py-curl: distinfo
	pkgsrc/www/py-curl/patches: patch-setup.py

Log Message:
py-curl: better patch for setup.py to allow Python versions 3.10+


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/py-curl/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-curl/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1636284771195130
Content-Disposition: inline
Content-Length: 2364
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/py-curl/distinfo
diff -u pkgsrc/www/py-curl/distinfo:1.31 pkgsrc/www/py-curl/distinfo:1.32
--- pkgsrc/www/py-curl/distinfo:1.31	Tue Oct 26 11:30:29 2021
+++ pkgsrc/www/py-curl/distinfo	Sun Nov  7 11:32:51 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 11:30:29 nia Exp $
+$NetBSD: distinfo,v 1.32 2021/11/07 11:32:51 adam Exp $
 
 BLAKE2s (pycurl-7.44.1.tar.gz) = c1ca30128c441b596082c3d67edfdf2cf58288b2236a8ebca4edb000e0f87de3
 SHA512 (pycurl-7.44.1.tar.gz) = e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
 Size (pycurl-7.44.1.tar.gz) = 227562 bytes
-SHA1 (patch-setup.py) = 30f5205ed6f5447b5ee37e8721d287362d8c724e
+SHA1 (patch-setup.py) = 2ce9242b9b1cf1c5932075e4e0b83a1e0b454274

Index: pkgsrc/www/py-curl/patches/patch-setup.py
diff -u pkgsrc/www/py-curl/patches/patch-setup.py:1.3 pkgsrc/www/py-curl/patches/patch-setup.py:1.4
--- pkgsrc/www/py-curl/patches/patch-setup.py:1.3	Wed Aug 25 09:01:07 2021
+++ pkgsrc/www/py-curl/patches/patch-setup.py	Sun Nov  7 11:32:51 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.3 2021/08/25 09:01:07 adam Exp $
+$NetBSD: patch-setup.py,v 1.4 2021/11/07 11:32:51 adam Exp $
 
 Stick to distutils.
 Add multi Python variant support.
@@ -17,15 +17,17 @@ Add multi Python variant support.
  from distutils.extension import Extension
  from distutils.util import split_quoted
  from distutils.version import LooseVersion
-@@ -687,9 +684,9 @@ def get_data_files():
+@@ -686,10 +683,11 @@ def get_extension(argv, split_extension_
+ def get_data_files():
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
++    version = '{}.{}'.format(sys.version_info.major, sys.version_info.minor)
      if sys.platform == "win32":
 -        datadir = os.path.join("doc", PACKAGE)
-+        datadir = os.path.join("doc", PACKAGE + sys.version[0:3])
++        datadir = os.path.join("doc", PACKAGE + version)
      else:
 -        datadir = os.path.join("share", "doc", PACKAGE)
-+        datadir = os.path.join("share", "doc", PACKAGE  + sys.version[0:3])
++        datadir = os.path.join("share", "doc", PACKAGE  + version)
      #
      files = ["AUTHORS", "ChangeLog", "COPYING-LGPL", "COPYING-MIT",
          "INSTALL.rst", "README.rst", "RELEASE-NOTES.rst"]


--_----------=_1636284771195130--