python34: updated to 3.4.8

3.4.8:
This is a bug-fix release.

5 files changed, 29 insertions, 18 deletions

diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index ae7439ac651..58465ed9e51 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2017/12/13 12:54:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2018/02/05 17:35:12 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python34-${PY_DISTVERSION}
-PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python34/PLIST b/lang/python34/PLIST
index d8f601ff60d..1c19798afb9 100644
--- a/lang/python34/PLIST
+++ b/lang/python34/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/12/13 12:54:57 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/02/05 17:35:12 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -317,6 +317,8 @@ lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/install-sh
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/libpython${PY_VER_SUFFIX}.a
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/makesetup
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.py
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.pyc
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.pyo
 lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python.o
 lib/python${PY_VER_SUFFIX}/configparser.py
 lib/python${PY_VER_SUFFIX}/configparser.pyc
@@ -1575,10 +1577,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.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/help.pyo
 lib/python${PY_VER_SUFFIX}/idlelib/help.txt
 lib/python${PY_VER_SUFFIX}/idlelib/idle.bat
 lib/python${PY_VER_SUFFIX}/idlelib/idle.py
@@ -1616,6 +1618,7 @@ 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.py
 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
@@ -1630,10 +1633,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_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
@@ -2646,6 +2648,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/dh1024.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
@@ -3882,10 +3885,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/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
diff --git a/lang/python34/dist.mk b/lang/python34/dist.mk
index e84dfa473de..c28aa0660aa 100644
--- a/lang/python34/dist.mk
+++ b/lang/python34/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.8 2017/08/14 09:20:00 adam Exp $
+# $NetBSD: dist.mk,v 1.9 2018/02/05 17:35:12 adam Exp $
 
-PY_DISTVERSION=	3.4.7
+PY_DISTVERSION=	3.4.8
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python34/distinfo
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index f4fe0652cbb..d81d3b77ce9 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.29 2017/12/13 12:54:57 jperkin Exp $
+$NetBSD: distinfo,v 1.30 2018/02/05 17:35:12 adam Exp $
 
-SHA1 (Python-3.4.7.tar.xz) = 7b05bf099f3f311ba568232d0d03d64e67da9908
-RMD160 (Python-3.4.7.tar.xz) = 8c4cde8603a15cd55b59b665a84efd0e8f9d7553
-SHA512 (Python-3.4.7.tar.xz) = 34d303f510210d7e695f65f69819049bdf71607b100cf4658af4620b14385f2e5acc3363f2e1b573509cca651e91c836ccd4fb00982f061a58e9b5c9504cd060
-Size (Python-3.4.7.tar.xz) = 14511368 bytes
+SHA1 (Python-3.4.8.tar.xz) = 65d62d3f62ade072a84eb64eca4490b940c73542
+RMD160 (Python-3.4.8.tar.xz) = dcdde1eb1917e2fb9bc021288228432b3cb2def4
+SHA512 (Python-3.4.8.tar.xz) = 478552c72efe606cb1993024b81839c51d01f1c949564c007ab2b76016f110e1f7bd418e5de3f4f93b466ce7dbe6583d3c150830d1f28f75e0809625b568a7ec
+Size (Python-3.4.8.tar.xz) = 14576444 bytes
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
+SHA1 (patch-Makefile.pre.in) = 06402b33a01076b6cbea9659f4c6beb4cd0b80f1
 SHA1 (patch-Modules_socketmodule.c) = 3b091755d7c104b5d1fc696a0d4a679ed3565ef4
 SHA1 (patch-Modules_socketmodule.h) = ed334a97c2a6662c5b44b4e50c1b8efcc220fa1f
 SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f
 SHA1 (patch-al) = 5cf4d44d24020a9b6fe41deeb916edbe87a937cb
 SHA1 (patch-am) = 5822927f1c315b4fce5078626efe5418c764665e
 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
-SHA1 (patch-au) = 210a20f828d213680166541114dc3e5d5ff9f510
 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-aw) = bd290417c265846e238660180e60e76c0f5f696a
 SHA1 (patch-pyconfig.h.in) = 1fbd8b94a6317e31a3b9db683db0c2c9c4334713
diff --git a/lang/python34/patches/patch-au b/lang/python34/patches/patch-Makefile.pre.in
index bb4a12491f9..997fec117b2 100644
--- a/lang/python34/patches/patch-au
+++ b/lang/python34/patches/patch-Makefile.pre.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-au,v 1.3 2017/12/13 12:54:57 jperkin Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.1 2018/02/05 17:35:12 adam Exp $
 
 Do not build/install libpython3.so.
+Swap targets libinstall and libainstall, to byte-compile python-config.py.
 
 --- Makefile.pre.in.orig	2017-08-09 07:08:33.000000000 +0000
 +++ Makefile.pre.in
@@ -40,6 +41,15 @@ Do not build/install libpython3.so.
  
  Python/frozen.o: Python/importlib.h
  
+@@ -1007,7 +1007,7 @@ altinstall: commoninstall
+ 	fi
+ 
+ commoninstall:  @FRAMEWORKALTINSTALLFIRST@ \
+-		altbininstall libinstall inclinstall libainstall \
++		altbininstall libainstall inclinstall libinstall \
+ 		sharedinstall oldsharedinstall altmaninstall \
+ 		@FRAMEWORKALTINSTALLLAST@
+ 
 @@ -1066,7 +1066,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \