Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2015/03/03 17:19:58 snj Exp $
+# $NetBSD: Makefile,v 1.49 2015/05/24 07:44:07 adam Exp $

 .include "dist.mk"

 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	1
 CATEGORIES=	lang python

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2014/12/16 08:45:12 chopps Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2015/05/24 07:44:07 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1437,8 +1437,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__init__.pyo
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/__main__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -1738,6 +1738,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyo
@@ -1783,9 +1786,6 @@ lib/python${PY_VER_SUFFIX}/idlelib/run.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.py
 lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/tabbedpages.pyo
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.py
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.pyc
-lib/python${PY_VER_SUFFIX}/idlelib/testcode.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/textView.py
 lib/python${PY_VER_SUFFIX}/idlelib/textView.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/textView.pyo
@@ -2898,7 +2898,7 @@ lib/python${PY_VER_SUFFIX}/test/decimaltestdata/testall.decTest
 lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegral.decTest
 lib/python${PY_VER_SUFFIX}/test/decimaltestdata/tointegralx.decTest
 lib/python${PY_VER_SUFFIX}/test/decimaltestdata/xor.decTest
-lib/python${PY_VER_SUFFIX}/test/dh512.pem
+lib/python${PY_VER_SUFFIX}/test/dh1024.pem
 lib/python${PY_VER_SUFFIX}/test/doctest_aliases.py
 lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyc
 lib/python${PY_VER_SUFFIX}/test/doctest_aliases.pyo
@@ -4082,6 +4082,9 @@ lib/python${PY_VER_SUFFIX}/test/test_threadsignals.pyo
 lib/python${PY_VER_SUFFIX}/test/test_time.py
 lib/python${PY_VER_SUFFIX}/test/test_time.pyc
 lib/python${PY_VER_SUFFIX}/test/test_time.pyo
+lib/python${PY_VER_SUFFIX}/test/test_timeit.py
+lib/python${PY_VER_SUFFIX}/test/test_timeit.pyc
+lib/python${PY_VER_SUFFIX}/test/test_timeit.pyo
 lib/python${PY_VER_SUFFIX}/test/test_timeout.py
 lib/python${PY_VER_SUFFIX}/test/test_timeout.pyc
 lib/python${PY_VER_SUFFIX}/test/test_timeout.pyo
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.9 2014/12/16 07:07:32 chopps Exp $
+# $NetBSD: dist.mk,v 1.10 2015/05/24 07:44:07 adam Exp $

-PY_DISTVERSION=	2.7.9
+PY_DISTVERSION=	2.7.10
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python27/distinfo
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,32 +1,30 @@
-$NetBSD: distinfo,v 1.49 2015/03/03 17:19:58 snj Exp $
+$NetBSD: distinfo,v 1.51 2015/05/24 07:44:07 adam Exp $

