[49743] trunk/dports/lang/python26

blb at macports.org blb at macports.org
Thu Apr 16 23:01:57 PDT 2009 

Revision: 49743
          http://trac.macports.org/changeset/49743
Author:   blb at macports.org
Date:     2009-04-16 23:01:56 -0700 (Thu, 16 Apr 2009)
Log Message:
-----------
lang/python26 - version update to 2.6.2

Modified Paths:
--------------
    trunk/dports/lang/python26/Portfile
    trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff
    trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff
    trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff
    trunk/dports/lang/python26/files/version.plist

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
 PortGroup select 1.0
 
 name                    python26
-version                 2.6.1
-revision                2
+version                 2.6.2
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -23,12 +22,15 @@
 distname                Python-${version}
 use_bzip2               yes
 
-checksums               md5     e81c2f0953aa60f8062c05a4673f2be0 \
-                        sha1    419f0cb29e9713ea861dde8c43d107c51329e57b \
-                        rmd160  497dafaca9c150fca611b0175eeb13c2fc4d3e2d
+checksums               md5     245db9f1e0f09ab7e0faaa0cf7301011 \
+                        sha1    125d4ed90f82de1d44f288150bbbda23a6cd27a4 \
+                        rmd160  85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
 
 # patch-Lib-distutils-dist.py.diff comes from
 # <http://bugs.python.org/issue1180>
+# 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
 patchfiles              patch-Makefile.pre.in.diff \
                         patch-setup.py.diff \
                         patch-Lib-cgi.py.diff \
@@ -82,6 +84,7 @@
    }
 
    ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
+   ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython26.dylib
 
    # Without this, LINKFORSHARED is set to 
    # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
@@ -96,6 +99,10 @@
    # http://bugs.python.org/issue4937)
    xinstall -m 644 ${filespath}/version.plist \
       ${destroot}${framewdir}/Resources/version.plist
+
+   foreach unversionedFile {idle pydoc python python-config pythonw smtpd.py} {
+      delete ${destroot}${prefix}/bin/${unversionedFile}
+   }
 }
 
 post-activate {
@@ -156,3 +163,4 @@
 livecheck.check         regex
 livecheck.url           ${homepage}download/releases/
 livecheck.regex         Python (${branch}(?:\\.\\d+)*)
+

Modified: trunk/dports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- 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
+--- 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
 @@ -22,7 +22,7 @@
  
  BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
@@ -9,3 +9,12 @@
  
  all: IDLE.app
  
+@@ -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 \

Modified: trunk/dports/lang/python26/files/patch-Mac-Makefile.in.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  
  # These are normally glimpsed from the previous set
  bindir=$(prefix)/bin
@@ -9,3 +9,12 @@
  APPINSTALLDIR=$(prefix)/Resources/Python.app
  
  # Variables for installing the "normal" unix binaries
+@@ -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" \

Modified: trunk/dports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff
===================================================================
--- 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)
@@ -1,6 +1,11 @@
---- 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 @@
+--- 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 @@
  
  BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
  
@@ -9,3 +14,12 @@
  OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
  
  all: Python\ Launcher.app
+@@ -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" \

Modified: trunk/dports/lang/python26/files/version.plist
===================================================================
--- 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)
@@ -5,12 +5,12 @@
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.1</string>
+	<string>2.6.2</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.1</string>
+	<string>2.6.2</string>
 	<key>ProjectName</key>
 	<string>Python</string>
 	<key>SourceVersion</key>
-	<string>2.6.1</string>
+	<string>2.6.2</string>
 </dict>
 </plist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090416/aeb217d3/attachment-0001.html>

More information about the macports-changes mailing list