Thu Jan 26 09:45:23 2017 UTC ()
Remove obsolete bsddb bits carried over from python2.  Patch from jcea in
joyent/pkgsrc#457.


(jperkin)
diff -r1.18 -r1.19 pkgsrc/lang/python34/Makefile
diff -r1.24 -r1.25 pkgsrc/lang/python34/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/python34/patches/patch-am
diff -r1.7 -r1.8 pkgsrc/lang/python35/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/python35/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/python35/patches/patch-setup.py
diff -r1.3 -r1.4 pkgsrc/lang/python36/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/python36/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/python36/patches/patch-setup.py
cvs diff -r1.18 -r1.19 pkgsrc/lang/python34/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python34/Attic/Makefile 2017/01/19 01:25:09 1.18
+++ pkgsrc/lang/python34/Attic/Makefile 2017/01/26 09:45:23 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2017/01/19 01:25:09 wen Exp $ 1# $NetBSD: Makefile,v 1.19 2017/01/26 09:45:23 jperkin Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python34-${PY_DISTVERSION} 5PKGNAME= python34-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 9HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 10COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -67,51 +67,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -67,51 +67,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
67# ossaudiodev is only available on x86 for the following platforms 67# ossaudiodev is only available on x86 for the following platforms
68PLIST_VARS+= oss 68PLIST_VARS+= oss
69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
71PLIST.oss= yes 71PLIST.oss= yes
72.endif 72.endif
73 73
74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
75# certain modules will not be built. 75# certain modules will not be built.
76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
78.endif 78.endif
79 79
80PLIST_VARS+= bsddb dll nis no-nis 80PLIST_VARS+= dll nis no-nis
81.if ${OPSYS} == "IRIX" 81.if ${OPSYS} == "IRIX"
82. if ${ABI} == "64" 82. if ${ABI} == "64"
83PLIST.no-nis= yes 83PLIST.no-nis= yes
84. else 84. else
85PLIST.nis= yes 85PLIST.nis= yes
86. endif 86. endif
87.else 87.else
88. include "../../mk/bdb.buildlink3.mk" 
89MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 
90MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} 
91MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 
92PLIST.bsddb= yes 
93PLIST.dll= yes 88PLIST.dll= yes
94. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 89. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
95PLIST.nis= yes 90PLIST.nis= yes
96. else 91. else
97PLIST.no-nis= yes 92PLIST.no-nis= yes
98. endif 93. endif
99.endif 94.endif
100 95
101.if defined(BUILDLINK_TRANSFORM) 
102MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 
103.endif 
104 
105PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 96PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
106 97
107PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 98PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
108PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 99PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
109 "python$${PY_VER_SUFFIX}") } 100 "python$${PY_VER_SUFFIX}") }
110 101
111TEST_TARGET= test 102TEST_TARGET= test
112INSTALL_TARGET= altinstall 103INSTALL_TARGET= altinstall
113 104
114REPLACE_INTERPRETER+= py34 105REPLACE_INTERPRETER+= py34
115REPLACE.py34.old= .*python[^ ]* 106REPLACE.py34.old= .*python[^ ]*
116REPLACE.py34.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 107REPLACE.py34.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
117REPLACE_FILES.py34= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py 108REPLACE_FILES.py34= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
cvs diff -r1.24 -r1.25 pkgsrc/lang/python34/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python34/Attic/distinfo 2017/01/19 01:25:09 1.24
+++ pkgsrc/lang/python34/Attic/distinfo 2017/01/26 09:45:23 1.25
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.24 2017/01/19 01:25:09 wen Exp $ 1$NetBSD: distinfo,v 1.25 2017/01/26 09:45:23 jperkin Exp $
2 2
3SHA1 (Python-3.4.6.tar.xz) = ef7dbec63d45760701534990511d686e3acbbe4f 3SHA1 (Python-3.4.6.tar.xz) = ef7dbec63d45760701534990511d686e3acbbe4f
4RMD160 (Python-3.4.6.tar.xz) = a669de69e6728141a6c960877c486c1f094b560d 4RMD160 (Python-3.4.6.tar.xz) = a669de69e6728141a6c960877c486c1f094b560d
5SHA512 (Python-3.4.6.tar.xz) = f6785cf6a99a8a27823baefe59cc20e34cbec01bb444c8600e7f49b5437159d5137f9d80fce26e219846d71bfe98f68bc6f0c87719a34db0050a4eaca95959ac 5SHA512 (Python-3.4.6.tar.xz) = f6785cf6a99a8a27823baefe59cc20e34cbec01bb444c8600e7f49b5437159d5137f9d80fce26e219846d71bfe98f68bc6f0c87719a34db0050a4eaca95959ac
6Size (Python-3.4.6.tar.xz) = 14473592 bytes 6Size (Python-3.4.6.tar.xz) = 14473592 bytes
7SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57 7SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
8SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d 8SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
9SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f 9SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f
10SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f 10SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f
11SHA1 (patch-am) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f 11SHA1 (patch-am) = 5822927f1c315b4fce5078626efe5418c764665e
12SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 12SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
13SHA1 (patch-au) = b593d64b34531fdd5a936d109854d80e969f1847 13SHA1 (patch-au) = b593d64b34531fdd5a936d109854d80e969f1847
14SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 14SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
15SHA1 (patch-aw) = bd290417c265846e238660180e60e76c0f5f696a 15SHA1 (patch-aw) = bd290417c265846e238660180e60e76c0f5f696a
16SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 16SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
cvs diff -r1.6 -r1.7 pkgsrc/lang/python34/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python34/patches/Attic/patch-am 2014/06/01 10:11:29 1.6
+++ pkgsrc/lang/python34/patches/Attic/patch-am 2017/01/26 09:45:23 1.7
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-am,v 1.6 2014/06/01 10:11:29 wiz Exp $ 1$NetBSD: patch-am,v 1.7 2017/01/26 09:45:23 jperkin Exp $
2 2
3--- setup.py.orig 2014-03-17 02:31:31.000000000 +0000 3--- setup.py.orig 2014-03-17 02:31:31.000000000 +0000
4+++ setup.py 4+++ setup.py
5@@ -33,7 +33,8 @@ host_platform = get_platform() 5@@ -33,7 +33,8 @@ host_platform = get_platform()
6 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) 6 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
7  7
8 # This global variable is used to hold the list of modules to be disabled. 8 # This global variable is used to hold the list of modules to be disabled.
9-disabled_module_list = [] 9-disabled_module_list = []
10+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", 10+disabled_module_list = ["_curses", "_curses_panel", "_elementtree",
11+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"] 11+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"]
12  12
13 def add_dir_to_list(dirlist, dir): 13 def add_dir_to_list(dirlist, dir):
14 """Add the directory 'dir' to the list 'dirlist' (after any relative 14 """Add the directory 'dir' to the list 'dirlist' (after any relative
15@@ -441,15 +442,15 @@ class PyBuildExt(build_ext): 15@@ -441,15 +442,15 @@ class PyBuildExt(build_ext):
16 os.unlink(tmpfile) 16 os.unlink(tmpfile)
17  17
18 def detect_modules(self): 18 def detect_modules(self):
19- # Ensure that /usr/local is always used, but the local build 19- # Ensure that /usr/local is always used, but the local build
20- # directories (i.e. '.' and 'Include') must be first. See issue 20- # directories (i.e. '.' and 'Include') must be first. See issue
21- # 10520. 21- # 10520.
22- if not cross_compiling: 22- if not cross_compiling:
23- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 23- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
cvs diff -r1.7 -r1.8 pkgsrc/lang/python35/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/Makefile 2017/01/19 13:55:53 1.7
+++ pkgsrc/lang/python35/Attic/Makefile 2017/01/26 09:45:23 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2017/01/19 13:55:53 wen Exp $ 1# $NetBSD: Makefile,v 1.8 2017/01/26 09:45:23 jperkin Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python35-${PY_DISTVERSION} 5PKGNAME= python35-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 9HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 10COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -67,51 +67,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -67,51 +67,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
67# ossaudiodev is only available on x86 for the following platforms 67# ossaudiodev is only available on x86 for the following platforms
68PLIST_VARS+= oss 68PLIST_VARS+= oss
69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
71PLIST.oss= yes 71PLIST.oss= yes
72.endif 72.endif
73 73
74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
75# certain modules will not be built. 75# certain modules will not be built.
76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
78.endif 78.endif
79 79
80PLIST_VARS+= bsddb dll nis no-nis 80PLIST_VARS+= dll nis no-nis
81.if ${OPSYS} == "IRIX" 81.if ${OPSYS} == "IRIX"
82. if ${ABI} == "64" 82. if ${ABI} == "64"
83PLIST.no-nis= yes 83PLIST.no-nis= yes
84. else 84. else
85PLIST.nis= yes 85PLIST.nis= yes
86. endif 86. endif
87.else 87.else
88. include "../../mk/bdb.buildlink3.mk" 
89MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 
90MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} 
91MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 
92PLIST.bsddb= yes 
93PLIST.dll= yes 88PLIST.dll= yes
94. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 89. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
95PLIST.nis= yes 90PLIST.nis= yes
96. else 91. else
97PLIST.no-nis= yes 92PLIST.no-nis= yes
98. endif 93. endif
99.endif 94.endif
100 95
101.if defined(BUILDLINK_TRANSFORM) 
102MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 
103.endif 
104 
105PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 96PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
106 97
107PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 98PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
108PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 99PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
109 "python$${PY_VER_SUFFIX}") } 100 "python$${PY_VER_SUFFIX}") }
110 101
111TEST_TARGET= test 102TEST_TARGET= test
112INSTALL_TARGET= altinstall 103INSTALL_TARGET= altinstall
113 104
114REPLACE_INTERPRETER+= py35 105REPLACE_INTERPRETER+= py35
115REPLACE.py35.old= .*python[^ ]* 106REPLACE.py35.old= .*python[^ ]*
116REPLACE.py35.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 107REPLACE.py35.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
117REPLACE_FILES.py35= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py 108REPLACE_FILES.py35= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
cvs diff -r1.9 -r1.10 pkgsrc/lang/python35/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/distinfo 2017/01/19 13:55:53 1.9
+++ pkgsrc/lang/python35/Attic/distinfo 2017/01/26 09:45:23 1.10
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.9 2017/01/19 13:55:53 wen Exp $ 1$NetBSD: distinfo,v 1.10 2017/01/26 09:45:23 jperkin Exp $
2 2
3SHA1 (Python-3.5.3.tar.xz) = 127121fdca11e735b3686e300d66f73aba663e93 3SHA1 (Python-3.5.3.tar.xz) = 127121fdca11e735b3686e300d66f73aba663e93
4RMD160 (Python-3.5.3.tar.xz) = 663ad06b0c4b36e7760f5202e73bc53697f225d2 4RMD160 (Python-3.5.3.tar.xz) = 663ad06b0c4b36e7760f5202e73bc53697f225d2
5SHA512 (Python-3.5.3.tar.xz) = bbcc20e315c63dbc8901d7e7bfa29d4dbdad9335720757d8d679730319fd1d9fcfdb55cf62d620c9b052134170f162c28d653a8af60923185b8932524d827864 5SHA512 (Python-3.5.3.tar.xz) = bbcc20e315c63dbc8901d7e7bfa29d4dbdad9335720757d8d679730319fd1d9fcfdb55cf62d620c9b052134170f162c28d653a8af60923185b8932524d827864
6Size (Python-3.5.3.tar.xz) = 15213396 bytes 6Size (Python-3.5.3.tar.xz) = 15213396 bytes
7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d 7SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
8SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 8SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
9SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419 9SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419
10SHA1 (patch-Makefile.pre.in) = 174e01e44c61c756131f795dc96100a381876fcb 10SHA1 (patch-Makefile.pre.in) = 174e01e44c61c756131f795dc96100a381876fcb
11SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593 11SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
12SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 12SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
13SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a 13SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
14SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 14SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
15SHA1 (patch-configure) = 069f7bb10d98e3616f52859a2cf90c7f5732425e 15SHA1 (patch-configure) = 069f7bb10d98e3616f52859a2cf90c7f5732425e
16SHA1 (patch-setup.py) = 42385e851af583ab5a460f6ca7b73e98697e268e 16SHA1 (patch-setup.py) = 7d8afe5e799c8373fe41fbb65e283e0c6f3967d2
cvs diff -r1.3 -r1.4 pkgsrc/lang/python35/patches/Attic/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/lang/python35/patches/Attic/patch-setup.py 2017/01/19 13:55:53 1.3
+++ pkgsrc/lang/python35/patches/Attic/patch-setup.py 2017/01/26 09:45:23 1.4
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-setup.py,v 1.3 2017/01/19 13:55:53 wen Exp $ 1$NetBSD: patch-setup.py,v 1.4 2017/01/26 09:45:23 jperkin Exp $
2 2
3--- setup.py.orig 2017-01-17 07:57:54.000000000 +0000 3--- setup.py.orig 2017-01-17 07:57:54.000000000 +0000
4+++ setup.py 4+++ setup.py
5@@ -7,7 +7,7 @@ import importlib._bootstrap 5@@ -7,7 +7,7 @@ import importlib._bootstrap
6 import importlib.util 6 import importlib.util
7 import sysconfig 7 import sysconfig
8  8
9-from distutils import log 9-from distutils import log
10+from distutils import log,text_file 10+from distutils import log,text_file
11 from distutils.errors import * 11 from distutils.errors import *
12 from distutils.core import Extension, setup 12 from distutils.core import Extension, setup
13 from distutils.command.build_ext import build_ext 13 from distutils.command.build_ext import build_ext
14@@ -43,7 +43,8 @@ host_platform = get_platform() 14@@ -43,7 +43,8 @@ host_platform = get_platform()
15 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) 15 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
16  16
17 # This global variable is used to hold the list of modules to be disabled. 17 # This global variable is used to hold the list of modules to be disabled.
18-disabled_module_list = [] 18-disabled_module_list = []
19+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", 19+disabled_module_list = ["_curses", "_curses_panel", "_elementtree",
20+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"] 20+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"]
21  21
22 def add_dir_to_list(dirlist, dir): 22 def add_dir_to_list(dirlist, dir):
23 """Add the directory 'dir' to the list 'dirlist' (after any relative 23 """Add the directory 'dir' to the list 'dirlist' (after any relative
24@@ -487,15 +488,15 @@ class PyBuildExt(build_ext): 24@@ -487,15 +488,15 @@ class PyBuildExt(build_ext):
25 return ['m'] 25 return ['m']
26  26
27 def detect_modules(self): 27 def detect_modules(self):
28- # Ensure that /usr/local is always used, but the local build 28- # Ensure that /usr/local is always used, but the local build
29- # directories (i.e. '.' and 'Include') must be first. See issue 29- # directories (i.e. '.' and 'Include') must be first. See issue
30- # 10520. 30- # 10520.
31- if not cross_compiling: 31- if not cross_compiling:
32- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 32- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
cvs diff -r1.3 -r1.4 pkgsrc/lang/python36/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/Makefile 2017/01/26 09:13:27 1.3
+++ pkgsrc/lang/python36/Attic/Makefile 2017/01/26 09:45:23 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2017/01/26 09:13:27 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2017/01/26 09:45:23 jperkin Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python36-${PY_DISTVERSION} 5PKGNAME= python36-${PY_DISTVERSION}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.python.org/ 10HOMEPAGE= http://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -68,51 +68,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -68,51 +68,42 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
68# ossaudiodev is only available on x86 for the following platforms 68# ossaudiodev is only available on x86 for the following platforms
69PLIST_VARS+= oss 69PLIST_VARS+= oss
70.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 70.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
71 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 71 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
72PLIST.oss= yes 72PLIST.oss= yes
73.endif 73.endif
74 74
75# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 75# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
76# certain modules will not be built. 76# certain modules will not be built.
77.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 77.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
78CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 78CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
79.endif 79.endif
80 80
81PLIST_VARS+= bsddb dll nis no-nis 81PLIST_VARS+= dll nis no-nis
82.if ${OPSYS} == "IRIX" 82.if ${OPSYS} == "IRIX"
83. if ${ABI} == "64" 83. if ${ABI} == "64"
84PLIST.no-nis= yes 84PLIST.no-nis= yes
85. else 85. else
86PLIST.nis= yes 86PLIST.nis= yes
87. endif 87. endif
88.else 88.else
89. include "../../mk/bdb.buildlink3.mk" 
90MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 
91MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} 
92MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 
93PLIST.bsddb= yes 
94PLIST.dll= yes 89PLIST.dll= yes
95. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 90. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
96PLIST.nis= yes 91PLIST.nis= yes
97. else 92. else
98PLIST.no-nis= yes 93PLIST.no-nis= yes
99. endif 94. endif
100.endif 95.endif
101 96
102.if defined(BUILDLINK_TRANSFORM) 
103MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 
104.endif 
105 
106PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 97PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
107 98
108PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 99PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
109PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 100PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
110 "python$${PY_VER_SUFFIX}") } 101 "python$${PY_VER_SUFFIX}") }
111 102
112TEST_TARGET= test 103TEST_TARGET= test
113INSTALL_TARGET= altinstall 104INSTALL_TARGET= altinstall
114 105
115REPLACE_INTERPRETER+= py36 106REPLACE_INTERPRETER+= py36
116REPLACE.py36.old= .*python[^ ]* 107REPLACE.py36.old= .*python[^ ]*
117REPLACE.py36.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 108REPLACE.py36.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
118REPLACE_FILES.py36= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py 109REPLACE_FILES.py36= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
cvs diff -r1.6 -r1.7 pkgsrc/lang/python36/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/distinfo 2017/01/26 09:13:27 1.6
+++ pkgsrc/lang/python36/Attic/distinfo 2017/01/26 09:45:23 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.6 2017/01/26 09:13:27 adam Exp $ 1$NetBSD: distinfo,v 1.7 2017/01/26 09:45:23 jperkin 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) = 6822eafb4dfded86d7f7353831816aeb8119e6cf 9SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9 10SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
11SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c 11SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
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) = b3b73638ddd72517f4e80193212a38e0cd991157 17SHA1 (patch-configure) = b3b73638ddd72517f4e80193212a38e0cd991157
18SHA1 (patch-setup.py) = f3fd3c3e5bc2e002dcee8239d153360a7247844b 18SHA1 (patch-setup.py) = 2ac8834ecc4e8bb27e1721e572e06dbfa74fe277
cvs diff -r1.1 -r1.2 pkgsrc/lang/python36/patches/Attic/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/lang/python36/patches/Attic/patch-setup.py 2017/01/01 14:34:27 1.1
+++ pkgsrc/lang/python36/patches/Attic/patch-setup.py 2017/01/26 09:45:23 1.2
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-setup.py,v 1.1 2017/01/01 14:34:27 adam Exp $ 1$NetBSD: patch-setup.py,v 1.2 2017/01/26 09:45:23 jperkin Exp $
2 2
3Disable modules, so they can be built as separate packages. 3Disable modules, so they can be built as separate packages.
4 4
5--- setup.py.orig 2016-12-23 02:21:22.000000000 +0000 5--- setup.py.orig 2016-12-23 02:21:22.000000000 +0000
6+++ setup.py 6+++ setup.py
7@@ -8,6 +8,7 @@ import importlib.util 7@@ -8,6 +8,7 @@ import importlib.util
8 import sysconfig 8 import sysconfig
9  9
10 from distutils import log 10 from distutils import log
11+from distutils import text_file 11+from distutils import text_file
12 from distutils.errors import * 12 from distutils.errors import *
13 from distutils.core import Extension, setup 13 from distutils.core import Extension, setup
14 from distutils.command.build_ext import build_ext 14 from distutils.command.build_ext import build_ext
15@@ -43,7 +44,8 @@ host_platform = get_platform() 15@@ -43,7 +44,8 @@ host_platform = get_platform()
16 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) 16 COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
17  17
18 # This global variable is used to hold the list of modules to be disabled. 18 # This global variable is used to hold the list of modules to be disabled.
19-disabled_module_list = [] 19-disabled_module_list = []
20+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", 20+disabled_module_list = ["_curses", "_curses_panel", "_elementtree",
21+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"] 21+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"]
22  22
23 def add_dir_to_list(dirlist, dir): 23 def add_dir_to_list(dirlist, dir):
24 """Add the directory 'dir' to the list 'dirlist' (after any relative 24 """Add the directory 'dir' to the list 'dirlist' (after any relative
25@@ -487,15 +489,15 @@ class PyBuildExt(build_ext): 25@@ -487,15 +489,15 @@ class PyBuildExt(build_ext):
26 return ['m'] 26 return ['m']
27  27
28 def detect_modules(self): 28 def detect_modules(self):
29- # Ensure that /usr/local is always used, but the local build 29- # Ensure that /usr/local is always used, but the local build
30- # directories (i.e. '.' and 'Include') must be first. See issue 30- # directories (i.e. '.' and 'Include') must be first. See issue
31- # 10520. 31- # 10520.
32- if not cross_compiling: 32- if not cross_compiling:
33- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 33- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')