<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150874] trunk/dports/lang/python32</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150874">150874</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2016-07-31 23:44:08 -0700 (Sun, 31 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>python32: refresh patches, rename a few with "wrong" names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython32Portfile">trunk/dports/lang/python32/Portfile</a></li>
<li><a href="#trunkdportslangpython32filespatchLibdistutilsdistpydiff">trunk/dports/lang/python32/files/patch-Lib-distutils-dist.py.diff</a></li>
<li><a href="#trunkdportslangpython32filespatchconfigurediff">trunk/dports/lang/python32/files/patch-configure.diff</a></li>
<li><a href="#trunkdportslangpython32filespatchlibeditdiff">trunk/dports/lang/python32/files/patch-libedit.diff</a></li>
<li><a href="#trunkdportslangpython32filespatchsetuppydiff">trunk/dports/lang/python32/files/patch-setup.py.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpython32filespatchLibdistutilsutilpy_MacBuildScriptbuildinstallerpyyosemite_python_fixesdiff">trunk/dports/lang/python32/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff</a></li>
<li><a href="#trunkdportslangpython32filespatchLibsitepyomit_local_site_packagesdiff">trunk/dports/lang/python32/files/patch-Lib-site.py-omit_local_site_packages.diff</a></li>
<li><a href="#trunkdportslangpython32filespatchconfigure_configureacyosemite_configure_fixesdiff">trunk/dports/lang/python32/files/patch-configure_configure.ac-yosemite_configure_fixes.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangpython32filesomitlocalsitepackagespatch">trunk/dports/lang/python32/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython32filesyosemiteconfigurefixespatch">trunk/dports/lang/python32/files/yosemite-configure-fixes.patch</a></li>
<li><a href="#trunkdportslangpython32filesyosemitepythonfixespatch">trunk/dports/lang/python32/files/yosemite-python-fixes.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython32Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/Portfile (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/Portfile 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/Portfile 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><span class="cx"> patch-libedit.diff \
</span><del>- omit-local-site-packages.patch
</del><ins>+ patch-Lib-site.py-omit_local_site_packages.diff
</ins><span class="cx">
</span><span class="cx"> # http://bugs.python.org/issue21811
</span><del>-patchfiles-append yosemite-configure-fixes.patch \
- yosemite-python-fixes.patch
</del><ins>+patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
+ patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff
</ins><span class="cx">
</span><span class="cx"> depends_lib port:zlib path:lib/libssl.dylib:openssl \
</span><span class="cx"> port:sqlite3 port:ncurses \
</span></span></pre></div>
<a id="trunkdportslangpython32filesomitlocalsitepackagespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python32/files/omit-local-site-packages.patch (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/omit-local-site-packages.patch 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/omit-local-site-packages.patch 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-Index: Lib/site.py
-===================================================================
---- Lib/site.py.orig
-+++ Lib/site.py
-@@ -292,15 +292,6 @@ def getsitepackages():
- else:
- sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-- if sys.platform == "darwin":
-- # for framework builds *only* we add the standard Apple
-- # locations.
-- from sysconfig import get_config_var
-- framework = get_config_var("PYTHONFRAMEWORK")
-- if framework:
-- sitepackages.append(
-- os.path.join("/Library", framework,
-- sys.version[:3], "site-packages"))
- return sitepackages
-
- def addsitepackages(known_paths):
</del></span></pre></div>
<a id="trunkdportslangpython32filespatchLibdistutilsdistpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/files/patch-Lib-distutils-dist.py.diff (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-Lib-distutils-dist.py.diff 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/patch-Lib-distutils-dist.py.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Lib/distutils/dist.py.orig 2008-07-26 16:09:45.000000000 -0400
-+++ Lib/distutils/dist.py 2009-01-31 11:37:17.000000000 -0500
-@@ -54,6 +54,7 @@
</del><ins>+--- Lib/distutils/dist.py.old 2014-10-12 08:52:02.000000000 +0200
++++ Lib/distutils/dist.py 2016-08-01 06:07:29.000000000 +0200
+@@ -51,6 +51,7 @@ class Distribution:
</ins><span class="cx"> ('quiet', 'q', "run quietly (turns verbosity off)"),
</span><span class="cx"> ('dry-run', 'n', "don't actually do anything"),
</span><span class="cx"> ('help', 'h', "show detailed help message"),
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> # 'common_usage' is a short (2-3 line) string describing the common
</span><del>-@@ -260,6 +261,12 @@
</del><ins>+@@ -258,6 +259,12 @@ Common commands: (see '--help-commands'
</ins><span class="cx"> else:
</span><span class="cx"> sys.stderr.write(msg + "\n")
</span><span class="cx">
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> self.finalize_options()
</span><span class="cx">
</span><span class="cx"> def get_option_dict(self, command):
</span><del>-@@ -315,6 +322,9 @@
</del><ins>+@@ -310,6 +317,9 @@ Common commands: (see '--help-commands'
</ins><span class="cx"> Distutils __inst__.py file lives), a file in the user's home
</span><span class="cx"> directory named .pydistutils.cfg on Unix and pydistutils.cfg
</span><span class="cx"> on Windows/Mac, and setup.cfg in the current directory.
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> """
</span><span class="cx"> files = []
</span><span class="cx"> check_environ()
</span><del>-@@ -335,7 +345,7 @@
</del><ins>+@@ -330,7 +340,7 @@ Common commands: (see '--help-commands'
</ins><span class="cx">
</span><span class="cx"> # And look for the user config file
</span><span class="cx"> user_file = os.path.join(os.path.expanduser('~'), user_filename)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> files.append(user_file)
</span><span class="cx">
</span><span class="cx"> # All platforms support local setup.cfg
</span><del>-@@ -343,6 +353,8 @@
</del><ins>+@@ -338,6 +348,8 @@ Common commands: (see '--help-commands'
</ins><span class="cx"> if os.path.isfile(local_file):
</span><span class="cx"> files.append(local_file)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangpython32filespatchLibdistutilsutilpy_MacBuildScriptbuildinstallerpyyosemite_python_fixesdifffromrev150873trunkdportslangpython32filesyosemitepythonfixespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python32/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff (from rev 150873, trunk/dports/lang/python32/files/yosemite-python-fixes.patch) (0 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff (rev 0)
+++ trunk/dports/lang/python32/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -0,0 +1,154 @@
</span><ins>+Index: Lib/_osx_support.py
+===================================================================
+--- Lib/_osx_support.py.orig
++++ Lib/_osx_support.py
+@@ -444,8 +444,16 @@ def get_platform_osx(_config_vars, osnam
+ # case and disallow installs.
+ cflags = _config_vars.get(_INITPRE+'CFLAGS',
+ _config_vars.get('CFLAGS', ''))
+- if ((macrelease + '.') >= '10.4.' and
+- '-arch' in cflags.strip()):
++ if macrelease:
++ try:
++ macrelease = tuple(int(i) for i in macrelease.split('.')[0:2])
++ except ValueError:
++ macrelease = (10, 0)
++ else:
++ # assume no universal support
++ macrelease = (10, 0)
++
++ if (macrelease >= (10, 4)) and '-arch' in cflags.strip():
+ # The universal build will build fat binaries, but not on
+ # systems before 10.4
+
+Index: Lib/distutils/tests/test_build_ext.py
+===================================================================
+--- Lib/distutils/tests/test_build_ext.py.orig
++++ Lib/distutils/tests/test_build_ext.py
+@@ -448,8 +448,16 @@ class BuildExtTestCase(TempdirManager,
+
+ # get the deployment target that the interpreter was built with
+ target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+- target = tuple(map(int, target.split('.')))
+- target = '%02d%01d0' % target
++ target = tuple(map(int, target.split('.')[0:2]))
++ # format the target value as defined in the Apple
++ # Availability Macros. We can't use the macro names since
++ # at least one value we test with will not exist yet.
++ if target[1] < 10:
++ # for 10.1 through 10.9.x -> "10n0"
++ target = '%02d%01d0' % target
++ else:
++ # for 10.10 and beyond -> "10nn00"
++ target = '%02d%02d00' % target
+ deptarget_ext = Extension(
+ 'deptarget',
+ [deptarget_c],
+Index: Lib/test/test__osx_support.py
+===================================================================
+--- Lib/test/test__osx_support.py.orig
++++ Lib/test/test__osx_support.py
+@@ -109,7 +109,9 @@ class Test_OSXSupport(unittest.TestCase)
+
+ def test__supports_universal_builds(self):
+ import platform
+- self.assertEqual(platform.mac_ver()[0].split('.') >= ['10', '4'],
++ mac_ver_tuple = tuple(int(i) for i in
++ platform.mac_ver()[0].split('.')[0:2])
++ self.assertEqual(mac_ver_tuple >= (10, 4),
+ _osx_support._supports_universal_builds())
+
+ def test__find_appropriate_compiler(self):
+Index: Lib/test/test_posix.py
+===================================================================
+--- Lib/test/test_posix.py.orig
++++ Lib/test/test_posix.py
+@@ -487,7 +487,7 @@ class PosixTester(unittest.TestCase):
+ if sys.platform == 'darwin':
+ import sysconfig
+ dt = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') or '10.0'
+- if float(dt) < 10.6:
++ if tuple(int(n) for n in dt.split('.')[0:2]) < (10, 6):
+ raise unittest.SkipTest("getgroups(2) is broken prior to 10.6")
+
+ # 'id -G' and 'os.getgroups()' should return the same
+Index: Mac/BuildScript/build-installer.py
+===================================================================
+--- Mac/BuildScript/build-installer.py.orig
++++ Mac/BuildScript/build-installer.py
+@@ -148,16 +148,19 @@ SRCDIR = os.path.dirname(
+ # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
+ DEPTARGET = '10.3'
+
+-target_cc_map = {
++def getDeptargetTuple():
++ return tuple([int(n) for n in DEPTARGET.split('.')[0:2]])
++
++def getTargetCompilers():
++ target_cc_map = {
+ '10.3': ('gcc-4.0', 'g++-4.0'),
+ '10.4': ('gcc-4.0', 'g++-4.0'),
+ '10.5': ('gcc-4.2', 'g++-4.2'),
+ '10.6': ('gcc-4.2', 'g++-4.2'),
+- '10.7': ('clang', 'clang++'),
+- '10.8': ('clang', 'clang++'),
+-}
++ }
++ return target_cc_map.get(DEPTARGET, ('clang', 'clang++') )
+
+-CC, CXX = target_cc_map[DEPTARGET]
++CC, CXX = getTargetCompilers()
+
+ PYTHON_3 = getVersionTuple() >= (3, 0)
+
+@@ -190,7 +193,7 @@ EXPECTED_SHARED_LIBS = {}
+ def library_recipes():
+ result = []
+
+- LT_10_5 = bool(DEPTARGET < '10.5')
++ LT_10_5 = bool(getDeptargetTuple() < (10, 5))
+
+ if getVersionTuple() >= (3, 3):
+ result.extend([
+@@ -259,7 +262,7 @@ def library_recipes():
+ ),
+ ])
+
+- if DEPTARGET < '10.5':
++ if getDeptargetTuple() < (10, 5):
+ result.extend([
+ dict(
+ name="Bzip2 1.0.6",
+@@ -394,7 +397,7 @@ def pkg_recipes():
+ ),
+ ]
+
+- if DEPTARGET < '10.4' and not PYTHON_3:
++ if getDeptargetTuple() < (10, 4) and not PYTHON_3:
+ result.append(
+ dict(
+ name="PythonSystemFixes",
+@@ -610,7 +613,7 @@ def parseOptions(args=None):
+ SDKPATH=os.path.abspath(SDKPATH)
+ DEPSRC=os.path.abspath(DEPSRC)
+
+- CC, CXX=target_cc_map[DEPTARGET]
++ CC, CXX = getTargetCompilers()
+
+ print("Settings:")
+ print(" * Source directory:", SRCDIR)
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -639,7 +639,9 @@ class PyBuildExt(build_ext):
+ if platform == 'darwin':
+ os_release = int(os.uname()[2].split('.')[0])
+ dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+- if dep_target and dep_target.split('.') < ['10', '5']:
++ if (dep_target and
++ (tuple(int(n) for n in dep_target.split('.')[0:2])
++ < (10, 5) ) ):
+ os_release = 8
+ if os_release < 9:
+ # MacOSX 10.4 has a broken readline. Don't try to build
</ins></span></pre></div>
<a id="trunkdportslangpython32filespatchLibsitepyomit_local_site_packagesdifffromrev150873trunkdportslangpython32filesomitlocalsitepackagespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python32/files/patch-Lib-site.py-omit_local_site_packages.diff (from rev 150873, trunk/dports/lang/python32/files/omit-local-site-packages.patch) (0 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-Lib-site.py-omit_local_site_packages.diff (rev 0)
+++ trunk/dports/lang/python32/files/patch-Lib-site.py-omit_local_site_packages.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -292,15 +292,6 @@ def getsitepackages():
+ else:
+ sitepackages.append(prefix)
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- from sysconfig import get_config_var
+- framework = get_config_var("PYTHONFRAMEWORK")
+- if framework:
+- sitepackages.append(
+- os.path.join("/Library", framework,
+- sys.version[:3], "site-packages"))
+ return sitepackages
+
+ def addsitepackages(known_paths):
</ins></span></pre></div>
<a id="trunkdportslangpython32filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/files/patch-configure.diff (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-configure.diff 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/patch-configure.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2011-02-19 19:58:23.000000000 +1100
-+++ configure 2011-05-14 02:29:23.000000000 +1000
-@@ -2920,6 +2920,8 @@
</del><ins>+--- configure.old 2014-10-12 08:52:04.000000000 +0200
++++ configure 2016-08-01 06:10:47.000000000 +0200
+@@ -2957,6 +2957,8 @@ if test "${enable_framework+set}" = set;
</ins><span class="cx"> ;
</span><span class="cx"> esac
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangpython32filespatchconfigure_configureacyosemite_configure_fixesdifffromrev150873trunkdportslangpython32filesyosemiteconfigurefixespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python32/files/patch-configure_configure.ac-yosemite_configure_fixes.diff (from rev 150873, trunk/dports/lang/python32/files/yosemite-configure-fixes.patch) (0 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-configure_configure.ac-yosemite_configure_fixes.diff (rev 0)
+++ trunk/dports/lang/python32/files/patch-configure_configure.ac-yosemite_configure_fixes.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+--- configure.old 2016-08-01 06:11:48.000000000 +0200
++++ configure 2016-08-01 06:17:25.000000000 +0200
+@@ -5791,8 +5791,16 @@ $as_echo "$CC" >&6; }
+
+ # Calculate the right deployment target for this build.
+ #
+- cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
+- if test ${cur_target} '>' 10.2; then
++ cur_target_major=`sw_vers -productVersion | \
++ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
++ cur_target_minor=`sw_vers -productVersion | \
++ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
++ cur_target="${cur_target_major}.${cur_target_minor}"
++ if test ${cur_target_major} -eq 10 && \
++ test ${cur_target_minor} -ge 3 && \
++ test ${cur_target_minor} -le 5
++ then
++ # OS X 10.3 through 10.5
+ cur_target=10.3
+ if test ${enable_universalsdk}; then
+ if test "${UNIVERSAL_ARCHS}" = "all"; then
+@@ -7785,15 +7793,14 @@ then
+ # Use -undefined dynamic_lookup whenever possible (10.3 and later).
+ # This allows an extension to be used in any Python
+
+- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
++ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
++ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
++ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
++ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
++ if test ${dep_target_major} -eq 10 && \
++ test ${dep_target_minor} -le 2
+ then
+- if test "${enable_universalsdk}"; then
+- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+- fi
+- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
+- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
+- BLDSHARED="$LDSHARED"
+- else
++ # building for OS X 10.0 through 10.2
+ LDSHARED='$(CC) -bundle'
+ LDCXXSHARED='$(CXX) -bundle'
+ if test "$enable_framework" ; then
+@@ -7807,6 +7814,14 @@ then
+ LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ fi
++ else
++ # building for OS X 10.3 and later
++ if test "${enable_universalsdk}"; then
++ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++ fi
++ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
++ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
++ BLDSHARED="$LDSHARED"
+ fi
+ ;
+ Linux*|GNU*|QNX*)
+--- configure.ac.old 2014-10-12 08:52:04.000000000 +0200
++++ configure.ac 2016-08-01 06:17:25.000000000 +0200
+@@ -1099,8 +1099,16 @@ yes)
+
+ # Calculate the right deployment target for this build.
+ #
+- cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
+- if test ${cur_target} '>' 10.2; then
++ cur_target_major=`sw_vers -productVersion | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++ cur_target_minor=`sw_vers -productVersion | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++ cur_target="${cur_target_major}.${cur_target_minor}"
++ if test ${cur_target_major} -eq 10 && \
++ test ${cur_target_minor} -ge 3 && \
++ test ${cur_target_minor} -le 5
++ then
++ # OS X 10.3 through 10.5
+ cur_target=10.3
+ if test ${enable_universalsdk}; then
+ if test "${UNIVERSAL_ARCHS}" = "all"; then
+@@ -1806,15 +1814,14 @@ then
+ # Use -undefined dynamic_lookup whenever possible (10.3 and later).
+ # This allows an extension to be used in any Python
+
+- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
++ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++ if test ${dep_target_major} -eq 10 && \
++ test ${dep_target_minor} -le 2
+ then
+- if test "${enable_universalsdk}"; then
+- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+- fi
+- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
+- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
+- BLDSHARED="$LDSHARED"
+- else
++ # building for OS X 10.0 through 10.2
+ LDSHARED='$(CC) -bundle'
+ LDCXXSHARED='$(CXX) -bundle'
+ if test "$enable_framework" ; then
+@@ -1828,6 +1835,14 @@ then
+ LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+ fi
++ else
++ # building for OS X 10.3 and later
++ if test "${enable_universalsdk}"; then
++ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++ fi
++ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
++ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
++ BLDSHARED="$LDSHARED"
+ fi
+ ;
+ Linux*|GNU*|QNX*)
</ins></span></pre></div>
<a id="trunkdportslangpython32filespatchlibeditdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/files/patch-libedit.diff (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-libedit.diff 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/patch-libedit.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2011-06-12 01:48:52.000000000 +1000
-+++ configure 2011-10-31 15:28:14.000000000 +1100
-@@ -12807,9 +12807,9 @@
</del><ins>+--- configure.old 2016-08-01 06:10:47.000000000 +0200
++++ configure 2016-08-01 06:11:48.000000000 +0200
+@@ -12967,9 +12967,9 @@ py_cv_lib_readline=no
</ins><span class="cx"> $as_echo_n "checking how to link readline libs... " >&6; }
</span><span class="cx"> for py_libtermcap in "" ncursesw ncurses curses termcap; do
</span><span class="cx"> if test -z "$py_libtermcap"; then
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> fi
</span><span class="cx"> LIBS="$READLINE_LIBS $LIBS_no_readline"
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><del>-@@ -12853,13 +12853,13 @@
</del><ins>+@@ -13013,13 +13013,13 @@ $as_echo "#define HAVE_LIBREADLINE 1" >>
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 2.1
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -12899,7 +12899,7 @@
</del><ins>+@@ -13059,7 +13059,7 @@ fi
</ins><span class="cx"> # check for readline 2.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -12912,7 +12912,7 @@
</del><ins>+@@ -13072,7 +13072,7 @@ if test $have_readline = yes
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -12925,7 +12925,7 @@
</del><ins>+@@ -13085,7 +13085,7 @@ rm -f conftest*
</ins><span class="cx">
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>-@@ -12939,13 +12939,13 @@
</del><ins>+@@ -13099,13 +13099,13 @@ rm -f conftest*
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 4.0
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -12983,13 +12983,13 @@
</del><ins>+@@ -13143,13 +13143,13 @@ fi
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # also in 4.0
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13027,13 +13027,13 @@
</del><ins>+@@ -13187,13 +13187,13 @@ fi
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # check for readline 4.2
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="cx">
</span><del>-@@ -13073,7 +13073,7 @@
</del><ins>+@@ -13233,7 +13233,7 @@ fi
</ins><span class="cx"> # also in readline 4.2
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> _ACEOF
</span><span class="cx"> if ac_fn_c_try_cpp "$LINENO"; then :
</span><span class="cx"> have_readline=yes
</span><del>-@@ -13086,7 +13086,7 @@
</del><ins>+@@ -13246,7 +13246,7 @@ if test $have_readline = yes
</ins><span class="cx"> then
</span><span class="cx"> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span class="cx"> /* end confdefs.h. */
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx">
</span><span class="cx"> _ACEOF
</span><span class="cx"> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><del>---- setup.py.orig 2011-10-31 15:26:25.000000000 +1100
-+++ setup.py 2011-10-31 15:29:39.000000000 +1100
-@@ -581,7 +581,7 @@
</del><ins>+--- setup.py.old 2016-08-01 06:11:23.000000000 +0200
++++ setup.py 2016-08-01 06:11:48.000000000 +0200
+@@ -602,7 +602,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> exts.append( Extension('audioop', ['audioop.c']) )
</span><span class="cx">
</span><span class="cx"> # readline
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> readline_termcap_library = ""
</span><span class="cx"> curses_library = ""
</span><span class="cx"> # Determine if readline is already linked against curses or tinfo.
</span><del>-@@ -637,7 +637,7 @@
</del><ins>+@@ -658,7 +658,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> else:
</span><span class="cx"> readline_extra_link_args = ()
</span><span class="cx">
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx"> if readline_termcap_library:
</span><span class="cx"> pass # Issue 7384: Already linked against curses or tinfo.
</span><span class="cx"> elif curses_library:
</span><del>---- Modules/readline.c.orig 2011-09-04 02:16:46.000000000 +1000
-+++ Modules/readline.c 2011-10-31 16:02:33.000000000 +1100
</del><ins>+--- Modules/readline.c.old 2014-10-12 08:52:03.000000000 +0200
++++ Modules/readline.c 2016-08-01 06:11:48.000000000 +0200
</ins><span class="cx"> @@ -28,8 +28,7 @@
</span><span class="cx">
</span><span class="cx"> /* GNU readline definitions */
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span class="cx"> #define completion_matches(x, y) \
</span><del>-@@ -573,14 +572,13 @@ get_history_item(PyObject *self, PyObjec
</del><ins>+@@ -575,14 +574,13 @@ get_history_item(PyObject *self, PyObjec
</ins><span class="cx"> * difference.
</span><span class="cx"> */
</span><span class="cx"> int length = _py_get_history_length();
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> Py_RETURN_NONE;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-@@ -1000,7 +998,6 @@ readline_until_enter_or_signal(char *pro
</del><ins>+@@ -1003,7 +1001,6 @@ readline_until_enter_or_signal(char *pro
</ins><span class="cx"> PyEval_SaveThread();
</span><span class="cx"> #endif
</span><span class="cx"> if (s < 0) {
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> rl_cleanup_after_signal();
</span><span class="cx"> rl_callback_handler_remove();
</span><span class="cx"> *signal = 1;
</span><del>-@@ -1099,15 +1096,6 @@ call_readline(FILE *sys_stdin, FILE *sys
</del><ins>+@@ -1102,15 +1099,6 @@ call_readline(FILE *sys_stdin, FILE *sys
</ins><span class="cx"> const char *line;
</span><span class="cx"> int length = _py_get_history_length();
</span><span class="cx"> if (length > 0)
</span></span></pre></div>
<a id="trunkdportslangpython32filespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python32/files/patch-setup.py.diff (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/patch-setup.py.diff 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/patch-setup.py.diff 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- setup.py.orig 2009-05-24 03:13:14.000000000 +1000
-+++ setup.py 2009-09-03 13:51:47.000000000 +1000
-@@ -1265,7 +1265,7 @@
</del><ins>+--- setup.py.old 2014-10-12 08:52:04.000000000 +0200
++++ setup.py 2016-08-01 06:01:52.000000000 +0200
+@@ -1493,7 +1493,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> # For 8.4a2, the X11 headers are not included. Rather than include a
</span><span class="cx"> # complicated search, this is a hard-coded path. It could bail out
</span><span class="cx"> # if X11 libs are not found...
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
</span><span class="cx">
</span><span class="cx"> # All existing framework builds of Tcl/Tk don't support 64-bit
</span><del>-@@ -1300,13 +1300,7 @@
</del><ins>+@@ -1538,13 +1538,7 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> def detect_tkinter(self, inc_dirs, lib_dirs):
</span><span class="cx"> # The _tkinter module.
</span><span class="cx">
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> # Assume we haven't found any of the libraries or include files
</span><span class="cx"> # The versions with dots are used on Unix, and the versions without
</span><del>-@@ -1354,17 +1348,17 @@
</del><ins>+@@ -1594,17 +1588,17 @@ class PyBuildExt(build_ext):
</ins><span class="cx"> if platform == 'sunos5':
</span><span class="cx"> include_dirs.append('/usr/openwin/include')
</span><span class="cx"> added_lib_dirs.append('/usr/openwin/lib')
</span></span></pre></div>
<a id="trunkdportslangpython32filesyosemiteconfigurefixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python32/files/yosemite-configure-fixes.patch (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/yosemite-configure-fixes.patch 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/yosemite-configure-fixes.patch 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,122 +0,0 @@
</span><del>-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -5789,8 +5789,16 @@ $as_echo "$CC" >&6; }
-
- # Calculate the right deployment target for this build.
- #
-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
-- if test ${cur_target} '>' 10.2; then
-+ cur_target_major=`sw_vers -productVersion | \
-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
-+ cur_target_minor=`sw_vers -productVersion | \
-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
-+ cur_target="${cur_target_major}.${cur_target_minor}"
-+ if test ${cur_target_major} -eq 10 && \
-+ test ${cur_target_minor} -ge 3 && \
-+ test ${cur_target_minor} -le 5
-+ then
-+ # OS X 10.3 through 10.5
- cur_target=10.3
- if test ${enable_universalsdk}; then
- if test "${UNIVERSAL_ARCHS}" = "all"; then
-@@ -7783,15 +7791,14 @@ then
- # Use -undefined dynamic_lookup whenever possible (10.3 and later).
- # This allows an extension to be used in any Python
-
-- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
-+ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
-+ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
-+ if test ${dep_target_major} -eq 10 && \
-+ test ${dep_target_minor} -le 2
- then
-- if test "${enable_universalsdk}"; then
-- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-- fi
-- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-- BLDSHARED="$LDSHARED"
-- else
-+ # building for OS X 10.0 through 10.2
- LDSHARED='$(CC) -bundle'
- LDCXXSHARED='$(CXX) -bundle'
- if test "$enable_framework" ; then
-@@ -7805,6 +7812,14 @@ then
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi
-+ else
-+ # building for OS X 10.3 and later
-+ if test "${enable_universalsdk}"; then
-+ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-+ fi
-+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*)
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -1099,8 +1099,16 @@ yes)
-
- # Calculate the right deployment target for this build.
- #
-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
-- if test ${cur_target} '>' 10.2; then
-+ cur_target_major=`sw_vers -productVersion | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-+ cur_target_minor=`sw_vers -productVersion | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-+ cur_target="${cur_target_major}.${cur_target_minor}"
-+ if test ${cur_target_major} -eq 10 && \
-+ test ${cur_target_minor} -ge 3 && \
-+ test ${cur_target_minor} -le 5
-+ then
-+ # OS X 10.3 through 10.5
- cur_target=10.3
- if test ${enable_universalsdk}; then
- if test "${UNIVERSAL_ARCHS}" = "all"; then
-@@ -1806,15 +1814,14 @@ then
- # Use -undefined dynamic_lookup whenever possible (10.3 and later).
- # This allows an extension to be used in any Python
-
-- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
-+ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-+ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-+ if test ${dep_target_major} -eq 10 && \
-+ test ${dep_target_minor} -le 2
- then
-- if test "${enable_universalsdk}"; then
-- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-- fi
-- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-- BLDSHARED="$LDSHARED"
-- else
-+ # building for OS X 10.0 through 10.2
- LDSHARED='$(CC) -bundle'
- LDCXXSHARED='$(CXX) -bundle'
- if test "$enable_framework" ; then
-@@ -1828,6 +1835,14 @@ then
- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi
-+ else
-+ # building for OS X 10.3 and later
-+ if test "${enable_universalsdk}"; then
-+ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-+ fi
-+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*)
</del></span></pre></div>
<a id="trunkdportslangpython32filesyosemitepythonfixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python32/files/yosemite-python-fixes.patch (150873 => 150874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python32/files/yosemite-python-fixes.patch 2016-08-01 06:43:57 UTC (rev 150873)
+++ trunk/dports/lang/python32/files/yosemite-python-fixes.patch 2016-08-01 06:44:08 UTC (rev 150874)
</span><span class="lines">@@ -1,154 +0,0 @@
</span><del>-Index: Lib/_osx_support.py
-===================================================================
---- Lib/_osx_support.py.orig
-+++ Lib/_osx_support.py
-@@ -444,8 +444,16 @@ def get_platform_osx(_config_vars, osnam
- # case and disallow installs.
- cflags = _config_vars.get(_INITPRE+'CFLAGS',
- _config_vars.get('CFLAGS', ''))
-- if ((macrelease + '.') >= '10.4.' and
-- '-arch' in cflags.strip()):
-+ if macrelease:
-+ try:
-+ macrelease = tuple(int(i) for i in macrelease.split('.')[0:2])
-+ except ValueError:
-+ macrelease = (10, 0)
-+ else:
-+ # assume no universal support
-+ macrelease = (10, 0)
-+
-+ if (macrelease >= (10, 4)) and '-arch' in cflags.strip():
- # The universal build will build fat binaries, but not on
- # systems before 10.4
-
-Index: Lib/distutils/tests/test_build_ext.py
-===================================================================
---- Lib/distutils/tests/test_build_ext.py.orig
-+++ Lib/distutils/tests/test_build_ext.py
-@@ -448,8 +448,16 @@ class BuildExtTestCase(TempdirManager,
-
- # get the deployment target that the interpreter was built with
- target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-- target = tuple(map(int, target.split('.')))
-- target = '%02d%01d0' % target
-+ target = tuple(map(int, target.split('.')[0:2]))
-+ # format the target value as defined in the Apple
-+ # Availability Macros. We can't use the macro names since
-+ # at least one value we test with will not exist yet.
-+ if target[1] < 10:
-+ # for 10.1 through 10.9.x -> "10n0"
-+ target = '%02d%01d0' % target
-+ else:
-+ # for 10.10 and beyond -> "10nn00"
-+ target = '%02d%02d00' % target
- deptarget_ext = Extension(
- 'deptarget',
- [deptarget_c],
-Index: Lib/test/test__osx_support.py
-===================================================================
---- Lib/test/test__osx_support.py.orig
-+++ Lib/test/test__osx_support.py
-@@ -109,7 +109,9 @@ class Test_OSXSupport(unittest.TestCase)
-
- def test__supports_universal_builds(self):
- import platform
-- self.assertEqual(platform.mac_ver()[0].split('.') >= ['10', '4'],
-+ mac_ver_tuple = tuple(int(i) for i in
-+ platform.mac_ver()[0].split('.')[0:2])
-+ self.assertEqual(mac_ver_tuple >= (10, 4),
- _osx_support._supports_universal_builds())
-
- def test__find_appropriate_compiler(self):
-Index: Lib/test/test_posix.py
-===================================================================
---- Lib/test/test_posix.py.orig
-+++ Lib/test/test_posix.py
-@@ -487,7 +487,7 @@ class PosixTester(unittest.TestCase):
- if sys.platform == 'darwin':
- import sysconfig
- dt = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') or '10.0'
-- if float(dt) < 10.6:
-+ if tuple(int(n) for n in dt.split('.')[0:2]) < (10, 6):
- raise unittest.SkipTest("getgroups(2) is broken prior to 10.6")
-
- # 'id -G' and 'os.getgroups()' should return the same
-Index: Mac/BuildScript/build-installer.py
-===================================================================
---- Mac/BuildScript/build-installer.py.orig
-+++ Mac/BuildScript/build-installer.py
-@@ -148,16 +148,19 @@ SRCDIR = os.path.dirname(
- # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
- DEPTARGET = '10.3'
-
--target_cc_map = {
-+def getDeptargetTuple():
-+ return tuple([int(n) for n in DEPTARGET.split('.')[0:2]])
-+
-+def getTargetCompilers():
-+ target_cc_map = {
- '10.3': ('gcc-4.0', 'g++-4.0'),
- '10.4': ('gcc-4.0', 'g++-4.0'),
- '10.5': ('gcc-4.2', 'g++-4.2'),
- '10.6': ('gcc-4.2', 'g++-4.2'),
-- '10.7': ('clang', 'clang++'),
-- '10.8': ('clang', 'clang++'),
--}
-+ }
-+ return target_cc_map.get(DEPTARGET, ('clang', 'clang++') )
-
--CC, CXX = target_cc_map[DEPTARGET]
-+CC, CXX = getTargetCompilers()
-
- PYTHON_3 = getVersionTuple() >= (3, 0)
-
-@@ -190,7 +193,7 @@ EXPECTED_SHARED_LIBS = {}
- def library_recipes():
- result = []
-
-- LT_10_5 = bool(DEPTARGET < '10.5')
-+ LT_10_5 = bool(getDeptargetTuple() < (10, 5))
-
- if getVersionTuple() >= (3, 3):
- result.extend([
-@@ -259,7 +262,7 @@ def library_recipes():
- ),
- ])
-
-- if DEPTARGET < '10.5':
-+ if getDeptargetTuple() < (10, 5):
- result.extend([
- dict(
- name="Bzip2 1.0.6",
-@@ -394,7 +397,7 @@ def pkg_recipes():
- ),
- ]
-
-- if DEPTARGET < '10.4' and not PYTHON_3:
-+ if getDeptargetTuple() < (10, 4) and not PYTHON_3:
- result.append(
- dict(
- name="PythonSystemFixes",
-@@ -610,7 +613,7 @@ def parseOptions(args=None):
- SDKPATH=os.path.abspath(SDKPATH)
- DEPSRC=os.path.abspath(DEPSRC)
-
-- CC, CXX=target_cc_map[DEPTARGET]
-+ CC, CXX = getTargetCompilers()
-
- print("Settings:")
- print(" * Source directory:", SRCDIR)
-Index: setup.py
-===================================================================
---- setup.py.orig
-+++ setup.py
-@@ -639,7 +639,9 @@ class PyBuildExt(build_ext):
- if platform == 'darwin':
- os_release = int(os.uname()[2].split('.')[0])
- dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-- if dep_target and dep_target.split('.') < ['10', '5']:
-+ if (dep_target and
-+ (tuple(int(n) for n in dep_target.split('.')[0:2])
-+ < (10, 5) ) ):
- os_release = 8
- if os_release < 9:
- # MacOSX 10.4 has a broken readline. Don't try to build
</del></span></pre>
</div>
</div>
</body>
</html>