<!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>[126405] trunk/dports/lang/python34</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/126405">126405</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2014-10-09 10:23:20 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>python34: version bump o 3.4.2, drop incorporated patches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython34Portfile">trunk/dports/lang/python34/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangpython34filesyosemiteconfigurefixespatch">trunk/dports/lang/python34/files/yosemite-configure-fixes.patch</a></li>
<li><a href="#trunkdportslangpython34filesyosemitepythonfixespatch">trunk/dports/lang/python34/files/yosemite-python-fixes.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python34/Portfile (126404 => 126405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python34/Portfile 2014-10-09 16:30:00 UTC (rev 126404)
+++ trunk/dports/lang/python34/Portfile 2014-10-09 17:23:20 UTC (rev 126405)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> name python34
</span><span class="cx">
</span><span class="cx"> # Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
</span><del>-version 3.4.1
-revision 1
</del><ins>+version 3.4.2
</ins><span class="cx">
</span><span class="cx"> epoch 20140519
</span><span class="cx">
</span><span class="lines">@@ -30,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 276fda8bd4ef515da83645ddd5f01eb0f68522a5 \
- sha256 c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4
</del><ins>+checksums rmd160 11ba768384a114d07f8d82e54e7c232898cb5e15 \
+ sha256 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-setup.py.diff \
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span><span class="lines">@@ -39,10 +38,6 @@
</span><span class="cx"> patch-setup.py-disabled_modules.diff \
</span><span class="cx"> patch-libedit.diff
</span><span class="cx">
</span><del>-# http://bugs.python.org/issue21811
-patchfiles-append yosemite-configure-fixes.patch \
- yosemite-python-fixes.patch
-
</del><span class="cx"> depends_lib port:zlib port:openssl \
</span><span class="cx"> port:sqlite3 port:ncurses \
</span><span class="cx"> port:bzip2 port:libedit port:gettext \
</span><span class="lines">@@ -162,5 +157,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><del>-livecheck.url ${homepage}download/releases/
</del><ins>+#livecheck.url ${homepage}download/releases/
+livecheck.url ${homepage}downloads/
</ins><span class="cx"> livecheck.regex Python (${branch}(?:\\.\\d+)*)
</span></span></pre></div>
<a id="trunkdportslangpython34filesyosemiteconfigurefixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python34/files/yosemite-configure-fixes.patch (126404 => 126405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python34/files/yosemite-configure-fixes.patch 2014-10-09 16:30:00 UTC (rev 126404)
+++ trunk/dports/lang/python34/files/yosemite-configure-fixes.patch 2014-10-09 17:23:20 UTC (rev 126405)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-
-# HG changeset patch
-# User Ned Deily <nad@acm.org>
-# Date 1403729062 25200
-# Node ID 69ae7e4939f2fbd315b0585a197fb2be854052cc
-# Parent 14198fda1c709fa366b70f1d078227e0bebfdeea
-Issue #21811: Anticipated fixes to 3.x configure for OS X 10.10 Yosemite.
-
-diff --git a/configure b/configure
---- configure.orig
-+++ configure
-@@ -6551,10 +6551,16 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5
- $as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; }
-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
-- if test ${cur_target} '>' 10.2 && \
-- test ${cur_target} '<' 10.6
-+ 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
-@@ -8540,12 +8546,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
-- 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
-@@ -8559,6 +8567,11 @@ 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
-+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*)
-diff --git a/configure.ac b/configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -1318,10 +1318,16 @@ yes)
- # 4. If we are running on OS X 10.2 or earlier, good luck!
-
- AC_MSG_CHECKING(which MACOSX_DEPLOYMENT_TARGET to use)
-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
-- if test ${cur_target} '>' 10.2 && \
-- test ${cur_target} '<' 10.6
-+ 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
-@@ -2017,12 +2023,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
-- 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
-@@ -2036,6 +2044,11 @@ 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
-+ LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
-+ LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
-+ BLDSHARED="$LDSHARED"
- fi
- ;
- Linux*|GNU*|QNX*)
-
</del></span></pre></div>
<a id="trunkdportslangpython34filesyosemitepythonfixespatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/python34/files/yosemite-python-fixes.patch (126404 => 126405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python34/files/yosemite-python-fixes.patch 2014-10-09 16:30:00 UTC (rev 126404)
+++ trunk/dports/lang/python34/files/yosemite-python-fixes.patch 2014-10-09 17:23:20 UTC (rev 126405)
</span><span class="lines">@@ -1,162 +0,0 @@
</span><del>-
-# HG changeset patch
-# User Ned Deily <nad@acm.org>
-# Date 1403728574 25200
-# Node ID 14198fda1c709fa366b70f1d078227e0bebfdeea
-# Parent dead2b526c3b9d748c6483db4520ac5bc2e1ef4e
-Issue #21811: Anticipated fixes to 3.x and 2.7 for OS X 10.10 Yosemite.
-
-diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
---- Lib/_osx_support.py.orig
-+++ Lib/_osx_support.py
-@@ -450,8 +450,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
-
-diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
---- Lib/distutils/tests/test_build_ext.py.orig
-+++ Lib/distutils/tests/test_build_ext.py
-@@ -444,8 +444,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],
-diff --git a/Lib/test/test__osx_support.py b/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):
-diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
---- Lib/test/test_posix.py.orig
-+++ Lib/test/test_posix.py
-@@ -768,7 +768,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
-diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
---- Mac/BuildScript/build-installer.py.orig
-+++ Mac/BuildScript/build-installer.py
-@@ -150,17 +150,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++'),
-- '10.9': ('clang', 'clang++'),
--}
-+ }
-+ return target_cc_map.get(DEPTARGET, ('clang', 'clang++') )
-
--CC, CXX = target_cc_map[DEPTARGET]
-+CC, CXX = getTargetCompilers()
-
- PYTHON_3 = getVersionTuple() >= (3, 0)
-
-@@ -193,10 +195,10 @@ EXPECTED_SHARED_LIBS = {}
- def library_recipes():
- result = []
-
-- LT_10_5 = bool(DEPTARGET < '10.5')
-+ LT_10_5 = bool(getDeptargetTuple() < (10, 5))
-
- # Disable for now
-- if False: # if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 5)):
-+ if False: # if (getDeptargetTuple() > (10, 5)) and (getVersionTuple() >= (3, 5)):
- result.extend([
- dict(
- name="Tcl 8.5.15",
-@@ -304,7 +306,7 @@ def library_recipes():
- ),
- ])
-
-- if DEPTARGET < '10.5':
-+ if getDeptargetTuple() < (10, 5):
- result.extend([
- dict(
- name="Bzip2 1.0.6",
-@@ -458,7 +460,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",
-@@ -679,7 +681,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)
-diff --git a/setup.py b/setup.py
---- setup.py.orig
-+++ setup.py
-@@ -697,7 +697,9 @@ class PyBuildExt(build_ext):
- if host_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>