-SHA1 (Python-2.7.9.tar.xz) = 3172f6e957713c2d9fca462cc16068222fd1b9d3
-RMD160 (Python-2.7.9.tar.xz) = 2b047c3b56987b473c3ca957ad87f5582c37d6f6
-Size (Python-2.7.9.tar.xz) = 12164712 bytes
-SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
-SHA1 (patch-Include_pyport.h) = 971c7c548b92595712d0d70a0917a0ccc83b6c7e
-SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
-SHA1 (patch-Lib_dumbdb.py) = b4b154f511c8852e2f869653eccd7d9a1c21e734
-SHA1 (patch-Lib_multiprocessing_process.py) = b47ad4cbeddbcfb4342c08c84d0d515a793815d4
-SHA1 (patch-Lib_test_test__dumbdbm.py) = f59f0d8bbf910bac369528129b564597a77379ba
-SHA1 (patch-Modules_getaddrinfo.c) = 696c58c4c4bbb710fb1508d7d88864d0b08cfc79
-SHA1 (patch-Modules_getpath.c) = aa8a54717a85f831e3ceaad19d96c43bc38aef10
-SHA1 (patch-Modules_mmapmodule.c) = 87ea76e6d8263045c1ca794ff5c75ed631a74b6d
-SHA1 (patch-Modules_posixmodule.c) = b8960592611499202bb5ff8521d619e0637177b6
-SHA1 (patch-Modules_socketmodule.c) = 960ce4af2a142c471c707de446f2d390044bbc13
-SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
-SHA1 (patch-ab) = 6a38874aaaccc878541554546835ccbf6136bbd5
-SHA1 (patch-ad) = 061aefac15fe3834271770f0fd225e12f84d961a
-SHA1 (patch-ae) = 7fadf9e2f5fe7ad42e14f9cf9ef92e92a3a40787
-SHA1 (patch-ah) = 0648597f53bef7832af589378104a4d43290714a
-SHA1 (patch-al) = 4bd68f7995f5b76c3d62f370f31568930055c76f
-SHA1 (patch-am) = 5e287cddd574e86e1ef07e6e862e72aacaa70b93
-SHA1 (patch-an) = f1179125d2042e44b864488864144cae057171cb
-SHA1 (patch-ao) = ad4377682b01a4965c84ac46e398ec5e841ee0f5
-SHA1 (patch-au) = 98c925a32b2067055d9082a24b8a8b8b1069eb90
-SHA1 (patch-av) = 3cd52c97afe7b3331559e75b1d69c886014c1d8e
-SHA1 (patch-aw) = ff445b01cd4979d26baf27aabb291a803c4a2ec2
-SHA1 (patch-ax) = 63948a78cbd4dd5438cd0fc1ce8a23e6ec13626c
-SHA1 (patch-az) = e373cb7e80650b3cc9f491864ab2c2ddfd4c8395
-SHA1 (patch-pyconfig.h.in) = 11aae6980d82ec577088dc4e13f5e3b5180360e6
-SHA1 (patch-xa) = e996624c1d4aa978f853dab31a096b8587fed7a2
+SHA1 (Python-2.7.10.tar.xz) = ee5a50c5562e7448f037d35fdedc18d95c748b9e
+RMD160 (Python-2.7.10.tar.xz) = eb003de9bb52fc2c6a2d2e3dcb816ba0c56751d0
+Size (Python-2.7.10.tar.xz) = 12250696 bytes
+SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
+SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
+SHA1 (patch-Lib_distutils_unixccompiler.py) = def4142633b8f6b75e905b5c57be1d5c19b42d33
+SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
+SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
+SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b
+SHA1 (patch-Modules_mmapmodule.c) = 3f401b59883af3232b6c77a76a08e5feffa77044
+SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
+SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
+SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a
+SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
+SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
+SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
+SHA1 (patch-ah) = 90b19239d8a7c8abc3bbc05d49408a2c5da6174d
+SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
+SHA1 (patch-am) = a7697dda83b151fdd30d460bdcf5ab3cc057c92b
+SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
+SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
+SHA1 (patch-au) = dcfac01d19dd3fc1eaa3b59a440f5c393c373f9e
+SHA1 (patch-av) = e6aef090b444b455fe351308d251e670329b7dc3
+SHA1 (patch-aw) = d07129531ec1427669092c504c12247206408c2d
+SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e
+SHA1 (patch-az) = 01e113b0bd251978b555caaaa60b79c372edebce
+SHA1 (patch-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1
+SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10
--- a/lang/python27/patches/patch-Include_pyerrors.h
+++ b/lang/python27/patches/patch-Include_pyerrors.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Include_pyerrors.h,v 1.1 2013/04/17 13:21:05 obache Exp $
+$NetBSD: patch-Include_pyerrors.h,v 1.2 2015/04/24 03:01:36 rodent Exp $

 * from cygport 2.6.5-export-PySignal_SetWakeupFd.patch

--- Include/pyerrors.h.orig	2013-04-06 14:02:25.000000000 +0000
+--- Include/pyerrors.h.orig	2014-12-10 15:59:32.000000000 +0000
 +++ Include/pyerrors.h
@@ -231,7 +231,7 @@ PyAPI_FUNC(int) PyErr_CheckSignals(void)
 PyAPI_FUNC(void) PyErr_SetInterrupt(void);
--- a/lang/python27/patches/patch-Include_pyport.h
+++ b/lang/python27/patches/patch-Include_pyport.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-Include_pyport.h,v 1.2 2014/07/02 09:53:16 adam Exp $
+$NetBSD: patch-Include_pyport.h,v 1.3 2015/04/24 03:01:36 rodent Exp $

 SunOS defines gethostname in <unistd.h>
 http://bugs.python.org/issue19561

--- Include/pyport.h.orig	2014-05-31 18:58:38.000000000 +0000
+--- Include/pyport.h.orig	2014-12-10 15:59:32.000000000 +0000
 +++ Include/pyport.h
@@ -640,11 +640,6 @@ Please be conservative with adding new o
 in platform-specific #ifdefs.
--- a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
+++ b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2013/09/10 14:22:30 joerg Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2015/04/24 03:01:36 rodent Exp $

 * from cygport 2.7.3-dylib.patch

--- Lib/distutils/unixccompiler.py.orig	2013-05-12 03:32:42.000000000 +0000
+--- Lib/distutils/unixccompiler.py.orig	2014-12-10 15:59:34.000000000 +0000
 +++ Lib/distutils/unixccompiler.py
@@ -82,6 +82,7 @@ class UnixCCompiler(CCompiler):
     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
--- a/lang/python27/patches/patch-Lib_dumbdb.py
+++ b/lang/python27/patches/patch-Lib_dumbdb.py
@@ -1,23 +0,0 @@
-$NetBSD: patch-Lib_dumbdb.py,v 1.1 2015/03/03 17:19:58 snj Exp $
-
-http://bugs.python.org/issue22885
-
--- Lib/dumbdbm.py.orig	2015-03-03 09:05:52.000000000 -0800
-+++ Lib/dumbdbm.py	2015-03-03 09:10:02.000000000 -0800
-@@ -21,6 +21,7 @@ is read when the database is opened, and
- 
- """
- 
-+import ast as _ast
- import os as _os
- import __builtin__
- import UserDict
-@@ -85,7 +86,7 @@ class _Database(UserDict.DictMixin):
-             with f:
-                 for line in f:
-                     line = line.rstrip()
-                    key, pos_and_siz_pair = eval(line)
-+                    key, pos_and_siz_pair = _ast.literal_eval(line)
-                     self._index[key] = pos_and_siz_pair
- 
-     # Write the index dict to the directory file.  The original directory
--- a/lang/python27/patches/patch-Lib_multiprocessing_process.py
+++ b/lang/python27/patches/patch-Lib_multiprocessing_process.py
@@ -1,6 +1,6 @@
-$NetBSD: patch-Lib_multiprocessing_process.py,v 1.1 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Lib_multiprocessing_process.py,v 1.2 2015/04/24 03:01:36 rodent Exp $

--- Lib/multiprocessing/process.py.orig	2014-06-30 02:05:29.000000000 +0000
+--- Lib/multiprocessing/process.py.orig	2014-12-10 15:59:39.000000000 +0000
 +++ Lib/multiprocessing/process.py
@@ -306,7 +306,15 @@ class _MainProcess(Process):
         self._popen = None
--- a/lang/python27/patches/patch-Lib_test_test__dumbdbm.py
+++ b/lang/python27/patches/patch-Lib_test_test__dumbdbm.py
@@ -1,21 +0,0 @@
-$NetBSD: patch-Lib_test_test__dumbdbm.py,v 1.1 2015/03/03 17:19:58 snj Exp $
-
-http://bugs.python.org/issue22885
-
--- Lib/test/test_dumbdbm.py.orig	2015-03-03 09:05:53.000000000 -0800
-+++ Lib/test/test_dumbdbm.py	2015-03-03 09:10:02.000000000 -0800
-@@ -160,6 +160,14 @@ class DumbDBMTestCase(unittest.TestCase)
-             self.assertEqual(expected, got)
-             f.close()
- 
-+    def test_eval(self):
-+        with open(_fname + '.dir', 'w') as stream:
-+            stream.write("str(__import__('sys').stdout.write('Hacked!')), 0\n")
-+        with test_support.captured_stdout() as stdout:
-+            with self.assertRaises(ValueError):
-+                dumbdbm.open(_fname).close()
-+            self.assertEqual(stdout.getvalue(), '')
-+
-     def tearDown(self):
-         _delete_files()
- 
--- a/lang/python27/patches/patch-Modules_getaddrinfo.c
+++ b/lang/python27/patches/patch-Modules_getaddrinfo.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-Modules_getaddrinfo.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Modules_getaddrinfo.c,v 1.2 2015/04/24 03:01:36 rodent Exp $

--- Modules/getaddrinfo.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/getaddrinfo.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/getaddrinfo.c
@@ -66,6 +66,15 @@
 #define YES 1
--- a/lang/python27/patches/patch-Modules_getpath.c
+++ b/lang/python27/patches/patch-Modules_getpath.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_getpath.c,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-Modules_getpath.c,v 1.3 2015/04/24 03:01:36 rodent Exp $

 * from cygport 2.7.3-getpath-exe-extension.patch

--- Modules/getpath.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/getpath.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/getpath.c
@@ -451,6 +451,28 @@ calculate_path(void)
                         if (isxfile(progpath))
--- a/lang/python27/patches/patch-Modules_mmapmodule.c
+++ b/lang/python27/patches/patch-Modules_mmapmodule.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-Modules_mmapmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Modules_mmapmodule.c,v 1.2 2015/04/24 03:01:36 rodent Exp $

--- Modules/mmapmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/mmapmodule.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/mmapmodule.c
@@ -23,7 +23,7 @@
 
--- a/lang/python27/patches/patch-Modules_posixmodule.c
+++ b/lang/python27/patches/patch-Modules_posixmodule.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-Modules_posixmodule.c,v 1.1 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Modules_posixmodule.c,v 1.2 2015/04/24 03:01:36 rodent Exp $

--- Modules/posixmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/posixmodule.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/posixmodule.c
@@ -317,6 +317,10 @@ extern int lstat(const char *, struct st
 #define PARSE_PID "i"
--- a/lang/python27/patches/patch-Modules_socketmodule.c
+++ b/lang/python27/patches/patch-Modules_socketmodule.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.4 2014/07/17 15:26:49 ryoon Exp $
+$NetBSD: patch-Modules_socketmodule.c,v 1.5 2015/04/24 03:01:36 rodent Exp $

--- Modules/socketmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/socketmodule.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/socketmodule.c
-@@ -244,7 +244,7 @@ shutdown(how) -- shut down traffic in on
+@@ -248,7 +248,7 @@ shutdown(how) -- shut down traffic in on
 /* Irix 6.5 fails to define this variable at all. This is needed
    for both GCC and SGI's compiler. I'd say that the SGI headers
    are just busted. Same thing for Solaris. */
--- a/lang/python27/patches/patch-aa
+++ b/lang/python27/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-aa,v 1.2 2015/04/24 03:01:36 rodent Exp $

--- Include/py_curses.h.orig	2010-03-25 00:54:54.000000000 +0000
+--- Include/py_curses.h.orig	2014-12-10 15:59:32.000000000 +0000
 +++ Include/py_curses.h
@@ -44,6 +44,21 @@
 #endif
--- a/lang/python27/patches/patch-ab
+++ b/lang/python27/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ab,v 1.4 2015/04/24 03:01:36 rodent Exp $

--- Lib/distutils/command/build_ext.py.orig	2014-06-30 02:05:25.000000000 +0000
+--- Lib/distutils/command/build_ext.py.orig	2014-12-10 15:59:34.000000000 +0000
 +++ Lib/distutils/command/build_ext.py
@@ -511,8 +511,19 @@ class build_ext (Command):
         # that go into the mix.
--- a/lang/python27/patches/patch-ad
+++ b/lang/python27/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ad,v 1.3 2015/04/24 03:01:36 rodent Exp $

 Add ability to parse unsigned integers as externalized by NetBSD proplib(3).

--- Lib/plistlib.py.orig	2014-06-30 02:05:30.000000000 +0000
+--- Lib/plistlib.py.orig	2014-12-10 15:59:39.000000000 +0000
 +++ Lib/plistlib.py
@@ -463,7 +463,7 @@ class PlistParser:
     def end_false(self):
--- a/lang/python27/patches/patch-ae
+++ b/lang/python27/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ae,v 1.3 2015/04/24 03:01:36 rodent Exp $

 XXXbjs:  I use amd64, and audioop is broken on 64-bit platforms.
 Thus, this needs to be tested.

--- Modules/sunaudiodev.c.orig	2014-06-30 02:05:44.000000000 +0000
+--- Modules/sunaudiodev.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/sunaudiodev.c
@@ -224,7 +224,11 @@ sad_ibufcount(sadobject *self)
 {
--- a/lang/python27/patches/patch-ah
+++ b/lang/python27/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ah,v 1.4 2015/04/24 03:01:36 rodent Exp $

--- Modules/_cursesmodule.c.orig	2014-06-30 02:05:41.000000000 +0000
+--- Modules/_cursesmodule.c.orig	2014-12-10 15:59:53.000000000 +0000
 +++ Modules/_cursesmodule.c
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary
 
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
+$NetBSD: patch-al,v 1.17 2015/05/24 07:44:07 adam Exp $

 - recognize MirBSD, Interix
 - remove special-case library version hack for FreeBSD
@@ -6,9 +6,9 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 - honor pkgsrc LDFLAGS
 - other stuff not previously commented (XXX)

--- configure.orig	2014-06-30 02:05:48.000000000 +0000
+--- configure.orig	2015-05-23 16:09:25.000000000 +0000
 +++ configure
-@@ -3252,7 +3252,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3271,7 +3271,7 @@ case $ac_sys_system/$ac_sys_release in
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
   # In addition, Stefan Krah confirms that issue #1244610 exists through
   # OpenBSD 4.6, but is fixed in 4.7.
@@ -17,7 +17,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
     define_xopen_source=no
     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
     # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -5351,15 +5351,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5373,15 +5373,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 	  INSTSONAME="$LDLIBRARY".$SOVERSION
           ;;
@@ -34,7 +34,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 	  INSTSONAME="$LDLIBRARY".$SOVERSION
 	  ;;
     hp*|HP*)
-@@ -5393,6 +5388,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5415,6 +5410,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
 	LDLIBRARY='libpython$(VERSION).so'
 	RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}}
 	;;
@@ -46,7 +46,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 
   esac
 else # shared is disabled
-@@ -6050,8 +6050,7 @@ $as_echo "$CC" >&6; }
+@@ -6072,8 +6072,7 @@ $as_echo "$CC" >&6; }
 		cur_target_minor=`sw_vers -productVersion | \
 				sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
 		cur_target="${cur_target_major}.${cur_target_minor}"
@@ -56,7 +56,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 		then
 		    cur_target=10.3
 		    if test ${enable_universalsdk}; then
-@@ -8209,9 +8208,9 @@ then
+@@ -8231,9 +8230,9 @@ then
 			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 		else
 			# No framework, use the Python app as bundle-loader
@@ -69,7 +69,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 		fi ;;
 	Darwin/*)
 		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -8234,9 +8233,9 @@ then
+@@ -8256,9 +8255,9 @@ then
 				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 			else
 				# No framework, use the Python app as bundle-loader
@@ -82,7 +82,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 			fi
 		else
 			# building for OS X 10.3 and later
-@@ -8250,7 +8249,7 @@ then
+@@ -8272,7 +8271,7 @@ then
 		;;
 	Linux*|GNU*|QNX*)
 		LDSHARED='$(CC) -shared'
@@ -91,7 +91,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 	BSD/OS*/4*)
 		LDSHARED="gcc -shared"
 		LDCXXSHARED="g++ -shared";;
-@@ -8278,6 +8277,9 @@ then
+@@ -8300,6 +8299,9 @@ then
 				   ;;
 				esac
 		fi;;
@@ -101,7 +101,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 	NetBSD*|DragonFly*)
 		LDSHARED='$(CC) -shared'
 		LDCXXSHARED='$(CXX) -shared';;
-@@ -8324,7 +8326,8 @@ then
+@@ -8346,7 +8348,8 @@ then
 		 fi;;
 	Linux*|GNU*) CCSHARED="-fPIC";;
 	BSD/OS*/4*) CCSHARED="-fpic";;
@@ -111,7 +111,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 	OpenUNIX*|UnixWare*)
 		if test "$GCC" = "yes"
 		then CCSHARED="-fPIC"
-@@ -8376,11 +8379,12 @@ then
+@@ -8398,11 +8401,12 @@ then
 	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
 	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -125,7 +125,7 @@ $NetBSD: patch-al,v 1.15 2014/07/26 06:19:38 adam Exp $
 	SunOS/5*) case $CC in
 		  *gcc*)
 		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -10370,6 +10374,10 @@ int
+@@ -10457,6 +10461,10 @@ int
 main ()
 {
 int x=kqueue()
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.18 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-am,v 1.19 2015/04/24 03:01:36 rodent Exp $

 Disabled modules for normal build:
 bsddb
@@ -23,7 +23,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.

 cygwin 2.7.3-no-libm.patch

--- setup.py.orig	2014-06-30 02:05:48.000000000 +0000
+--- setup.py.orig	2014-12-10 16:00:01.000000000 +0000
 +++ setup.py
@@ -33,7 +33,7 @@ host_platform = get_platform()
 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
@@ -34,7 +34,7 @@ cygwin 2.7.3-no-libm.patch
 
 def add_dir_to_list(dirlist, dir):
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -436,10 +436,15 @@ class PyBuildExt(build_ext):
+@@ -438,10 +438,15 @@ class PyBuildExt(build_ext):
             os.unlink(tmpfile)
 
     def detect_modules(self):
@@ -54,7 +54,7 @@ cygwin 2.7.3-no-libm.patch
         if cross_compiling:
             self.add_gcc_paths()
         self.add_multiarch_paths()
-@@ -551,7 +556,7 @@ class PyBuildExt(build_ext):
+@@ -553,7 +558,7 @@ class PyBuildExt(build_ext):
 
         # Check for MacOS X, which doesn't need libm.a at all
         math_libs = ['m']
@@ -63,7 +63,7 @@ cygwin 2.7.3-no-libm.patch
             math_libs = []
 
         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-@@ -787,11 +792,10 @@ class PyBuildExt(build_ext):
+@@ -789,11 +794,10 @@ class PyBuildExt(build_ext):
                                libraries=math_libs) )
         # Detect SSL support for the socket module (via _ssl)
         search_for_ssl_incs_in = [
@@ -78,7 +78,7 @@ cygwin 2.7.3-no-libm.patch
                              )
         if ssl_incs is not None:
             krb5_h = find_file('krb5.h', inc_dirs,
-@@ -799,9 +803,7 @@ class PyBuildExt(build_ext):
+@@ -801,9 +805,7 @@ class PyBuildExt(build_ext):
             if krb5_h:
                 ssl_incs += krb5_h
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -89,7 +89,7 @@ cygwin 2.7.3-no-libm.patch
 
         if (ssl_incs is not None and
             ssl_libs is not None):
-@@ -820,7 +822,7 @@ class PyBuildExt(build_ext):
+@@ -822,7 +824,7 @@ class PyBuildExt(build_ext):
 
         # look for the openssl version header on the compiler search path.
         opensslv_h = find_file('openssl/opensslv.h', [],
@@ -98,7 +98,7 @@ cygwin 2.7.3-no-libm.patch
         if opensslv_h:
             name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
             if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -920,175 +922,6 @@ class PyBuildExt(build_ext):
+@@ -922,175 +924,6 @@ class PyBuildExt(build_ext):
             else:
                 raise ValueError("unknown major BerkeleyDB version", major)
 
@@ -274,7 +274,7 @@ cygwin 2.7.3-no-libm.patch
         # The sqlite interface
         sqlite_setup_debug = False   # verbose debug prints from this script?
 
-@@ -1205,35 +1038,39 @@ class PyBuildExt(build_ext):
+@@ -1207,35 +1040,39 @@ class PyBuildExt(build_ext):
         # we do not build this one.  Otherwise this build will pick up
         # the more recent berkeleydb's db.h file first in the include path
         # when attempting to compile and it will fail.
@@ -338,7 +338,7 @@ cygwin 2.7.3-no-libm.patch
             config_args = [arg.strip("'")
                            for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
             dbm_args = [arg for arg in config_args
-@@ -1245,7 +1082,7 @@ class PyBuildExt(build_ext):
+@@ -1247,7 +1084,7 @@ class PyBuildExt(build_ext):
             dbmext = None
             for cand in dbm_order:
                 if cand == "ndbm":
@@ -347,7 +347,7 @@ cygwin 2.7.3-no-libm.patch
                         # Some systems have -lndbm, others have -lgdbm_compat,
                         # others don't have either
                         if self.compiler.find_library_file(lib_dirs,
-@@ -1289,18 +1126,14 @@ class PyBuildExt(build_ext):
+@@ -1291,18 +1128,14 @@ class PyBuildExt(build_ext):
                                 libraries = gdbm_libs)
                             break
                 elif cand == "bdb":
@@ -374,7 +374,7 @@ cygwin 2.7.3-no-libm.patch
             if dbmext is not None:
                 exts.append(dbmext)
             else:
-@@ -2228,9 +2061,9 @@ def main():
+@@ -2230,9 +2063,9 @@ def main():
           ext_modules=[Extension('_struct', ['_struct.c'])],
 
           # Scripts to install
--- a/lang/python27/patches/patch-an
+++ b/lang/python27/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-an,v 1.3 2015/04/24 03:01:36 rodent Exp $

--- Modules/makesetup.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/makesetup.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/makesetup
@@ -164,6 +164,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			-rpath)		libs="$libs $arg"; skip=libs;;
--- a/lang/python27/patches/patch-ao
+++ b/lang/python27/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.5 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ao,v 1.6 2015/04/24 03:01:36 rodent Exp $

--- Lib/distutils/util.py.orig	2014-06-30 02:05:26.000000000 +0000
+--- Lib/distutils/util.py.orig	2014-12-10 15:59:35.000000000 +0000
 +++ Lib/distutils/util.py
@@ -101,6 +101,8 @@ def get_platform ():
         osname, release, machine = _osx_support.get_platform_osx(
--- a/lang/python27/patches/patch-au
+++ b/lang/python27/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.7 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-au,v 1.8 2015/04/24 03:01:36 rodent Exp $

 Fix for unpriviliged build.

 http://hg.python.org/cpython/rev/a0f43f4481e0

--- Makefile.pre.in.orig	2014-06-30 02:05:39.000000000 +0000
+--- Makefile.pre.in.orig	2014-12-10 15:59:50.000000000 +0000
 +++ Makefile.pre.in
-@@ -499,7 +499,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
+@@ -512,7 +512,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
 
 SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
 $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@@ -15,7 +15,7 @@ http://hg.python.org/cpython/rev/a0f43f4481e0
 
 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
 # minimal framework (not including the Lib directory and such) in the current
-@@ -890,7 +890,8 @@ altbininstall:	$(BUILDPYTHON)
+@@ -922,7 +922,8 @@ altbininstall:	$(BUILDPYTHON)
 				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
 			fi \
 		fi; \
--- a/lang/python27/patches/patch-av
+++ b/lang/python27/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-av,v 1.3 2015/04/24 03:01:36 rodent Exp $

 Add a knob (enviroment variable) for disabling installation of egg metadata
 in extensions until we have infrastructure in place for dealing w/ it.

--- Lib/distutils/command/install.py.orig	2014-06-30 02:05:25.000000000 +0000
+--- Lib/distutils/command/install.py.orig	2014-12-10 15:59:34.000000000 +0000
 +++ Lib/distutils/command/install.py
@@ -666,7 +666,8 @@ class install (Command):
                     ('install_headers', has_headers),
--- a/lang/python27/patches/patch-aw
+++ b/lang/python27/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-aw,v 1.3 2015/04/24 03:01:36 rodent Exp $

--- Modules/nismodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/nismodule.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/nismodule.c
@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
     return map;
--- a/lang/python27/patches/patch-ax
+++ b/lang/python27/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.5 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-ax,v 1.6 2015/04/24 03:01:36 rodent Exp $

 chop "-RELEASE" or "-DEVELOPMENT" from release for DragonFly.

--- Lib/sysconfig.py.orig	2014-06-30 02:05:31.000000000 +0000
+--- Lib/sysconfig.py.orig	2014-12-10 15:59:40.000000000 +0000
 +++ Lib/sysconfig.py
-@@ -603,6 +603,8 @@ def get_platform():
+@@ -607,6 +607,8 @@ def get_platform():
         osname, release, machine = _osx_support.get_platform_osx(
                                             get_config_vars(),
                                             osname, release, machine)
--- a/lang/python27/patches/patch-az
+++ b/lang/python27/patches/patch-az
@@ -1,6 +1,6 @@
-$NetBSD: patch-az,v 1.4 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-az,v 1.5 2015/04/24 03:01:36 rodent Exp $

--- Modules/selectmodule.c.orig	2014-06-30 02:05:43.000000000 +0000
+--- Modules/selectmodule.c.orig	2014-12-10 15:59:55.000000000 +0000
 +++ Modules/selectmodule.c
@@ -1906,7 +1906,9 @@ initselect(void)
     PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
--- a/lang/python27/patches/patch-pyconfig.h.in
+++ b/lang/python27/patches/patch-pyconfig.h.in
@@ -1,8 +1,10 @@
-$NetBSD: patch-pyconfig.h.in,v 1.3 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-pyconfig.h.in,v 1.5 2015/05/24 07:44:07 adam Exp $

--- pyconfig.h.in.orig	2014-06-30 02:05:48.000000000 +0000
+Fix build with LibreSSL.
+
+--- pyconfig.h.in.orig	2015-05-23 16:09:25.000000000 +0000
 +++ pyconfig.h.in
-@@ -1200,7 +1200,9 @@
+@@ -1206,7 +1209,9 @@
 #undef _UINT64_T
 
 /* Define to the level of X/Open that your system supports */
--- a/lang/python27/patches/patch-xa
+++ b/lang/python27/patches/patch-xa
@@ -1,6 +1,6 @@
-$NetBSD: patch-xa,v 1.2 2014/11/02 13:31:11 spz Exp $
+$NetBSD: patch-xa,v 1.3 2015/04/24 03:01:36 rodent Exp $

--- Python/thread_pthread.h.orig	2014-06-30 02:05:47.000000000 +0000
+--- Python/thread_pthread.h.orig	2014-12-10 15:59:59.000000000 +0000
 +++ Python/thread_pthread.h
@@ -46,6 +46,9 @@
    we need to add 0 to make it work there as well. */