5 files changed, 34 insertions, 31 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index d9e1c0c8ce0..49568933573 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2016/05/26 04:07:32 dholland Exp $
+# $NetBSD: Makefile,v 1.60.2.1 2016/09/06 19:04:27 bsiegert Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index 5fb2ceb8757..472d166c561 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.14 2015/12/06 18:22:35 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.14.6.1 2016/09/06 19:04:27 bsiegert 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-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
@@ -1730,12 +1730,18 @@ 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.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_editmenu.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
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_helpabout.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyc
 lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_hyperparser.pyo
@@ -2715,13 +2721,12 @@ 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_nocaret.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/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/check_soundcard.vbs
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
@@ -2920,7 +2925,6 @@ 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/greyrgb.uue
-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
@@ -3244,9 +3248,6 @@ lib/python${PY_VER_SUFFIX}/test/test_codecs.pyo
 lib/python${PY_VER_SUFFIX}/test/test_codeop.py
 lib/python${PY_VER_SUFFIX}/test/test_codeop.pyc
 lib/python${PY_VER_SUFFIX}/test/test_codeop.pyo
-lib/python${PY_VER_SUFFIX}/test/test_coding.py
-lib/python${PY_VER_SUFFIX}/test/test_coding.pyc
-lib/python${PY_VER_SUFFIX}/test/test_coding.pyo
 lib/python${PY_VER_SUFFIX}/test/test_coercion.py
 lib/python${PY_VER_SUFFIX}/test/test_coercion.pyc
 lib/python${PY_VER_SUFFIX}/test/test_coercion.pyo
@@ -3762,6 +3763,9 @@ 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.py
+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
@@ -3780,15 +3784,9 @@ lib/python${PY_VER_SUFFIX}/test/test_peepholer.pyo
 lib/python${PY_VER_SUFFIX}/test/test_pep247.py
 lib/python${PY_VER_SUFFIX}/test/test_pep247.pyc
 lib/python${PY_VER_SUFFIX}/test/test_pep247.pyo
-lib/python${PY_VER_SUFFIX}/test/test_pep263.py
-lib/python${PY_VER_SUFFIX}/test/test_pep263.pyc
-lib/python${PY_VER_SUFFIX}/test/test_pep263.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_pep352.py
 lib/python${PY_VER_SUFFIX}/test/test_pep352.pyc
 lib/python${PY_VER_SUFFIX}/test/test_pep352.pyo
@@ -3972,6 +3970,9 @@ lib/python${PY_VER_SUFFIX}/test/test_softspace.pyo
 lib/python${PY_VER_SUFFIX}/test/test_sort.py
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyc
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyo
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.py
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyc
+lib/python${PY_VER_SUFFIX}/test/test_source_encoding.pyo
 lib/python${PY_VER_SUFFIX}/test/test_spwd.py
 lib/python${PY_VER_SUFFIX}/test/test_spwd.pyc
 lib/python${PY_VER_SUFFIX}/test/test_spwd.pyo
@@ -4119,6 +4120,9 @@ 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_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
diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk
index f341c1b59ce..9b66f474fc3 100644
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.11 2015/12/06 18:22:35 adam Exp $
+# $NetBSD: dist.mk,v 1.11.6.1 2016/09/06 19:04:27 bsiegert Exp $
 
-PY_DISTVERSION=	2.7.11
+PY_DISTVERSION=	2.7.12
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python27/distinfo
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index f7d462c6c66..3744538ea06 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.54 2016/02/06 11:25:09 tron Exp $
+$NetBSD: distinfo,v 1.54.4.1 2016/09/06 19:04:27 bsiegert Exp $
 
-SHA1 (Python-2.7.11.tar.xz) = c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff
-RMD160 (Python-2.7.11.tar.xz) = 215c72b1d81e878a675984783ed8df041ee7539c
-SHA512 (Python-2.7.11.tar.xz) = 72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0
-Size (Python-2.7.11.tar.xz) = 12277476 bytes
+SHA1 (Python-2.7.12.tar.xz) = 05360b8ade117b35e266b2004a7f1f11250c6dcd
+RMD160 (Python-2.7.12.tar.xz) = c330f6ac08ed67f307de0e726a288bab16c832d5
+SHA512 (Python-2.7.12.tar.xz) = 6ddbbce47cc49597433d98ca05c2f62f07ed1070807b645602a8e9e9b996adc6fa66fa20a33cd7d23d4e7e925e25071d7301d288149fbe4e8c5f06d5438dda1f
+Size (Python-2.7.12.tar.xz) = 12390820 bytes
 SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
 SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
-SHA1 (patch-Lib_distutils_unixccompiler.py) = def4142633b8f6b75e905b5c57be1d5c19b42d33
+SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
 SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
 SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c
 SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
diff --git a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
index 61eaabaf92d..166256e5e7c 100644
--- a/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
+++ b/lang/python27/patches/patch-Lib_distutils_unixccompiler.py
@@ -1,18 +1,18 @@
-$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3 2015/04/24 03:01:36 rodent Exp $
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.3.10.1 2016/09/06 19:04:27 bsiegert Exp $
 
 * from cygport 2.7.3-dylib.patch
 
---- Lib/distutils/unixccompiler.py.orig	2014-12-10 15:59:34.000000000 +0000
+--- Lib/distutils/unixccompiler.py.orig	2016-06-25 21:49:30.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"
+@@ -84,6 +84,7 @@ class UnixCCompiler(CCompiler):
+     xcode_stub_lib_format = dylib_lib_format
      if sys.platform == "cygwin":
          exe_extension = ".exe"
 +        dylib_lib_extension = ".dll.a"
  
      def preprocess(self, source,
                     output_file=None, macros=None, include_dirs=None,
-@@ -234,10 +235,8 @@ class UnixCCompiler(CCompiler):
+@@ -236,10 +237,8 @@ class UnixCCompiler(CCompiler):
              return ["+s", "-L" + dir]
          elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
              return ["-rpath", dir]