head 1.11; access; symbols pkgsrc-2016Q2:1.10.0.10 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.8 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.6 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.4 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.2 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.9.0.8 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.6 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.4 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.2 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.5.0.2 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.4.0.4 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.2 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.3.0.2 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2; locks; strict; comment @# @; 1.11 date 2016.07.09.13.04.40; author wiz; state dead; branches; next 1.10; commitid SyRfhtrpAsjObEdz; 1.10 date 2015.04.24.03.24.32; author rodent; state Exp; branches; next 1.9; commitid 9Gn5EBfBfVHvbNiy; 1.9 date 2014.05.31.12.46.28; author ryoon; state Exp; branches; next 1.8; commitid lPiCkvpjStJ3QGCx; 1.8 date 2014.05.10.04.32.36; author obache; state Exp; branches; next 1.7; commitid BYZ5tUwJi0u3MWzx; 1.7 date 2014.05.09.16.33.29; author adam; state Exp; branches; next 1.6; commitid H9yvSDiTUr5QNSzx; 1.6 date 2014.05.09.02.29.10; author obache; state Exp; branches; next 1.5; commitid 6IL4IAHgJSCH7Ozx; 1.5 date 2014.03.27.08.50.01; author obache; state Exp; branches; next 1.4; commitid fnKyLGSQ8XzXBjux; 1.4 date 2013.08.02.07.03.50; author adam; state Exp; branches; next 1.3; commitid I05ngGSZJifXCQZw; 1.3 date 2013.05.26.17.56.09; author wiz; state Exp; branches; next 1.2; commitid bJwtFZkv9ntHraRw; 1.2 date 2012.12.13.18.13.59; author jperkin; state Exp; branches; next 1.1; 1.1 date 2012.12.10.03.15.49; author tsarna; state Exp; branches; next ; desc @@ 1.11 log @Remove python33. @ text @$NetBSD: patch-am,v 1.10 2015/04/24 03:24:32 rodent Exp $ --- setup.py.orig 2014-10-12 07:03:54.000000000 +0000 +++ setup.py @@@@ -31,7 +31,8 @@@@ host_platform = get_platform() COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", +"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (after any relative @@@@ -435,15 +436,15 @@@@ class PyBuildExt(build_ext): os.unlink(tmpfile) def detect_modules(self): - # Ensure that /usr/local is always used, but the local build - # directories (i.e. '.' and 'Include') must be first. See issue - # 10520. - if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: - self.add_gcc_paths() + # Add the buildlink directories for pkgsrc + if os.environ.get('BUILDLINK_DIR'): + dir = os.environ['BUILDLINK_DIR'] + libdir = dir + '/lib' + incdir = dir + '/include' + if libdir not in self.compiler.library_dirs: + self.compiler.library_dirs.insert(0, libdir) + if incdir not in self.compiler.include_dirs: + self.compiler.include_dirs.insert(0, incdir) self.add_multiarch_paths() # Add paths specified in the environment variables LDFLAGS and @@@@ -741,8 +742,7 @@@@ class PyBuildExt(build_ext): depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ - '/usr/local/ssl/include', - '/usr/contrib/ssl/include/' + '@@SSLBASE@@/include' ] ssl_incs = find_file('openssl/ssl.h', inc_dirs, search_for_ssl_incs_in @@@@ -753,9 +753,7 @@@@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) + [] ) if (ssl_incs is not None and ssl_libs is not None): @@@@ -774,7 +772,7 @@@@ class PyBuildExt(build_ext): # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], - inc_dirs + search_for_ssl_incs_in) + search_for_ssl_incs_in + inc_dirs) if opensslv_h: name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') if host_platform == 'darwin' and is_macosx_sdk_path(name): @@@@ -1137,6 +1135,30 @@@@ class PyBuildExt(build_ext): dbm_order = ['gdbm'] # The standard Unix dbm module: if host_platform not in ['cygwin']: + + ## Top half based on find_file + def find_ndbm_h(dirs): + ret = None + if sys.platform == 'darwin': + sysroot = macosx_sdk_root() + for dir in dirs: + f = os.path.join(dir, 'ndbm.h') + if sys.platform == 'darwin' and is_macosx_sdk_path(dir): + f = os.path.join(sysroot, dir[1:], 'ndbm.h') + if not os.path.exists(f): continue + + ret = 'True' + input = text_file.TextFile(f) + while 1: + line = input.readline() + if not line: break + if re.search('This file is part of GDBM', line): + ret = None + break + input.close() + break + return ret + config_args = [arg.strip("'") for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] dbm_args = [arg for arg in config_args @@@@ -1148,7 +1170,7 @@@@ class PyBuildExt(build_ext): dbmext = None for cand in dbm_order: if cand == "ndbm": - if find_file("ndbm.h", inc_dirs, []) is not None: + if find_ndbm_h(inc_dirs) is not None: # Some systems have -lndbm, others have -lgdbm_compat, # others don't have either if self.compiler.find_library_file(lib_dirs, @@@@ -1476,6 +1498,10 @@@@ class PyBuildExt(build_ext): macros = dict() libraries = [] + elif host_platform.startswith('dragonfly'): + macros = dict() + libraries = [] + else: # Linux and other unices macros = dict() libraries = ['rt'] @@@@ -1949,10 +1975,7 @@@@ class PyBuildExt(build_ext): depends = ['_decimal/docstrings.h'] else: srcdir = sysconfig.get_config_var('srcdir') - include_dirs = [os.path.abspath(os.path.join(srcdir, - 'Modules', - '_decimal', - 'libmpdec'))] + include_dirs = ['Modules/_decimal/libmpdec'] libraries = [] sources = [ '_decimal/_decimal.c', @@@@ -2198,7 +2221,7 @@@@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in - scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", + scripts = ["Tools/scripts/pydoc3", "Tools/scripts/2to3", "Tools/scripts/pyvenv"] ) @ 1.10 log @Fix build with LibreSSL. From: https://hg.python.org/cpython/rev/6f23bc5d480e and defuzz patches. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $ @ 1.9 log @Fix _multiprocessing import under DragonFly/amd64, fix packaging @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.8 2014/05/10 04:32:36 obache Exp $ d3 1 a3 1 --- setup.py.orig 2014-03-09 08:40:35.000000000 +0000 d70 1 a70 1 @@@@ -1138,6 +1136,30 @@@@ class PyBuildExt(build_ext): d101 1 a101 1 @@@@ -1149,7 +1171,7 @@@@ class PyBuildExt(build_ext): d110 1 a110 1 @@@@ -1477,6 +1499,10 @@@@ class PyBuildExt(build_ext): d121 1 a121 1 @@@@ -1950,10 +1976,7 @@@@ class PyBuildExt(build_ext): d133 1 a133 1 @@@@ -2199,7 +2222,7 @@@@ def main(): @ 1.8 log @fixes again, for the case pkgsrc openssl is prefered than builtin old openssl. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.7 2014/05/09 16:33:29 adam Exp $ d110 1 a110 1 @@@@ -1477,6 +1499,14 @@@@ class PyBuildExt(build_ext): d115 1 a115 5 + macros = dict( + HAVE_SEM_OPEN=0, + HAVE_SEM_TIMEDWAIT=0, + HAVE_FD_TRANSFER=1, + ) d121 1 a121 1 @@@@ -1950,10 +1980,7 @@@@ class PyBuildExt(build_ext): d133 1 a133 1 @@@@ -2199,7 +2226,7 @@@@ def main(): @ 1.7 log @Fix building on OS X @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.6 2014/05/09 02:29:10 obache Exp $ d61 9 @ 1.6 log @Restrict to find openssl header files in SSLBASE/include. Fixes unwanted detection of builtin openssl over prefered pkgsrc one. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.5 2014/03/27 08:50:01 obache Exp $ a60 9 @@@@ -774,7 +772,7 @@@@ class PyBuildExt(build_ext): # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], - inc_dirs + search_for_ssl_incs_in) + search_for_ssl_incs_in) if opensslv_h: name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') if host_platform == 'darwin' and is_macosx_sdk_path(name): @ 1.5 log @Disable spwd module, same as other python version. It is provided as devel/py-spwd in pkgsrc. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.4 2013/08/02 07:03:50 adam Exp $ d3 1 a3 1 --- setup.py.orig 2013-05-15 16:33:00.000000000 +0000 d40 11 a50 1 @@@@ -753,9 +754,7 @@@@ class PyBuildExt(build_ext): d61 10 a70 1 @@@@ -1138,6 +1137,30 @@@@ class PyBuildExt(build_ext): d101 1 a101 1 @@@@ -1149,7 +1172,7 @@@@ class PyBuildExt(build_ext): d110 1 a110 1 @@@@ -1475,6 +1498,14 @@@@ class PyBuildExt(build_ext): d125 1 a125 1 @@@@ -1906,10 +1937,7 @@@@ class PyBuildExt(build_ext): d137 1 a137 1 @@@@ -2155,7 +2183,7 @@@@ def main(): @ 1.4 log @Fixes: * building some modules (lzma) on Darwin (use PREFIX, instead of /usr/local, to look for libraries) * building decimal module on certain enviroments (use relative path to look for includes, as absolute path might get rejected by a wrapper) @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 +"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "xxlimited"] @ 1.3 log @Update to 3.3.2: 3.3.2 This release fixes a few regressions found in Python 3.3.1. Complete list at http://docs.python.org/release/3.3.2/whatsnew/changelog.html 3.3.1 This is a 3.3 series bugfix release. It includes hundreds of bugfixes over 3.3.0. Complete list at http://docs.python.org/release/3.3.1/whatsnew/changelog.html @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $ d106 13 a118 1 @@@@ -2155,7 +2186,7 @@@@ def main(): @ 1.2 log @Fix syntax error. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2012/12/10 03:15:49 tsarna Exp $ d3 3 a5 3 --- setup.py.orig 2012-09-29 04:00:50.000000000 -0400 +++ setup.py 2012-12-09 19:06:51.000000000 -0500 @@@@ -31,7 +31,8 @@@@ d13 3 a15 3 # File which contains the directory for shared mods (for sys.path fixup # when running from the build dir, see Modules/getpath.c) @@@@ -455,15 +456,15 @@@@ d40 1 a40 1 @@@@ -770,9 +771,7 @@@@ d51 1 a51 1 @@@@ -1155,6 +1154,30 @@@@ d82 1 a82 1 @@@@ -1166,7 +1189,7 @@@@ d91 1 a91 1 @@@@ -1476,6 +1499,14 @@@@ d106 1 a106 1 @@@@ -2143,7 +2174,7 @@@@ @ 1.1 log @Add Python 3.3.0 @ text @d1 1 a1 1 $NetBSD$ d95 1 a95 1 + elif platform.startswith('dragonfly'): @