Wed Jan 25 19:35:49 2017 UTC ()
Revert config directory naming to include platform name, so sysconfig.get_makefile_filename() works again.


(adam)
diff -r1.1 -r1.2 pkgsrc/lang/python36/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/python36/PLIST
diff -r1.3 -r1.4 pkgsrc/lang/python36/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/python36/patches/patch-configure
cvs diff -r1.1 -r1.2 pkgsrc/lang/python36/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/Makefile 2017/01/01 14:34:27 1.1
+++ pkgsrc/lang/python36/Attic/Makefile 2017/01/25 19:35:49 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1 2017/01/01 14:34:27 adam Exp $ 1# $NetBSD: Makefile,v 1.2 2017/01/25 19:35:49 adam Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python36-${PY_DISTVERSION} 5PKGNAME= python36-${PY_DISTVERSION}
 6PKGREVISION= 1
6CATEGORIES= lang python 7CATEGORIES= lang python
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 10HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 12LICENSE= python-software-foundation
12 13
13CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
14 15
15PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk 16PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk
16PLIST_AWK_ENV+= PYVERS=36 17PLIST_AWK_ENV+= PYVERS=36
17PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.pyc$$/ { 18PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.pyc$$/ {
18PRINT_PLIST_AWK+= sub(/__pycache__\//, "") 19PRINT_PLIST_AWK+= sub(/__pycache__\//, "")
cvs diff -r1.1 -r1.2 pkgsrc/lang/python36/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/PLIST 2017/01/01 14:34:27 1.1
+++ pkgsrc/lang/python36/Attic/PLIST 2017/01/25 19:35:49 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2017/01/01 14:34:27 adam Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/01/25 19:35:49 adam Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/pyvenv-${PY_VER_SUFFIX} 6bin/pyvenv-${PY_VER_SUFFIX}
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/accu.h 10include/python${PY_VER_SUFFIX}/accu.h
11include/python${PY_VER_SUFFIX}/asdl.h 11include/python${PY_VER_SUFFIX}/asdl.h
12include/python${PY_VER_SUFFIX}/ast.h 12include/python${PY_VER_SUFFIX}/ast.h
13include/python${PY_VER_SUFFIX}/bitset.h 13include/python${PY_VER_SUFFIX}/bitset.h
14include/python${PY_VER_SUFFIX}/bltinmodule.h 14include/python${PY_VER_SUFFIX}/bltinmodule.h
@@ -312,37 +312,37 @@ lib/python${PY_VER_SUFFIX}/concurrent/__ @@ -312,37 +312,37 @@ lib/python${PY_VER_SUFFIX}/concurrent/__
312lib/python${PY_VER_SUFFIX}/concurrent/__init__.pyo 312lib/python${PY_VER_SUFFIX}/concurrent/__init__.pyo
313lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.py 313lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.py
314lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.pyc 314lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.pyc
315lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.pyo 315lib/python${PY_VER_SUFFIX}/concurrent/futures/__init__.pyo
316lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.py 316lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.py
317lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.pyc 317lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.pyc
318lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.pyo 318lib/python${PY_VER_SUFFIX}/concurrent/futures/_base.pyo
319lib/python${PY_VER_SUFFIX}/concurrent/futures/process.py 319lib/python${PY_VER_SUFFIX}/concurrent/futures/process.py
320lib/python${PY_VER_SUFFIX}/concurrent/futures/process.pyc 320lib/python${PY_VER_SUFFIX}/concurrent/futures/process.pyc
321lib/python${PY_VER_SUFFIX}/concurrent/futures/process.pyo 321lib/python${PY_VER_SUFFIX}/concurrent/futures/process.pyo
322lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.py 322lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.py
323lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyc 323lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyc
324lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyo 324lib/python${PY_VER_SUFFIX}/concurrent/futures/thread.pyo
325lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Makefile 325lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Makefile
326lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup 326lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup
327lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup.config 327lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup.config
328lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/Setup.local 328lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/Setup.local
329lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/config.c 329lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/config.c
330lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/config.c.in 330lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/config.c.in
331lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/install-sh 331lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/install-sh
332lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/libpython${PY_VER_SUFFIX}.a 332lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/libpython${PY_VER_SUFFIX}.a
333lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/makesetup 333lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/makesetup
334lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python-config.py 334lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/python-config.py
335lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}/python.o 335lib/python${PY_VER_SUFFIX}/config-${PY_VER_SUFFIX}-${PY_PLATNAME}/python.o
336lib/python${PY_VER_SUFFIX}/configparser.py 336lib/python${PY_VER_SUFFIX}/configparser.py
337lib/python${PY_VER_SUFFIX}/configparser.pyc 337lib/python${PY_VER_SUFFIX}/configparser.pyc
338lib/python${PY_VER_SUFFIX}/configparser.pyo 338lib/python${PY_VER_SUFFIX}/configparser.pyo
339lib/python${PY_VER_SUFFIX}/contextlib.py 339lib/python${PY_VER_SUFFIX}/contextlib.py
340lib/python${PY_VER_SUFFIX}/contextlib.pyc 340lib/python${PY_VER_SUFFIX}/contextlib.pyc
341lib/python${PY_VER_SUFFIX}/contextlib.pyo 341lib/python${PY_VER_SUFFIX}/contextlib.pyo
342lib/python${PY_VER_SUFFIX}/copy.py 342lib/python${PY_VER_SUFFIX}/copy.py
343lib/python${PY_VER_SUFFIX}/copy.pyc 343lib/python${PY_VER_SUFFIX}/copy.pyc
344lib/python${PY_VER_SUFFIX}/copy.pyo 344lib/python${PY_VER_SUFFIX}/copy.pyo
345lib/python${PY_VER_SUFFIX}/copyreg.py 345lib/python${PY_VER_SUFFIX}/copyreg.py
346lib/python${PY_VER_SUFFIX}/copyreg.pyc 346lib/python${PY_VER_SUFFIX}/copyreg.pyc
347lib/python${PY_VER_SUFFIX}/copyreg.pyo 347lib/python${PY_VER_SUFFIX}/copyreg.pyo
348lib/python${PY_VER_SUFFIX}/crypt.py 348lib/python${PY_VER_SUFFIX}/crypt.py
cvs diff -r1.3 -r1.4 pkgsrc/lang/python36/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/distinfo 2017/01/05 23:16:42 1.3
+++ pkgsrc/lang/python36/Attic/distinfo 2017/01/25 19:35:49 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.3 2017/01/05 23:16:42 roy Exp $ 1$NetBSD: distinfo,v 1.4 2017/01/25 19:35:49 adam Exp $
2 2
3SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c 3SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
4RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af 4RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
5SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2 5SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2
6Size (Python-3.6.0.tar.xz) = 16805836 bytes 6Size (Python-3.6.0.tar.xz) = 16805836 bytes
7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d 7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
8SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341 8SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
9SHA1 (patch-Lib_distutils_sysconfig.py) = 23d8e9e63924e0b7be21355bd83d20eff25c9c21 9SHA1 (patch-Lib_distutils_sysconfig.py) = 23d8e9e63924e0b7be21355bd83d20eff25c9c21
10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9 10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
11SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a 11SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a
12SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553 12SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553
13SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593 13SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
14SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567 14SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
15SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d 15SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
16SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 16SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
17SHA1 (patch-configure) = 0c1d33440105d08c3a1564a5b47a35f5f7e5ecf8 17SHA1 (patch-configure) = 7bbebbb5716a0740035b5028434154d4d4ccfc88
18SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b 18SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b
cvs diff -r1.1 -r1.2 pkgsrc/lang/python36/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/python36/patches/Attic/patch-configure 2017/01/01 14:34:27 1.1
+++ pkgsrc/lang/python36/patches/Attic/patch-configure 2017/01/25 19:35:49 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure,v 1.1 2017/01/01 14:34:27 adam Exp $ 1$NetBSD: patch-configure,v 1.2 2017/01/25 19:35:49 adam Exp $
2 2
3Simplify _sysconfigdata to include only platform name. 3Simplify _sysconfigdata to include only platform name.
4 4
5MirBSD support 5MirBSD support
6http://bugs.python.org/issue21458 6http://bugs.python.org/issue21458
7 7
8Changes for consistency across pkgsrc platforms. 8Changes for consistency across pkgsrc platforms.
9 9
10Fix linking on Darwin. 10Fix linking on Darwin.
11 11
12--- configure.orig 2016-12-23 02:21:22.000000000 +0000 12--- configure.orig 2016-12-23 02:21:22.000000000 +0000
13+++ configure 13+++ configure
14@@ -2928,7 +2928,7 @@ $as_echo_n "checking for python interpre 14@@ -2928,7 +2928,7 @@ $as_echo_n "checking for python interpre
@@ -89,25 +89,13 @@ Fix linking on Darwin. @@ -89,25 +89,13 @@ Fix linking on Darwin.
89+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) 89+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
90 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] 90 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
91 then 91 then
92 LINKFORSHARED="-Wl,--export-dynamic" 92 LINKFORSHARED="-Wl,--export-dynamic"
93@@ -14882,8 +14885,6 @@ $as_echo "$SOABI" >&6; } 93@@ -14882,8 +14885,6 @@ $as_echo "$SOABI" >&6; }
94  94
95  95
96 case $ac_sys_system in 96 case $ac_sys_system in
97- Linux*|GNU*|Darwin) 97- Linux*|GNU*|Darwin)
98- EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};; 98- EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
99 *) 99 *)
100 EXT_SUFFIX=${SHLIB_SUFFIX};; 100 EXT_SUFFIX=${SHLIB_SUFFIX};;
101 esac 101 esac
102@@ -14895,11 +14896,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)' 
103 $as_echo "$LDVERSION" >&6; } 
104  
105  
106-if test x$PLATFORM_TRIPLET = x; then 
107 LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" 
108-else 
109- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" 
110-fi 
111  
112  
113 # Check whether right shifting a negative integer extends the sign bit