summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/python35/Makefile3
-rw-r--r--lang/python35/PLIST40
-rw-r--r--lang/python35/dist.mk4
-rw-r--r--lang/python35/distinfo14
-rw-r--r--lang/python35/patches/patch-Makefile.pre.in26
-rw-r--r--lang/python35/patches/patch-setup.py24
6 files changed, 65 insertions, 46 deletions
diff --git a/lang/python35/Makefile b/lang/python35/Makefile
index 5d660617b06..f99d166bb8c 100644
--- a/lang/python35/Makefile
+++ b/lang/python35/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/03/05 11:28:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2016/09/06 19:11:16 bsiegert Exp $
.include "dist.mk"
PKGNAME= python35-${PY_DISTVERSION}
-PKGREVISION= 2
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python35/PLIST b/lang/python35/PLIST
index b52596b2023..5b648493d78 100644
--- a/lang/python35/PLIST
+++ b/lang/python35/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/12/13 21:33:14 kamil Exp $
+@comment $NetBSD: PLIST,v 1.3.6.1 2016/09/06 19:11:16 bsiegert Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -1341,8 +1341,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-7.1.2-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-20.10.1-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
@@ -1631,6 +1631,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_autoexpand.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_help.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.pyo
@@ -1640,6 +1643,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_configdialog.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.pyo
@@ -1664,9 +1670,18 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_parenmatch.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_percolator.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_replacedialog.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialog.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialog.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialog.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchdialogbase.pyo
@@ -1679,6 +1694,9 @@ lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_textview.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_undodelegator.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_undodelegator.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_undodelegator.pyo
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.py
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyc
lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.pyo
@@ -2484,16 +2502,15 @@ lib/python${PY_VER_SUFFIX}/test/badsyntax_future7.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_future8.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_future9.py
lib/python${PY_VER_SUFFIX}/test/badsyntax_pep3120.py
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.py
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyc
-lib/python${PY_VER_SUFFIX}/test/buffer_tests.pyo
lib/python${PY_VER_SUFFIX}/test/bytecode_helper.py
lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyc
lib/python${PY_VER_SUFFIX}/test/bytecode_helper.pyo
+lib/python${PY_VER_SUFFIX}/test/capath/0e4015b9.0
lib/python${PY_VER_SUFFIX}/test/capath/4e1295a3.0
lib/python${PY_VER_SUFFIX}/test/capath/5ed36f99.0
lib/python${PY_VER_SUFFIX}/test/capath/6e88d7b8.0
lib/python${PY_VER_SUFFIX}/test/capath/99d0fa06.0
+lib/python${PY_VER_SUFFIX}/test/capath/ce7b8643.0
lib/python${PY_VER_SUFFIX}/test/cfgparser.1
lib/python${PY_VER_SUFFIX}/test/cfgparser.2
lib/python${PY_VER_SUFFIX}/test/cfgparser.3
@@ -2726,7 +2743,6 @@ lib/python${PY_VER_SUFFIX}/test/future_test2.pyo
lib/python${PY_VER_SUFFIX}/test/gdb_sample.py
lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyc
lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
-lib/python${PY_VER_SUFFIX}/test/https_svn_python_org_root.pem
lib/python${PY_VER_SUFFIX}/test/ieee754.txt
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp
lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.exr
@@ -3961,6 +3977,8 @@ lib/python${PY_VER_SUFFIX}/test/test_operator.pyo
lib/python${PY_VER_SUFFIX}/test/test_optparse.py
lib/python${PY_VER_SUFFIX}/test/test_optparse.pyc
lib/python${PY_VER_SUFFIX}/test/test_optparse.pyo
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyc
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.pyo
lib/python${PY_VER_SUFFIX}/test/test_os.py
lib/python${PY_VER_SUFFIX}/test/test_os.pyc
lib/python${PY_VER_SUFFIX}/test/test_os.pyo
@@ -3988,9 +4006,6 @@ lib/python${PY_VER_SUFFIX}/test/test_pep247.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep277.py
lib/python${PY_VER_SUFFIX}/test/test_pep277.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep277.pyo
-lib/python${PY_VER_SUFFIX}/test/test_pep292.py
-lib/python${PY_VER_SUFFIX}/test/test_pep292.pyc
-lib/python${PY_VER_SUFFIX}/test/test_pep292.pyo
lib/python${PY_VER_SUFFIX}/test/test_pep3120.py
lib/python${PY_VER_SUFFIX}/test/test_pep3120.pyc
lib/python${PY_VER_SUFFIX}/test/test_pep3120.pyo
@@ -4345,6 +4360,10 @@ lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyo
lib/python${PY_VER_SUFFIX}/test/test_tuple.py
lib/python${PY_VER_SUFFIX}/test/test_tuple.pyc
lib/python${PY_VER_SUFFIX}/test/test_tuple.pyo
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
+lib/python${PY_VER_SUFFIX}/test/test_turtle.py
+lib/python${PY_VER_SUFFIX}/test/test_turtle.pyc
+lib/python${PY_VER_SUFFIX}/test/test_turtle.pyo
lib/python${PY_VER_SUFFIX}/test/test_typechecks.py
lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyc
lib/python${PY_VER_SUFFIX}/test/test_typechecks.pyo
@@ -4513,6 +4532,7 @@ lib/python${PY_VER_SUFFIX}/test/tracedmodules/testmod.pyo
lib/python${PY_VER_SUFFIX}/test/win_console_handler.py
lib/python${PY_VER_SUFFIX}/test/win_console_handler.pyc
lib/python${PY_VER_SUFFIX}/test/win_console_handler.pyo
+lib/python${PY_VER_SUFFIX}/test/wrongcert.pem
lib/python${PY_VER_SUFFIX}/test/xmltestdata/simple-ns.xml
lib/python${PY_VER_SUFFIX}/test/xmltestdata/simple.xml
lib/python${PY_VER_SUFFIX}/test/xmltestdata/test.xml
diff --git a/lang/python35/dist.mk b/lang/python35/dist.mk
index a4cd41f4b9d..cc020afbbfa 100644
--- a/lang/python35/dist.mk
+++ b/lang/python35/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.2 2015/12/07 14:36:26 adam Exp $
+# $NetBSD: dist.mk,v 1.2.6.1 2016/09/06 19:11:16 bsiegert Exp $
-PY_DISTVERSION= 3.5.1
+PY_DISTVERSION= 3.5.2
DISTNAME= Python-${PY_DISTVERSION}
EXTRACT_SUFX= .tar.xz
DISTINFO_FILE= ${.CURDIR}/../../lang/python35/distinfo
diff --git a/lang/python35/distinfo b/lang/python35/distinfo
index 3a32de85770..9949165e9d6 100644
--- a/lang/python35/distinfo
+++ b/lang/python35/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.5 2016/02/23 15:07:36 joerg Exp $
+$NetBSD: distinfo,v 1.5.4.1 2016/09/06 19:11:16 bsiegert Exp $
-SHA1 (Python-3.5.1.tar.xz) = 0186da436db76776196612b98bb9c2f76acfe90e
-RMD160 (Python-3.5.1.tar.xz) = 9e63ee775b0bfebdbf4ea21969856b1f91c7e243
-SHA512 (Python-3.5.1.tar.xz) = 261c9e42ae351853c718707a8887817e308b3ba7a37e9463a0bc8f50ee9be9ac1a011b2891f8877ecdb40beab99279bcfa8e04f813b8998fcf6cefb7fd52d850
-Size (Python-3.5.1.tar.xz) = 14830408 bytes
+SHA1 (Python-3.5.2.tar.xz) = 4843aabacec5bc0cdd3e1f778faa926e532794d2
+RMD160 (Python-3.5.2.tar.xz) = 709be7df28045c4fc8ed40cadd299478439f9522
+SHA512 (Python-3.5.2.tar.xz) = c07c3366f1c81e214241444bb9da6db9d11da32ad66bfa29cdad5a3b2e34e4d870bda6d4ce3c3910b582942e91f1d8c8a1c1a7b9464cc147b83c9e0007012742
+Size (Python-3.5.2.tar.xz) = 15222676 bytes
SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
-SHA1 (patch-Makefile.pre.in) = 3ed3cf07d58ae15adf26d4bffb381eae0e080f21
+SHA1 (patch-Makefile.pre.in) = 5a27e9bc405b515f10b972ba9fc9421e05e4b7f1
SHA1 (patch-Modules___cursesmodule.c) = 6bc66c9cb5320b4f90872024fc9c1e43d0b34928
SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
SHA1 (patch-configure) = 069f7bb10d98e3616f52859a2cf90c7f5732425e
-SHA1 (patch-setup.py) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f
+SHA1 (patch-setup.py) = 01e56057bb35225a513ef4a76a69f695f760c6ca
diff --git a/lang/python35/patches/patch-Makefile.pre.in b/lang/python35/patches/patch-Makefile.pre.in
index aa7343b7972..d24e87ec413 100644
--- a/lang/python35/patches/patch-Makefile.pre.in
+++ b/lang/python35/patches/patch-Makefile.pre.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.pre.in,v 1.1 2015/12/05 17:12:13 adam Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.1.6.1 2016/09/06 19:11:17 bsiegert Exp $
Use only one optimisation level; needed for PLIST and setuptools compatibility.
---- Makefile.pre.in.orig 2015-09-13 11:41:23.000000000 +0000
+--- Makefile.pre.in.orig 2016-06-25 21:38:37.000000000 +0000
+++ Makefile.pre.in
-@@ -86,7 +86,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
+@@ -91,7 +91,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
# be able to build extension modules using the directories specified in the
# environment variables
PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
@@ -13,16 +13,16 @@ Use only one optimisation level; needed for PLIST and setuptools compatibility.
NO_AS_NEEDED= @NO_AS_NEEDED@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
-@@ -700,7 +700,7 @@ Python/importlib_external.h: $(srcdir)/L
- ./Programs/_freeze_importlib \
- $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
+@@ -724,7 +724,7 @@ Python/importlib_external.h: $(srcdir)/L
+ $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \
+ fi
-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib $(LIBRARY_OBJS_OMIT_FROZEN)
- ./Programs/_freeze_importlib \
- $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
-
-@@ -845,7 +845,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
+ if test "$(cross_compiling)" != "yes"; then \
+ ./Programs/_freeze_importlib \
+ $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
+@@ -882,7 +882,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
$(OPCODETARGETGEN) $(OPCODETARGETS_H)
@@ -31,7 +31,7 @@ Use only one optimisation level; needed for PLIST and setuptools compatibility.
Python/frozen.o: Python/importlib.h Python/importlib_external.h
-@@ -1085,7 +1085,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1122,7 +1122,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
if test -n "$(PY3LIBRARY)"; then \
$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
fi; \
@@ -41,7 +41,7 @@ Use only one optimisation level; needed for PLIST and setuptools compatibility.
fi
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1271,11 +1272,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+@@ -1312,11 +1313,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
$(DESTDIR)$(LIBDEST)
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -53,7 +53,7 @@ Use only one optimisation level; needed for PLIST and setuptools compatibility.
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1284,10 +1280,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+@@ -1325,10 +1321,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
-d $(LIBDEST)/site-packages -f \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
diff --git a/lang/python35/patches/patch-setup.py b/lang/python35/patches/patch-setup.py
index 19039d007a9..7e275a1e3b9 100644
--- a/lang/python35/patches/patch-setup.py
+++ b/lang/python35/patches/patch-setup.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
+$NetBSD: patch-setup.py,v 1.1.6.1 2016/09/06 19:11:17 bsiegert Exp $
---- setup.py.orig 2014-03-17 02:31:31.000000000 +0000
+--- setup.py.orig 2016-06-25 21:38:39.000000000 +0000
+++ setup.py
-@@ -33,7 +33,8 @@ host_platform = get_platform()
+@@ -44,7 +44,8 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
@@ -12,8 +12,8 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (after any relative
-@@ -441,15 +442,15 @@ class PyBuildExt(build_ext):
- os.unlink(tmpfile)
+@@ -488,15 +489,15 @@ class PyBuildExt(build_ext):
+ return ['m']
def detect_modules(self):
- # Ensure that /usr/local is always used, but the local build
@@ -37,7 +37,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and
-@@ -751,8 +752,7 @@ class PyBuildExt(build_ext):
+@@ -809,8 +810,7 @@ class PyBuildExt(build_ext):
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -47,7 +47,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
]
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
-@@ -763,9 +763,7 @@ class PyBuildExt(build_ext):
+@@ -821,9 +821,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -58,7 +58,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -784,7 +782,7 @@ class PyBuildExt(build_ext):
+@@ -842,7 +840,7 @@ class PyBuildExt(build_ext):
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
@@ -67,7 +67,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -1148,6 +1146,30 @@ class PyBuildExt(build_ext):
+@@ -1216,6 +1214,30 @@ class PyBuildExt(build_ext):
dbm_order = ['gdbm']
# The standard Unix dbm module:
if host_platform not in ['cygwin']:
@@ -98,7 +98,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
config_args = [arg.strip("'")
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
dbm_args = [arg for arg in config_args
-@@ -1159,7 +1181,7 @@ class PyBuildExt(build_ext):
+@@ -1227,7 +1249,7 @@ class PyBuildExt(build_ext):
dbmext = None
for cand in dbm_order:
if cand == "ndbm":
@@ -107,7 +107,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
# Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either
if self.compiler.find_library_file(lib_dirs,
-@@ -1956,10 +1986,7 @@ class PyBuildExt(build_ext):
+@@ -2027,10 +2049,7 @@ class PyBuildExt(build_ext):
depends = ['_decimal/docstrings.h']
else:
srcdir = sysconfig.get_config_var('srcdir')
@@ -119,7 +119,7 @@ $NetBSD: patch-setup.py,v 1.1 2015/12/05 17:12:13 adam Exp $
libraries = []
sources = [
'_decimal/_decimal.c',
-@@ -2205,7 +2232,7 @@ def main():
+@@ -2276,7 +2295,7 @@ def main():
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in