<!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>[151024] trunk/dports/lang/python35/Portfile</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/151024">151024</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2016-08-05 10:06:06 -0700 (Fri, 05 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>python35: whitespace only + replace tabs with spaces</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython35Portfile">trunk/dports/lang/python35/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python35/Portfile (151023 => 151024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python35/Portfile 2016-08-05 16:53:36 UTC (rev 151023)
+++ trunk/dports/lang/python35/Portfile 2016-08-05 17:06:06 UTC (rev 151024)
</span><span class="lines">@@ -4,97 +4,97 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><del>-name python35
</del><ins>+name python35
</ins><span class="cx">
</span><span class="cx"> # Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
</span><del>-version 3.5.2
</del><ins>+version 3.5.2
</ins><span class="cx">
</span><del>-epoch 20160627
</del><ins>+epoch 20160627
</ins><span class="cx">
</span><del>-set major [lindex [split $version .] 0]
-set branch [join [lrange [split ${version} .] 0 1] .]
-categories lang
-license PSF
-platforms darwin
-maintainers jwa openmaintainer
</del><ins>+set major [lindex [split $version .] 0]
+set branch [join [lrange [split ${version} .] 0 1] .]
+categories lang
+license PSF
+platforms darwin
+maintainers jwa openmaintainer
</ins><span class="cx">
</span><del>-description An interpreted, object-oriented programming language
-long_description Python is an interpreted, interactive, object-oriented \
- programming language.
</del><ins>+description An interpreted, object-oriented programming language
+long_description Python is an interpreted, interactive, object-oriented \
+ programming language.
</ins><span class="cx">
</span><del>-homepage http://www.python.org/
-master_sites ${homepage}ftp/python/${version}/
</del><ins>+homepage http://www.python.org/
+master_sites ${homepage}ftp/python/${version}/
</ins><span class="cx">
</span><del>-distname Python-${version}
</del><ins>+distname Python-${version}
</ins><span class="cx">
</span><del>-use_xz yes
</del><ins>+use_xz yes
</ins><span class="cx">
</span><span class="cx"> checksums rmd160 709be7df28045c4fc8ed40cadd299478439f9522 \
</span><span class="cx"> sha256 0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40
</span><span class="cx">
</span><del>-patchfiles patch-setup.py.diff \
- patch-Lib-cgi.py.diff \
- patch-configure.diff \
- patch-setup.py-disabled_modules.diff \
- patch-Lib-ctypes-macholib-dyld.py.diff \
- patch-libedit.diff \
- omit-local-site-packages.patch \
- patch-xcode4bug.diff
</del><ins>+patchfiles patch-setup.py.diff \
+ patch-Lib-cgi.py.diff \
+ patch-configure.diff \
+ patch-setup.py-disabled_modules.diff \
+ patch-Lib-ctypes-macholib-dyld.py.diff \
+ patch-libedit.diff \
+ omit-local-site-packages.patch \
+ patch-xcode4bug.diff
</ins><span class="cx">
</span><del>-depends_lib port:zlib path:lib/libssl.dylib:openssl \
- port:sqlite3 port:ncurses \
- port:bzip2 port:libedit port:gettext \
- port:xz
-depends_run port:python_select \
- port:python3_select
</del><ins>+depends_lib port:zlib path:lib/libssl.dylib:openssl \
+ port:sqlite3 port:ncurses \
+ port:bzip2 port:libedit port:gettext \
+ port:xz
+depends_run port:python_select \
+ port:python3_select
</ins><span class="cx">
</span><span class="cx"> # blacklist llvm-gcc-4.2 compiler known to produce bad code
</span><del>-compiler.blacklist *llvm-gcc-4.2
</del><ins>+compiler.blacklist *llvm-gcc-4.2
</ins><span class="cx">
</span><span class="cx"> # ensurepip arg may be removed later, now conflicts with pip and setuptools
</span><span class="cx"> # packages
</span><del>-configure.args --enable-framework=${frameworks_dir} \
- --enable-ipv6 \
- --with-computed-gotos \
- --with-ensurepip=no
</del><ins>+configure.args --enable-framework=${frameworks_dir} \
+ --enable-ipv6 \
+ --with-computed-gotos \
+ --with-ensurepip=no
</ins><span class="cx">
</span><del>-configure.ccache no
</del><ins>+configure.ccache no
</ins><span class="cx">
</span><del>-use_parallel_build yes
</del><ins>+use_parallel_build yes
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|@@PREFIX@@|${prefix}|g" \
- ${worksrcpath}/Lib/cgi.py \
- ${worksrcpath}/Lib/ctypes/macholib/dyld.py
</del><ins>+ reinplace "s|@@PREFIX@@|${prefix}|g" \
+ ${worksrcpath}/Lib/cgi.py \
+ ${worksrcpath}/Lib/ctypes/macholib/dyld.py
</ins><span class="cx">
</span><del>- reinplace "s|/setup.py|/setup.py --no-user-cfg|" ${worksrcpath}/Makefile.pre.in
</del><ins>+ reinplace "s|/setup.py|/setup.py --no-user-cfg|" ${worksrcpath}/Makefile.pre.in
</ins><span class="cx">
</span><del>- # replace /Applications with ${applications_dir}
- reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
</del><ins>+ # replace /Applications with ${applications_dir}
+ reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
</ins><span class="cx"> ${worksrcpath}/configure
</span><span class="cx">
</span><del>- # See http://trac.macports.org/changeset/37861
- reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
</del><ins>+ # See http://trac.macports.org/changeset/37861
+ reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
</ins><span class="cx"> ${worksrcpath}/Mac/PythonLauncher/Makefile.in
</span><span class="cx"> }
</span><span class="cx">
</span><del>-build.target all
</del><ins>+build.target all
</ins><span class="cx">
</span><span class="cx"> # test_cmd_line fails
</span><span class="cx"> # see http://bugs.python.org/issue4388 and
</span><span class="cx"> # http://bugs.python.org/issue4474
</span><del>-test.run yes
-test.target test
</del><ins>+test.run yes
+test.target test
</ins><span class="cx">
</span><del>-destroot.target frameworkinstall maninstall
</del><ins>+destroot.target frameworkinstall maninstall
</ins><span class="cx">
</span><span class="cx"> # ensure that correct compiler is used
</span><del>-build.args-append MAKE="${build.cmd} CC=${configure.cc}"
</del><ins>+build.args-append MAKE="${build.cmd} CC=${configure.cc}"
</ins><span class="cx"> destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
</span><span class="cx">
</span><span class="cx"> set pythonNoDot python[string map {. {}} $branch]
</span><del>-select.entries [list python python-$pythonNoDot $pythonNoDot] \
- [list python3 python3-$pythonNoDot $pythonNoDot]
</del><ins>+select.entries [list python python-$pythonNoDot $pythonNoDot] \
+ [list python3 python3-$pythonNoDot $pythonNoDot]
</ins><span class="cx">
</span><span class="cx"> set confdir config-${branch}m
</span><span class="cx">
</span><span class="lines">@@ -114,42 +114,42 @@
</span><span class="cx"> "
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- set framewpath ${frameworks_dir}/Python.framework
- set framewdir ${framewpath}/Versions/${branch}
</del><ins>+ set framewpath ${frameworks_dir}/Python.framework
+ set framewdir ${framewpath}/Versions/${branch}
</ins><span class="cx">
</span><del>- foreach dir { Headers Resources Python Versions/Current } {
- file delete ${destroot}${framewpath}/${dir}
- }
</del><ins>+ foreach dir { Headers Resources Python Versions/Current } {
+ file delete ${destroot}${framewpath}/${dir}
+ }
</ins><span class="cx">
</span><del>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</del><ins>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</ins><span class="cx">
</span><del>- # Without this, LINKFORSHARED is set to
- # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
- # (this becomes Python.framework/Versions/3.2/Python) which doesn't
- # quite work (see ticket #15099); instead specifically list the
- # full path to the proper Python framework file (which becomes
- # ${prefix}/Library/Frameworks/Python.framework/Versions/3.2/Python)
</del><ins>+ # Without this, LINKFORSHARED is set to
+ # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
+ # (this becomes Python.framework/Versions/3.2/Python) which doesn't
+ # quite work (see ticket #15099); instead specifically list the
+ # full path to the proper Python framework file (which becomes
+ # ${prefix}/Library/Frameworks/Python.framework/Versions/3.2/Python)
</ins><span class="cx"> reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</span><span class="cx">
</span><del>- # remove -arch flags from the config
</del><ins>+ # remove -arch flags from the config
</ins><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><del>- ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</del><ins>+ ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</ins><span class="cx"> foreach unversioned {2to3 idle3 pydoc3 python3 python3-config pyvenv} {
</span><span class="cx"> delete ${destroot}${prefix}/bin/${unversioned}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- post-configure {
- # See http://trac.macports.org/ticket/18376
- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
- }
</del><ins>+ post-configure {
+ # See http://trac.macports.org/ticket/18376
+ system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant readline description {Use readline instead of libedit} {
</span><del>- patchfiles-delete patch-libedit.diff
- depends_lib-append port:readline
- depends_lib-delete port:libedit
</del><ins>+ patchfiles-delete patch-libedit.diff
+ depends_lib-append port:readline
+ depends_lib-delete port:libedit
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant universal {
</span><span class="lines">@@ -163,12 +163,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> reinplace \
</span><del>- "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
- ${worksrcpath}/configure
</del><ins>+ "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
+ ${worksrcpath}/configure
</ins><span class="cx"> if { ${arch_run_32bit} != "" } {
</span><span class="cx"> reinplace \
</span><del>- "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
- ${worksrcpath}/configure
</del><ins>+ "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
+ ${worksrcpath}/configure
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if {${configure.sdkroot} != ""} {
</span><span class="lines">@@ -187,9 +187,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-#livecheck.url ${homepage}download/releases/
-livecheck.url ${homepage}downloads/source/
-livecheck.regex Python (${branch}(?:\\.\\d+)*)
</del><ins>+livecheck.type regex
+#livecheck.url ${homepage}download/releases/
+livecheck.url ${homepage}downloads/source/
+livecheck.regex Python (${branch}(?:\\.\\d+)*)
</ins><span class="cx"> #regex below just for test releases, proper above
</span><del>-#livecheck.regex Python\[ \]+(3.5.0\[abrc\]+\[0-9\])
</del><ins>+#livecheck.regex Python\[ \]+(3.5.0\[abrc\]+\[0-9\])
</ins></span></pre>
</div>
</div>
</body>
</html>