cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgotten make update-patches, spotted by danj@.

Browse Source 
inputs and ok sthen@.
This commit is contained in:
rpointel 2016-07-03 20:10:33 +00:00
parent 88f000423c
commit a4515812c4
10 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/python/2.7/patches/patch-Lib_test_regrtest_py
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Lib_test_regrtest_py,v 1.8 2016/05/24 09:57:50 sthen Exp $
$OpenBSD: patch-Lib_test_regrtest_py,v 1.9 2016/07/03 20:10:33 rpointel Exp $
- test_bsddb and test_bsddb3 are in the list below as they are only available
on i386 and amd64.
--- Lib/test/regrtest.py.orig Wed Dec 10 16:59:41 2014
+++ Lib/test/regrtest.py Sat Dec 13 12:13:40 2014
@@ -1427,22 +1427,16 @@ _expectations = {
--- Lib/test/regrtest.py.orig Sat Jun 25 23:49:31 2016
+++ Lib/test/regrtest.py Fri Jul 1 10:35:01 2016
@@ -1465,22 +1465,16 @@ _expectations = {
""",
'openbsd3':
"""
@ -30,7 +30,7 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1.8 2016/05/24 09:57:50 sthen Exp $
""",
'netbsd3':
"""
@@ -1469,6 +1463,9 @@ _expectations['freebsd5'] = _expectations['freebsd4']
@@ -1507,6 +1501,9 @@ _expectations['freebsd5'] = _expectations['freebsd4']
_expectations['freebsd6'] = _expectations['freebsd4']
_expectations['freebsd7'] = _expectations['freebsd4']
_expectations['freebsd8'] = _expectations['freebsd4']

8
lang/python/2.7/patches/patch-Makefile_pre_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.8 2014/12/14 08:32:55 rpointel Exp $
--- Makefile.pre.in.orig Wed Dec 10 16:59:50 2014
+++ Makefile.pre.in Sat Dec 13 12:13:40 2014
@@ -512,7 +512,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
$OpenBSD: patch-Makefile_pre_in,v 1.9 2016/07/03 20:10:33 rpointel Exp $
--- Makefile.pre.in.orig Sat Jun 25 23:49:31 2016
+++ Makefile.pre.in Fri Jul 1 10:35:01 2016
@@ -584,7 +584,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)

8
lang/python/2.7/patches/patch-configure_ac
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.5 2014/12/14 08:32:55 rpointel Exp $
$OpenBSD: patch-configure_ac,v 1.6 2016/07/03 20:10:33 rpointel Exp $
SOVERSION defaults to 1.0. SHARED_LIBS, however, could be changed
at any point. Ensure they are on sync in case INSTSONAME is used
by a third party.
--- configure.ac.orig Wed Dec 10 17:00:00 2014
+++ configure.ac Sat Dec 13 12:13:40 2014
@@ -894,6 +894,9 @@ if test $enable_shared = "yes"; then
--- configure.ac.orig Sat Jun 25 23:49:32 2016
+++ configure.ac Fri Jul 1 10:43:57 2016
@@ -914,6 +914,9 @@ if test $enable_shared = "yes"; then
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
;;

26
lang/python/2.7/patches/patch-setup_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
--- setup.py.orig Wed Dec 10 17:00:01 2014
+++ setup.py Sat Dec 13 12:13:40 2014
$OpenBSD: patch-setup_py,v 1.12 2016/07/03 20:10:33 rpointel Exp $
--- setup.py.orig Sat Jun 25 23:49:32 2016
+++ setup.py Fri Jul 1 10:35:01 2016
@@ -35,6 +35,11 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig
# This global variable is used to hold the list of modules to be disabled.
disabled_module_list = []
@ -13,7 +13,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
1) 'dir' is not already in 'dirlist'
@@ -440,8 +445,8 @@ class PyBuildExt(build_ext):
@@ -456,8 +461,8 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
if not cross_compiling:
@ -24,7 +24,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
if cross_compiling:
self.add_gcc_paths()
self.add_multiarch_paths()
@@ -766,6 +771,8 @@ class PyBuildExt(build_ext):
@@ -786,6 +791,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
@ -33,7 +33,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
@@ -902,7 +909,7 @@ class PyBuildExt(build_ext):
@@ -922,7 +929,7 @@ class PyBuildExt(build_ext):
# BerkeleyDB 4.6.x is not stable on many architectures.
arch = platform_machine()
if arch not in ('i386', 'i486', 'i586', 'i686',
@ -42,7 +42,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
return False
return True
@@ -972,6 +979,7 @@ class PyBuildExt(build_ext):
@@ -992,6 +999,7 @@ class PyBuildExt(build_ext):
std_variants.append(os.path.join(dn, "db3.%d"%x))
db_inc_paths = std_variants + db_inc_paths
@ -50,7 +50,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
@@ -1035,6 +1043,7 @@ class PyBuildExt(build_ext):
@@ -1055,6 +1063,7 @@ class PyBuildExt(build_ext):
db_incdir.replace("include", 'lib64'),
db_incdir.replace("include", 'lib'),
]
@ -58,7 +58,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
if host_platform != 'darwin':
db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
@@ -1057,6 +1066,7 @@ class PyBuildExt(build_ext):
@@ -1077,6 +1086,7 @@ class PyBuildExt(build_ext):
# symlink to more general names?
for dblib in (('db-%d.%d' % db_ver),
('db%d%d' % db_ver),
@ -66,7 +66,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
('db%d' % db_ver[0])):
dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib )
@@ -1214,7 +1224,7 @@ class PyBuildExt(build_ext):
@@ -1234,7 +1244,7 @@ class PyBuildExt(build_ext):
sysroot = macosx_sdk_root()
f = os.path.join(sysroot, f[1:])
@ -75,7 +75,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
@@ -1820,7 +1833,7 @@ class PyBuildExt(build_ext):
@@ -1840,7 +1850,7 @@ class PyBuildExt(build_ext):
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
# if X11 libs are not found...
@ -84,7 +84,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
@@ -1875,8 +1888,7 @@ class PyBuildExt(build_ext):
@@ -1895,8 +1905,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
@ -94,7 +94,7 @@ $OpenBSD: patch-setup_py,v 1.11 2015/02/01 12:52:53 ratchov Exp $
tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
@@ -1919,17 +1931,9 @@ class PyBuildExt(build_ext):
@@ -1939,17 +1948,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')

