Revert config directory naming to include platform name, so sysconfig.get_makefile_filename() works again.

4 files changed, 17 insertions, 28 deletions

diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index f0553a5d87d..6784433df30 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/01/01 14:34:27 adam Exp $
+# $NetBSD: Makefile,v 1.2 2017/01/25 19:35:49 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python36-${PY_DISTVERSION}
+PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python36/PLIST b/lang/python36/PLIST
index 2d850ce55cc..263acc4b77d 100644
--- a/lang/python36/PLIST
+++ b/lang/python36/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/01/01 14:34:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/01/25 19:35:49 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}/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}/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}/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 96059529f14..7938db90858 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2017/01/05 23:16:42 roy Exp $
+$NetBSD: distinfo,v 1.4 2017/01/25 19:35:49 adam Exp $
 
 SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
 RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
@@ -14,5 +14,5 @@ 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) = 0c1d33440105d08c3a1564a5b47a35f5f7e5ecf8
+SHA1 (patch-configure) = 7bbebbb5716a0740035b5028434154d4d4ccfc88
 SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b
diff --git a/lang/python36/patches/patch-configure b/lang/python36/patches/patch-configure
index 1d5ee042074..95d91933faf 100644
--- a/lang/python36/patches/patch-configure
+++ b/lang/python36/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2017/01/01 14:34:27 adam Exp $
+$NetBSD: patch-configure,v 1.2 2017/01/25 19:35:49 adam Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -99,15 +99,3 @@ Fix linking on Darwin.
      *)
  	EXT_SUFFIX=${SHLIB_SUFFIX};;
  esac
-@@ -14895,11 +14896,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
- $as_echo "$LDVERSION" >&6; }
- 
- 
--if test x$PLATFORM_TRIPLET = x; then
-   LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
--else
--  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
--fi
- 
- 
- # Check whether right shifting a negative integer extends the sign bit