Again, remove platform name from config path; also remove _multiarch component in get_makefile_filename() to reflect the former change.

6 files changed, 44 insertions, 27 deletions

diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index 6784433df30..b91c1862876 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2017/01/25 19:35:49 adam Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/26 09:13:27 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python36-${PY_DISTVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python36/PLIST b/lang/python36/PLIST
index 263acc4b77d..93c401ae9b7 100644
--- a/lang/python36/PLIST
+++ b/lang/python36/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/01/25 19:35:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/01/26 09:13:27 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -322,17 +322,17 @@ lib/python${PY_VER_SUFFIX}/concurrent/futures/process.pyo
 lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.py
 lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyc
 lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyo
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Makefile
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup.config
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup.local
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/config.c
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/config.c.in
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/install-sh
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/libpython${PY_VER_SUFFIX}.a
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/makesetup
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/python-config.py
-lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/python.o
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup.config
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup.local
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/config.c
+lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/config.c.in
+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.o
 lib/python${PY_VER_SUFFIX}/configparser.py
 lib/python${PY_VER_SUFFIX}/configparser.pyc
 lib/python${PY_VER_SUFFIX}/configparser.pyo
diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index d4f579a987f..0ea65e34f8b 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/01/25 21:40:24 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2017/01/26 09:13:27 adam Exp $
 
 SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
 RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
@@ -6,14 +6,13 @@ SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb
 Size (Python-3.6.0.tar.xz) = 16805836 bytes
 SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
-SHA1 (patch-Lib_distutils_sysconfig.py) = 23d8e9e63924e0b7be21355bd83d20eff25c9c21
+SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
 SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
-SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a
+SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
 SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553
 SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = 49ac8c326f6ff10f44d2be4bc5186ac85ad7f4d7
-SHA1 (patch-configure.ac) = 2051bfa1b1fdabef79cc8825185b156ce6163889
+SHA1 (patch-configure) = b3b73638ddd72517f4e80193212a38e0cd991157
 SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b
diff --git a/lang/python36/patches/patch-Lib_distutils_sysconfig.py b/lang/python36/patches/patch-Lib_distutils_sysconfig.py
index 617930ccfed..c01a00bc4eb 100644
--- a/lang/python36/patches/patch-Lib_distutils_sysconfig.py
+++ b/lang/python36/patches/patch-Lib_distutils_sysconfig.py
@@ -1,10 +1,20 @@
-$NetBSD: patch-Lib_distutils_sysconfig.py,v 1.1 2017/01/01 14:34:27 adam Exp $
+$NetBSD: patch-Lib_distutils_sysconfig.py,v 1.2 2017/01/26 09:13:27 adam Exp $
 
+Remove _multiarch from config path (differs across platforms).
 Simplify _sysconfigdata to include only platform name.
 
---- Lib/distutils/sysconfig.py.orig	2017-01-01 13:54:39.000000000 +0000
+--- Lib/distutils/sysconfig.py.orig	2016-12-23 02:21:19.000000000 +0000
 +++ Lib/distutils/sysconfig.py
-@@ -419,10 +419,8 @@ def _init_posix():
+@@ -242,8 +242,6 @@ def get_makefile_filename():
+         return os.path.join(_sys_home or project_base, "Makefile")
+     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
+     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
+-    if hasattr(sys.implementation, '_multiarch'):
+-        config_file += '-%s' % sys.implementation._multiarch
+     return os.path.join(lib_dir, config_file, 'Makefile')
+ 
+ 
+@@ -419,10 +417,8 @@ def _init_posix():
      """Initialize the module as appropriate for POSIX systems."""
      # _sysconfigdata is generated at build time, see the sysconfig module
      name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
diff --git a/lang/python36/patches/patch-Lib_sysconfig.py b/lang/python36/patches/patch-Lib_sysconfig.py
index 5155e1009fd..86dc1c93963 100644
--- a/lang/python36/patches/patch-Lib_sysconfig.py
+++ b/lang/python36/patches/patch-Lib_sysconfig.py
@@ -1,10 +1,18 @@
-$NetBSD: patch-Lib_sysconfig.py,v 1.1 2017/01/01 14:34:27 adam Exp $
+$NetBSD: patch-Lib_sysconfig.py,v 1.2 2017/01/26 09:13:27 adam Exp $
 
+Remove _multiarch from config path (differs across platforms).
 Simplify _sysconfigdata to include only platform name.
 
---- Lib/sysconfig.py.orig	2017-01-01 13:52:46.000000000 +0000
+--- Lib/sysconfig.py.orig	2016-12-23 02:21:19.000000000 +0000
 +++ Lib/sysconfig.py
-@@ -344,10 +344,8 @@ def get_makefile_filename():
+@@ -337,17 +337,13 @@ def get_makefile_filename():
+         config_dir_name = 'config-%s%s' % (_PY_VERSION_SHORT, sys.abiflags)
+     else:
+         config_dir_name = 'config'
+-    if hasattr(sys.implementation, '_multiarch'):
+-        config_dir_name += '-%s' % sys.implementation._multiarch
+     return os.path.join(get_path('stdlib'), config_dir_name, 'Makefile')
+ 
  
  def _get_sysconfigdata_name():
      return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
diff --git a/lang/python36/patches/patch-configure b/lang/python36/patches/patch-configure
index 71f93f34f10..549e578a38c 100644
--- a/lang/python36/patches/patch-configure
+++ b/lang/python36/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2017/01/25 21:40:24 ryoon Exp $
+$NetBSD: patch-configure,v 1.4 2017/01/26 09:13:27 adam Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -108,7 +108,7 @@ Fix linking on Darwin.
 -else
 -  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
 -fi
-+LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
++LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  
  
  # Check whether right shifting a negative integer extends the sign bit