<!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>[49743] trunk/dports/lang/python26</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="http://trac.macports.org/changeset/49743">49743</a></dd>
<dt>Author</dt> <dd>blb@macports.org</dd>
<dt>Date</dt> <dd>2009-04-16 23:01:56 -0700 (Thu, 16 Apr 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>lang/python26 - version update to 2.6.2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpython26Portfile">trunk/dports/lang/python26/Portfile</a></li>
<li><a href="#trunkdportslangpython26filespatchMacIDLEMakefileindiff">trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff</a></li>
<li><a href="#trunkdportslangpython26filespatchMacMakefileindiff">trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff</a></li>
<li><a href="#trunkdportslangpython26filespatchMacPythonLauncherMakefileindiff">trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff</a></li>
<li><a href="#trunkdportslangpython26filesversionplist">trunk/dports/lang/python26/files/version.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpython26Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python26/Portfile (49742 => 49743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python26/Portfile 2009-04-17 05:52:53 UTC (rev 49742)
+++ trunk/dports/lang/python26/Portfile 2009-04-17 06:01:56 UTC (rev 49743)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> name python26
</span><del>-version 2.6.1
-revision 2
</del><ins>+version 2.6.2
</ins><span class="cx"> set major [lindex [split $version .] 0]
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories lang
</span><span class="lines">@@ -23,12 +22,15 @@
</span><span class="cx"> distname Python-${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums md5 e81c2f0953aa60f8062c05a4673f2be0 \
- sha1 419f0cb29e9713ea861dde8c43d107c51329e57b \
- rmd160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d
</del><ins>+checksums md5 245db9f1e0f09ab7e0faaa0cf7301011 \
+ sha1 125d4ed90f82de1d44f288150bbbda23a6cd27a4 \
+ rmd160 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
</ins><span class="cx">
</span><span class="cx"> # patch-Lib-distutils-dist.py.diff comes from
</span><span class="cx"> # <http://bugs.python.org/issue1180>
</span><ins>+# Setting PYTHONHOME with patch-Mac-IDLE-Makefile.in.diff,
+# patch-Mac-Makefile.in.diff, and patch-Mac-PythonLauncher-Makefile.in.diff
+# is to work around http://bugs.python.org/issue5766
</ins><span class="cx"> patchfiles patch-Makefile.pre.in.diff \
</span><span class="cx"> patch-setup.py.diff \
</span><span class="cx"> patch-Lib-cgi.py.diff \
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
</span><ins>+ ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython26.dylib
</ins><span class="cx">
</span><span class="cx"> # Without this, LINKFORSHARED is set to
</span><span class="cx"> # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
</span><span class="lines">@@ -96,6 +99,10 @@
</span><span class="cx"> # http://bugs.python.org/issue4937)
</span><span class="cx"> xinstall -m 644 ${filespath}/version.plist \
</span><span class="cx"> ${destroot}${framewdir}/Resources/version.plist
</span><ins>+
+ foreach unversionedFile {idle pydoc python python-config pythonw smtpd.py} {
+ delete ${destroot}${prefix}/bin/${unversionedFile}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="lines">@@ -156,3 +163,4 @@
</span><span class="cx"> livecheck.check regex
</span><span class="cx"> livecheck.url ${homepage}download/releases/
</span><span class="cx"> livecheck.regex Python (${branch}(?:\\.\\d+)*)
</span><ins>+
</ins></span></pre></div>
<a id="trunkdportslangpython26filespatchMacIDLEMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff (49742 => 49743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff 2009-04-17 05:52:53 UTC (rev 49742)
+++ trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff 2009-04-17 06:01:56 UTC (rev 49743)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- Mac/IDLE/Makefile.in.orig 2008-07-17 23:48:03.000000000 -0600
-+++ Mac/IDLE/Makefile.in 2008-10-04 19:50:50.000000000 -0600
</del><ins>+--- Mac/IDLE/Makefile.in.orig 2009-01-02 04:47:17.000000000 -0700
++++ Mac/IDLE/Makefile.in 2009-04-16 00:54:43.000000000 -0600
</ins><span class="cx"> @@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
</span><span class="lines">@@ -9,3 +9,12 @@
</span><span class="cx">
</span><span class="cx"> all: IDLE.app
</span><span class="cx">
</span><ins>+@@ -42,7 +42,7 @@
+ $(srcdir)/../Icons/PythonSource.icns \
+ $(srcdir)/../Icons/PythonCompiled.icns Info.plist
+ rm -fr IDLE.app
+- $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(BUNDLEBULDER) \
++ PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(BUNDLEBULDER) \
+ --builddir=. \
+ --name=IDLE \
+ --link-exec \
</ins></span></pre></div>
<a id="trunkdportslangpython26filespatchMacMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff (49742 => 49743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff 2009-04-17 05:52:53 UTC (rev 49742)
+++ trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff 2009-04-17 06:01:56 UTC (rev 49743)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Mac/Makefile.in.orig 2008-07-22 01:06:33.000000000 -0600
-+++ Mac/Makefile.in 2008-10-04 19:51:40.000000000 -0600
-@@ -18,7 +18,7 @@
</del><ins>+--- Mac/Makefile.in.orig 2009-03-30 13:58:41.000000000 -0600
++++ Mac/Makefile.in 2009-04-16 00:54:26.000000000 -0600
+@@ -19,7 +19,7 @@
</ins><span class="cx">
</span><span class="cx"> # These are normally glimpsed from the previous set
</span><span class="cx"> bindir=$(prefix)/bin
</span><span class="lines">@@ -9,3 +9,12 @@
</span><span class="cx"> APPINSTALLDIR=$(prefix)/Resources/Python.app
</span><span class="cx">
</span><span class="cx"> # Variables for installing the "normal" unix binaries
</span><ins>+@@ -224,7 +224,7 @@
+ cd IDLE && make install
+
+ install_BuildApplet:
+- $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
++ PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
+ --destroot "$(DESTDIR)" \
+ --python=$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)`test -f "$(DESTDIR)$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)-32" && echo "-32"` \
+ --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \
</ins></span></pre></div>
<a id="trunkdportslangpython26filespatchMacPythonLauncherMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff (49742 => 49743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff 2009-04-17 05:52:53 UTC (rev 49742)
+++ trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff 2009-04-17 06:01:56 UTC (rev 49743)
</span><span class="lines">@@ -1,6 +1,11 @@
</span><del>---- Mac/PythonLauncher/Makefile.in.orig 2008-05-02 13:58:56.000000000 -0600
-+++ Mac/PythonLauncher/Makefile.in 2008-10-04 19:52:27.000000000 -0600
-@@ -21,7 +21,7 @@
</del><ins>+--- Mac/PythonLauncher/Makefile.in.orig 2009-01-02 04:47:17.000000000 -0700
++++ Mac/PythonLauncher/Makefile.in 2009-04-16 00:55:11.000000000 -0600
+@@ -1,3 +1,4 @@
++prefix=@prefix@
+ CC=@CC@
+ LD=@CC@
+ BASECFLAGS=@BASECFLAGS@
+@@ -21,7 +22,7 @@
</ins><span class="cx">
</span><span class="cx"> BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
</span><span class="cx">
</span><span class="lines">@@ -9,3 +14,12 @@
</span><span class="cx"> OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
</span><span class="cx">
</span><span class="cx"> all: Python\ Launcher.app
</span><ins>+@@ -42,7 +43,7 @@
+ $(srcdir)/../Icons/PythonCompiled.icns \
+ $(srcdir)/factorySettings.plist
+ rm -fr "Python Launcher.app"
+- $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
++ PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
+ --builddir=. \
+ --name="Python Launcher" \
+ --executable="Python Launcher" \
</ins></span></pre></div>
<a id="trunkdportslangpython26filesversionplist"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/python26/files/version.plist (49742 => 49743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/python26/files/version.plist 2009-04-17 05:52:53 UTC (rev 49742)
+++ trunk/dports/lang/python26/files/version.plist 2009-04-17 06:01:56 UTC (rev 49743)
</span><span class="lines">@@ -5,12 +5,12 @@
</span><span class="cx"> <key>BuildVersion</key>
</span><span class="cx"> <string>1</string>
</span><span class="cx"> <key>CFBundleShortVersionString</key>
</span><del>- <string>2.6.1</string>
</del><ins>+ <string>2.6.2</string>
</ins><span class="cx"> <key>CFBundleVersion</key>
</span><del>- <string>2.6.1</string>
</del><ins>+ <string>2.6.2</string>
</ins><span class="cx"> <key>ProjectName</key>
</span><span class="cx"> <string>Python</string>
</span><span class="cx"> <key>SourceVersion</key>
</span><del>- <string>2.6.1</string>
</del><ins>+ <string>2.6.2</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre>
</div>
</div>
</body>
</html>