<!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>[150872] trunk/dports/lang/python31</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/150872">150872</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2016-07-31 23:43:50 -0700 (Sun, 31 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>python31: refresh patches, rename a few with "wrong" names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython31Portfile">trunk/dports/lang/python31/Portfile</a></li>
<li><a href="#trunkdportslangpython31filespatchLibdistutilsdistpydiff">trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff</a></li>
<li><a href="#trunkdportslangpython31filespatchlibeditdiff">trunk/dports/lang/python31/files/patch-libedit.diff</a></li>
<li><a href="#trunkdportslangpython31filespatchsetuppydiff">trunk/dports/lang/python31/files/patch-setup.py.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpython31filespatchLibdistutilsutilpy_MacBuildScriptbuildinstallerpyyosemite_python_fixesdiff">trunk/dports/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff</a></li>
<li><a href="#trunkdportslangpython31filespatchLibsitepyomit_local_site_packagesdiff">trunk/dports/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff</a></li>
<li><a href="#trunkdportslangpython31filespatchconfigure_configureacyosemite_configure_fixesdiff">trunk/dports/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangpython31filesomitlocalsitepackagespatch">trunk/dports/lang/python31/files/omit-local-site-packages.patch</a></li>
<li><a href="#trunkdportslangpython31filesyosemiteconfigurefixespatch">trunk/dports/lang/python31/files/yosemite-configure-fixes.patch</a></li>
<li><a href="#trunkdportslangpython31filesyosemitepythonfixespatch">trunk/dports/lang/python31/files/yosemite-python-fixes.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython31Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python31/Portfile (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/Portfile 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/Portfile 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -35,11 +35,11 @@
</span><span class="cx"> patch-Lib-distutils-dist.py.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="trunkdportslangpython31filesomitlocalsitepackagespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python31/files/omit-local-site-packages.patch (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/omit-local-site-packages.patch 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/omit-local-site-packages.patch 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-Index: Lib/site.py
-===================================================================
---- Lib/site.py.orig
-+++ Lib/site.py
-@@ -280,18 +280,6 @@ def addsitepackages(known_paths):
- sitedirs.append(prefix)
- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
-
-- if sys.platform == "darwin":
-- # for framework builds *only* we add the standard Apple
-- # locations.
-- if 'Python.framework' in prefix:
-- sitedirs.append(
-- os.path.expanduser(
-- os.path.join("~", "Library", "Python",
-- sys.version[:3], "site-packages")))
-- sitedirs.append(
-- os.path.join("/Library", "Python",
-- sys.version[:3], "site-packages"))
--
- for sitedir in sitedirs:
- if os.path.isdir(sitedir):
- addsitedir(sitedir, known_paths)
</del></span></pre></div>
<a id="trunkdportslangpython31filespatchLibdistutilsdistpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff 2016-08-01 06:43:50 UTC (rev 150872)
</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 2012-04-10 01:25:34.000000000 +0200
++++ Lib/distutils/dist.py 2016-08-01 05:35:16.000000000 +0200
+@@ -53,6 +53,7 @@
</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">@@ -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>+@@ -312,6 +319,9 @@
</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>+@@ -332,7 +342,7 @@
</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>+@@ -340,6 +350,8 @@
</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="trunkdportslangpython31filespatchLibdistutilsutilpy_MacBuildScriptbuildinstallerpyyosemite_python_fixesdifffromrev150871trunkdportslangpython31filesyosemitepythonfixespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff (from rev 150871, trunk/dports/lang/python31/files/yosemite-python-fixes.patch) (0 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff (rev 0)
+++ trunk/dports/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+Index: Lib/distutils/util.py
+===================================================================
+--- Lib/distutils/util.py.orig
++++ Lib/distutils/util.py
+@@ -133,7 +133,16 @@ def get_platform ():
+ release = macver
+ osname = "macosx"
+
+- if (macrelease + '.') >= '10.4.' and \
++ 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 get_config_vars().get('CFLAGS', '').strip():
+ # The universal build will build fat binaries, but not on
+ # systems before 10.4
+Index: Mac/BuildScript/build-installer.py
+===================================================================
+--- Mac/BuildScript/build-installer.py.orig
++++ Mac/BuildScript/build-installer.py
+@@ -108,14 +108,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 getTargetCompiler():
++ target_cc_map = {
+ '10.3': 'gcc-4.0',
+ '10.4': 'gcc-4.0',
+ '10.5': 'gcc-4.0',
+ '10.6': 'gcc-4.2',
+-}
++ }
++ return target_cc_map.get(DEPTARGET, 'clang')
+
+-CC = target_cc_map[DEPTARGET]
++CC = getTargetCompiler()
+
+ PYTHON_3 = getVersionTuple() >= (3, 0)
+
+@@ -141,7 +146,7 @@ USAGE = textwrap.dedent("""\
+ def library_recipes():
+ result = []
+
+- if DEPTARGET < '10.5':
++ if getDeptargetTuple() < (10, 5):
+ result.extend([
+ dict(
+ name="Bzip2 1.0.5",
+@@ -318,7 +323,7 @@ def pkg_recipes():
+ ),
+ ]
+
+- if DEPTARGET < '10.4':
++ if getDeptargetTuple() < (10, 4):
+ result.append(
+ dict(
+ name="PythonSystemFixes",
+@@ -509,7 +514,7 @@ def parseOptions(args=None):
+ SDKPATH=os.path.abspath(SDKPATH)
+ DEPSRC=os.path.abspath(DEPSRC)
+
+- CC=target_cc_map[DEPTARGET]
++ CC=getTargetCompiler()
+
+ print "Settings:"
+ print " * Source directory:", SRCDIR
</ins></span></pre></div>
<a id="trunkdportslangpython31filespatchLibsitepyomit_local_site_packagesdifffromrev150871trunkdportslangpython31filesomitlocalsitepackagespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff (from rev 150871, trunk/dports/lang/python31/files/omit-local-site-packages.patch) (0 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff (rev 0)
+++ trunk/dports/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Index: Lib/site.py
+===================================================================
+--- Lib/site.py.orig
++++ Lib/site.py
+@@ -280,18 +280,6 @@ def addsitepackages(known_paths):
+ sitedirs.append(prefix)
+ sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
+
+- if sys.platform == "darwin":
+- # for framework builds *only* we add the standard Apple
+- # locations.
+- if 'Python.framework' in prefix:
+- sitedirs.append(
+- os.path.expanduser(
+- os.path.join("~", "Library", "Python",
+- sys.version[:3], "site-packages")))
+- sitedirs.append(
+- os.path.join("/Library", "Python",
+- sys.version[:3], "site-packages"))
+-
+ for sitedir in sitedirs:
+ if os.path.isdir(sitedir):
+ addsitedir(sitedir, known_paths)
</ins></span></pre></div>
<a id="trunkdportslangpython31filespatchconfigure_configureacyosemite_configure_fixesdifffromrev150871trunkdportslangpython31filesyosemiteconfigurefixespatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff (from rev 150871, trunk/dports/lang/python31/files/yosemite-configure-fixes.patch) (0 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff (rev 0)
+++ trunk/dports/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -5522,8 +5522,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
+@@ -7585,14 +7593,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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+- BLDSHARED="$LDSHARED"
+- else
++ # building for OS X 10.0 through 10.2
+ LDSHARED='$(CC) $(LDFLAGS) -bundle'
+ if test "$enable_framework" ; then
+ # Link against the framework. All externals should be defined.
+@@ -7603,6 +7611,13 @@ then
+ BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
+ LDSHARED="$LDSHARED "'-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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
++ BLDSHARED="$LDSHARED"
+ fi
+ ;
+ Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -1010,8 +1010,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
+@@ -1792,14 +1800,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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+- BLDSHARED="$LDSHARED"
+- else
++ # building for OS X 10.0 through 10.2
+ LDSHARED='$(CC) $(LDFLAGS) -bundle'
+ if test "$enable_framework" ; then
+ # Link against the framework. All externals should be defined.
+@@ -1810,6 +1818,13 @@ then
+ BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
+ LDSHARED="$LDSHARED "'-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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
++ BLDSHARED="$LDSHARED"
+ fi
+ ;
+ Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
</ins></span></pre></div>
<a id="trunkdportslangpython31filespatchlibeditdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python31/files/patch-libedit.diff (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-libedit.diff 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/patch-libedit.diff 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -1,6 +1,26 @@
</span><del>---- configure.orig 2011-06-12 01:48:52.000000000 +1000
-+++ configure 2011-10-31 15:28:14.000000000 +1100
-@@ -12494,9 +12494,9 @@
</del><ins>+--- Modules/readline.c.old 2012-04-10 01:25:36.000000000 +0200
++++ Modules/readline.c 2016-08-01 05:36:43.000000000 +0200
+@@ -28,8 +28,7 @@
+
+ /* GNU readline definitions */
+ #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
+-#include <readline/readline.h>
+-#include <readline/history.h>
++#include <editline/readline.h>
+
+ #ifdef HAVE_RL_COMPLETION_MATCHES
+ #define completion_matches(x, y) \
+@@ -919,7 +918,6 @@
+ PyEval_SaveThread();
+ #endif
+ if (s < 0) {
+- rl_free_line_state();
+ rl_cleanup_after_signal();
+ rl_callback_handler_remove();
+ *signal = 1;
+--- configure.old 2012-04-10 01:25:37.000000000 +0200
++++ configure 2016-08-01 05:36:43.000000000 +0200
+@@ -12493,9 +12493,9 @@
</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 +32,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>-@@ -12540,13 +12540,13 @@
</del><ins>+@@ -12539,13 +12539,13 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 2.1
</span><span class="lines">@@ -29,7 +49,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>-@@ -12586,7 +12586,7 @@
</del><ins>+@@ -12585,7 +12585,7 @@
</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 +58,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>-@@ -12598,7 +12598,7 @@
</del><ins>+@@ -12597,7 +12597,7 @@
</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 +67,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>-@@ -12611,7 +12611,7 @@
</del><ins>+@@ -12610,7 +12610,7 @@
</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 +76,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>-@@ -12625,13 +12625,13 @@
</del><ins>+@@ -12624,13 +12624,13 @@
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # check for readline 4.0
</span><span class="lines">@@ -73,7 +93,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>-@@ -12669,13 +12669,13 @@
</del><ins>+@@ -12668,13 +12668,13 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # also in 4.0
</span><span class="lines">@@ -90,7 +110,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>-@@ -12713,13 +12713,13 @@
</del><ins>+@@ -12712,13 +12712,13 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # check for readline 4.2
</span><span class="lines">@@ -107,7 +127,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>-@@ -12759,7 +12759,7 @@
</del><ins>+@@ -12758,7 +12758,7 @@
</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 +136,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>-@@ -12771,7 +12771,7 @@
</del><ins>+@@ -12770,7 +12770,7 @@
</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,8 +145,8 @@
</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
</del><ins>+--- setup.py.old 2016-08-01 05:36:10.000000000 +0200
++++ setup.py 2016-08-01 05:36:43.000000000 +0200
</ins><span class="cx"> @@ -570,7 +570,7 @@
</span><span class="cx"> exts.append( Extension('audioop', ['audioop.c']) )
</span><span class="cx">
</span><span class="lines">@@ -145,23 +165,3 @@
</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-06-12 01:48:52.000000000 +1000
-+++ Modules/readline.c 2011-10-31 15:34:23.000000000 +1100
-@@ -28,8 +28,7 @@
-
- /* GNU readline definitions */
- #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
--#include <readline/readline.h>
--#include <readline/history.h>
-+#include <editline/readline.h>
-
- #ifdef HAVE_RL_COMPLETION_MATCHES
- #define completion_matches(x, y) \
-@@ -919,7 +918,6 @@ readline_until_enter_or_signal(char *pro
- PyEval_SaveThread();
- #endif
- if (s < 0) {
-- rl_free_line_state();
- rl_cleanup_after_signal();
- rl_callback_handler_remove();
- *signal = 1;
</del></span></pre></div>
<a id="trunkdportslangpython31filespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python31/files/patch-setup.py.diff (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/patch-setup.py.diff 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/patch-setup.py.diff 2016-08-01 06:43:50 UTC (rev 150872)
</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 2012-04-10 01:25:37.000000000 +0200
++++ setup.py 2016-08-01 05:32:33.000000000 +0200
+@@ -1420,7 +1420,7 @@
</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>+@@ -1466,13 +1466,7 @@
</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>+@@ -1520,17 +1514,17 @@
</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="trunkdportslangpython31filesyosemiteconfigurefixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python31/files/yosemite-configure-fixes.patch (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/yosemite-configure-fixes.patch 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/yosemite-configure-fixes.patch 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -1,118 +0,0 @@
</span><del>-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -5522,8 +5522,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
-@@ -7585,14 +7593,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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-- BLDSHARED="$LDSHARED"
-- else
-+ # building for OS X 10.0 through 10.2
- LDSHARED='$(CC) $(LDFLAGS) -bundle'
- if test "$enable_framework" ; then
- # Link against the framework. All externals should be defined.
-@@ -7603,6 +7611,13 @@ then
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
- LDSHARED="$LDSHARED "'-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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -1010,8 +1010,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
-@@ -1792,14 +1800,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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-- BLDSHARED="$LDSHARED"
-- else
-+ # building for OS X 10.0 through 10.2
- LDSHARED='$(CC) $(LDFLAGS) -bundle'
- if test "$enable_framework" ; then
- # Link against the framework. All externals should be defined.
-@@ -1810,6 +1818,13 @@ then
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
- LDSHARED="$LDSHARED "'-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) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
</del></span></pre></div>
<a id="trunkdportslangpython31filesyosemitepythonfixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python31/files/yosemite-python-fixes.patch (150871 => 150872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python31/files/yosemite-python-fixes.patch 2016-08-01 05:35:52 UTC (rev 150871)
+++ trunk/dports/lang/python31/files/yosemite-python-fixes.patch 2016-08-01 06:43:50 UTC (rev 150872)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-Index: Lib/distutils/util.py
-===================================================================
---- Lib/distutils/util.py.orig
-+++ Lib/distutils/util.py
-@@ -133,7 +133,16 @@ def get_platform ():
- release = macver
- osname = "macosx"
-
-- if (macrelease + '.') >= '10.4.' and \
-+ 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 get_config_vars().get('CFLAGS', '').strip():
- # The universal build will build fat binaries, but not on
- # systems before 10.4
-Index: Mac/BuildScript/build-installer.py
-===================================================================
---- Mac/BuildScript/build-installer.py.orig
-+++ Mac/BuildScript/build-installer.py
-@@ -108,14 +108,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 getTargetCompiler():
-+ target_cc_map = {
- '10.3': 'gcc-4.0',
- '10.4': 'gcc-4.0',
- '10.5': 'gcc-4.0',
- '10.6': 'gcc-4.2',
--}
-+ }
-+ return target_cc_map.get(DEPTARGET, 'clang')
-
--CC = target_cc_map[DEPTARGET]
-+CC = getTargetCompiler()
-
- PYTHON_3 = getVersionTuple() >= (3, 0)
-
-@@ -141,7 +146,7 @@ USAGE = textwrap.dedent("""\
- def library_recipes():
- result = []
-
-- if DEPTARGET < '10.5':
-+ if getDeptargetTuple() < (10, 5):
- result.extend([
- dict(
- name="Bzip2 1.0.5",
-@@ -318,7 +323,7 @@ def pkg_recipes():
- ),
- ]
-
-- if DEPTARGET < '10.4':
-+ if getDeptargetTuple() < (10, 4):
- result.append(
- dict(
- name="PythonSystemFixes",
-@@ -509,7 +514,7 @@ def parseOptions(args=None):
- SDKPATH=os.path.abspath(SDKPATH)
- DEPSRC=os.path.abspath(DEPSRC)
-
-- CC=target_cc_map[DEPTARGET]
-+ CC=getTargetCompiler()
-
- print "Settings:"
- print " * Source directory:", SRCDIR
</del></span></pre>
</div>
</div>
</body>
</html>