Import of pkgsrc-2016Q3

lang/python34/ALTERNATIVES

@@ -1,3 +1,4 @@
 bin/2to3 @PREFIX@/bin/2to3-3.4
 bin/pydoc3 @PREFIX@/bin/pydoc3.4
 bin/python @PREFIX@/bin/python3.4
+bin/python3 @PREFIX@/bin/python3.4

lang/python34/Makefile

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2015/09/07 12:02:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/09/18 12:36:41 kamil Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python34-${PY_DISTVERSION}
+PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,8 +13,8 @@ LICENSE=	python-software-foundation
 
 CONFLICTS+=	python-[0-9]*
 
-PLIST_AWK+=	-f ${PKGSRCDIR}/lang/python/plist-python.awk
-PLIST_AWK_ENV+=	PYTHON_SOABI="cpython-34"
+PLIST_AWK+=		-f ${PKGSRCDIR}/lang/python/plist-python.awk
+PLIST_AWK_ENV+=		PYVERS=34
 PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.py[co]$$/ {
 PRINT_PLIST_AWK+=	gsub(/__pycache__\//, "")
 PRINT_PLIST_AWK+=	gsub(/\.cpython-34/, "")}
@@ -39,8 +40,8 @@ PTHREAD_OPTS+=	require
 # http://bugs.python.org/issue13241
 .if !empty(MACHINE_PLATFORM:MDarwin-10.*)
 PKGSRC_COMPILER=	clang
-CC=			clang
-CXX=			clang++
+PKG_CC=			clang
+PKG_CXX=		clang++
 .endif
 
 # fdatasync()
@@ -122,6 +123,26 @@ SUBST_STAGE.findlib=	pre-configure
 SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 
+# XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib
+# Testing:
+# >>> from ctypes.util import find_library
+# >>> find_library("m")
+# 'libm.so.0'
+# >>> find_library("crypto")
+# 'libcrypto.so.11'
+# >>> find_library("GL")
+# 'libGL.so.2'
+# >>> find_library("curl")
+# 'libcurl.so.4'
+
+SUBST_CLASSES+=		pfindlib
+SUBST_MESSAGE.pfindlib=	Fixing find_library() on POSIX-like (excluding Darwin) systems.
+SUBST_STAGE.pfindlib=	pre-configure
+SUBST_FILES.pfindlib=	Lib/ctypes/util.py
+SUBST_SED.pfindlib=	-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
+
+.include "options.mk"
+
 SUBST_CLASSES+=		sslbase
 SUBST_MESSAGE.sslbase=	Fixing OpenSSL base directory to find header file.
 SUBST_STAGE.sslbase=	pre-configure

lang/python34/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/27 15:02:58 dholland Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/07/02 15:23:33 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -173,6 +173,9 @@ lib/python${PY_VER_SUFFIX}/asyncio/base_events.pyo
 lib/python${PY_VER_SUFFIX}/asyncio/base_subprocess.py
 lib/python${PY_VER_SUFFIX}/asyncio/base_subprocess.pyc
 lib/python${PY_VER_SUFFIX}/asyncio/base_subprocess.pyo
+lib/python${PY_VER_SUFFIX}/asyncio/compat.py
+lib/python${PY_VER_SUFFIX}/asyncio/compat.pyc
+lib/python${PY_VER_SUFFIX}/asyncio/compat.pyo
 lib/python${PY_VER_SUFFIX}/asyncio/constants.py
 lib/python${PY_VER_SUFFIX}/asyncio/constants.pyc
 lib/python${PY_VER_SUFFIX}/asyncio/constants.pyo
@@ -1315,8 +1318,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-6.0.8-py2.py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-12.0.5-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
@@ -1573,6 +1576,10 @@ lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.py
 lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/dynOptionMenuWidget.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/extend.txt
+lib/python${PY_VER_SUFFIX}/idlelib/help.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/help.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/help.html
+lib/python${PY_VER_SUFFIX}/idlelib/help.py
 lib/python${PY_VER_SUFFIX}/idlelib/help.txt
 lib/python${PY_VER_SUFFIX}/idlelib/idle.bat
 lib/python${PY_VER_SUFFIX}/idlelib/idle.py
@@ -1610,6 +1617,8 @@ 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_editor.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.pyo
@@ -1622,6 +1631,10 @@ 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.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editor.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_io.py
 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
@@ -2440,10 +2453,12 @@ 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
@@ -2632,7 +2647,6 @@ 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/dis_module.py
 lib/python${PY_VER_SUFFIX}/test/dis_module.pyc
 lib/python${PY_VER_SUFFIX}/test/dis_module.pyo
@@ -2673,7 +2687,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.gif
@@ -3870,6 +3883,10 @@ 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/dh1024.pem
+lib/python${PY_VER_SUFFIX}/test/test_ordered_dict.py
 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

lang/python34/dist.mk

@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.4 2015/02/26 06:23:06 adam Exp $
+# $NetBSD: dist.mk,v 1.6 2016/07/02 15:23:33 adam Exp $
 
-PY_DISTVERSION=	3.4.3
+PY_DISTVERSION=	3.4.5
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python34/distinfo

lang/python34/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.17 2015/03/16 13:53:05 tnn Exp $
+$NetBSD: distinfo,v 1.21 2016/07/02 15:23:33 adam Exp $
 
-SHA1 (Python-3.4.3.tar.xz) = 7ca5cd664598bea96eec105aa6453223bb6b4456
-RMD160 (Python-3.4.3.tar.xz) = fc0a8ce58c8b354f644db3527d838a77d2e27fba
-Size (Python-3.4.3.tar.xz) = 14421964 bytes
-SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce
+SHA1 (Python-3.4.5.tar.xz) = 882e83e0286b253ee651aa3f9a5d27ebc46e6632
+RMD160 (Python-3.4.5.tar.xz) = 47604be01f37671a16c17e27316af327a1048fd6
+SHA512 (Python-3.4.5.tar.xz) = b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c
+Size (Python-3.4.5.tar.xz) = 14516820 bytes
+SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
 SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-ah) = 1c4eec742ab26f77c6326b7d12e44e26be493c0f
 SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f