8
lang/python/3.4/patches/patch-Makefile_pre_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.2 2014/12/19 20:32:07 rpointel Exp $
--- Makefile.pre.in.orig Wed Oct 8 10:18:14 2014
+++ Makefile.pre.in Sun Dec 14 10:06:49 2014
@@ -611,7 +611,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
$OpenBSD: patch-Makefile_pre_in,v 1.3 2016/07/03 20:10:33 rpointel Exp $
--- Makefile.pre.in.orig Sat Jun 25 23:52:31 2016
+++ Makefile.pre.in Fri Jul 1 10:46:42 2016
@@ -612,7 +612,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)

8
lang/python/3.4/patches/patch-Modules_pyexpat_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_pyexpat_c,v 1.1.1.1 2014/04/13 07:10:12 rpointel Exp $
--- Modules/pyexpat.c.orig Mon Mar 17 03:31:31 2014
+++ Modules/pyexpat.c Sat Apr 5 09:24:14 2014
@@ -373,6 +373,11 @@ call_character_handler(xmlparseobject *self, const XML
$OpenBSD: patch-Modules_pyexpat_c,v 1.2 2016/07/03 20:10:33 rpointel Exp $
--- Modules/pyexpat.c.orig Sat Jun 25 23:52:32 2016
+++ Modules/pyexpat.c Fri Jul 1 10:46:42 2016
@@ -267,6 +267,11 @@ call_character_handler(xmlparseobject *self, const XML
noop_character_data_handler);
return -1;
}

8
lang/python/3.4/patches/patch-configure_ac
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.2 2014/12/19 20:32:07 rpointel Exp $
$OpenBSD: patch-configure_ac,v 1.3 2016/07/03 20:10:33 rpointel Exp $
SOVERSION defaults to 1.0. SHARED_LIBS, however, could be changed
at any point. Ensure they are on sync in case INSTSONAME is used
by a third party.
--- configure.ac.orig Wed Oct 8 10:18:16 2014
+++ configure.ac Sun Dec 14 10:06:52 2014
@@ -964,6 +964,9 @@ if test $enable_shared = "yes"; then
--- configure.ac.orig Sat Jun 25 23:52:32 2016
+++ configure.ac Fri Jul 1 10:54:12 2016
@@ -967,6 +967,9 @@ if test $enable_shared = "yes"; then
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
;;

8
lang/python/3.5/patches/patch-Makefile_pre_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2015/09/23 19:23:57 rpointel Exp $
--- Makefile.pre.in.orig Sun Sep 13 13:41:23 2015
+++ Makefile.pre.in Fri Sep 18 18:37:05 2015
@@ -623,7 +623,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
$OpenBSD: patch-Makefile_pre_in,v 1.2 2016/07/03 20:10:33 rpointel Exp $
--- Makefile.pre.in.orig Sat Jun 25 23:38:37 2016
+++ Makefile.pre.in Fri Jul 1 10:46:50 2016
@@ -645,7 +645,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)

8
lang/python/3.5/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2015/09/28 04:50:37 rpointel Exp $
--- configure.ac.orig Sun Sep 13 13:41:26 2015
+++ configure.ac Tue Sep 22 23:15:55 2015
@@ -114,7 +114,7 @@ VERSION=PYTHON_VERSION
$OpenBSD: patch-configure_ac,v 1.3 2016/07/03 20:10:33 rpointel Exp $
--- configure.ac.orig Sat Jun 25 23:38:39 2016
+++ configure.ac Fri Jul 1 10:57:50 2016
@@ -115,7 +115,7 @@ VERSION=PYTHON_VERSION
# Version number of Python's own shared library file.
AC_SUBST(SOVERSION)

10
lang/python/3.5/patches/patch-setup_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2015/09/23 19:23:57 rpointel Exp $
--- setup.py.orig Sun Sep 13 13:41:26 2015
+++ setup.py Sun Sep 20 10:00:48 2015
@@ -754,6 +754,8 @@ class PyBuildExt(build_ext):
$OpenBSD: patch-setup_py,v 1.2 2016/07/03 20:10:33 rpointel Exp $
--- setup.py.orig Sat Jun 25 23:38:39 2016
+++ setup.py Fri Jul 1 10:46:50 2016
@@ -784,6 +784,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2015/09/23 19:23:57 rpointel Exp $
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
@@ -1727,8 +1729,7 @@ class PyBuildExt(build_ext):
@@ -1757,8 +1759,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None