lang/python34/options.mk

@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2016/09/18 12:36:41 kamil Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.python27
+PKG_SUPPORTED_OPTIONS+=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+# Support for native X11 paths as an option
+# This code is no-op for modular X11, however for simplicity don't make it conditional.
+SUBST_CLASSES+=			x11findlib
+SUBST_MESSAGE.x11findlib=	Fixing find_library() for native X11.
+SUBST_STAGE.x11findlib=		pre-configure
+SUBST_FILES.x11findlib=		Lib/ctypes/util.py
+SUBST_SED.x11findlib=		-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib \1!'
+
+# Required to get definition of X11BASE and retain X11 rpath paths for linker
+# We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs
+USE_X11=		yes
+
+SUBST_CLASSES+=		cdlopen
+SUBST_MESSAGE.cdlopen=	Handle X11BASE paths in dlopen(3) calls of _ctypes.so
+SUBST_STAGE.cdlopen=	pre-configure
+SUBST_FILES.cdlopen=	setup.py
+SUBST_SED.cdlopen=	-e "s!\(libraries=\[\],\)!\1 runtime_library_dirs=\['${X11BASE}/lib'\],!"
+.endif

lang/python34/patches/patch-Lib_distutils_unixccompiler.py

@@ -1,13 +1,31 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2014/05/09 02:27:14 wen Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.2 2016/02/23 15:07:36 joerg Exp $
+
+Do not force RUNPATH vs RPATH, trust the compiler to know what the
+platform wants.
 
 --- Lib/distutils/unixccompiler.py.orig	2013-05-15 16:32:54.000000000 +0000
 +++ Lib/distutils/unixccompiler.py
-@@ -232,7 +232,7 @@ class UnixCCompiler(CCompiler):
+@@ -232,22 +232,7 @@ class UnixCCompiler(CCompiler):
          elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
              return ["-rpath", dir]
          else:
 -            if self._is_gcc(compiler):
-+            if True:
-                 # gcc on non-GNU systems does not need -Wl, but can
-                 # use it anyway.  Since distutils has always passed in
-                 # -Wl whenever gcc was used in the past it is probably
+-                # gcc on non-GNU systems does not need -Wl, but can
+-                # use it anyway.  Since distutils has always passed in
+-                # -Wl whenever gcc was used in the past it is probably
+-                # safest to keep doing so.
+-                if sysconfig.get_config_var("GNULD") == "yes":
+-                    # GNU ld needs an extra option to get a RUNPATH
+-                    # instead of just an RPATH.
+-                    return "-Wl,--enable-new-dtags,-R" + dir
+-                else:
+-                    return "-Wl,-R" + dir
+-            else:
+-                # No idea how --enable-new-dtags would be passed on to
+-                # ld if this system was using GNU ld.  Don't know if a
+-                # system like this even exists.
+-                return "-R" + dir
++            return "-Wl,-R" + dir
+ 
+     def library_option(self, lib):
+         return "-l" + lib