[67508] trunk/dports/lang/python31

[jmr at macports.org]

Revision: 67508
          http://trac.macports.org/changeset/67508
Author:   jmr at macports.org
Date:     2010-05-11 05:12:46 -0700 (Tue, 11 May 2010)
Log Message:
-----------
python31: update to 3.1.2 (#24510), remove dead master_sites

Modified Paths:
--------------
    trunk/dports/lang/python31/Portfile
    trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff
    trunk/dports/lang/python31/files/patch-configure-arch_only.diff

Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile	2010-05-11 11:47:54 UTC (rev 67507)
+++ trunk/dports/lang/python31/Portfile	2010-05-11 12:12:46 UTC (rev 67508)
@@ -5,7 +5,7 @@
 
 name                    python31
 epoch                   1
-version                 3.1.1
+version                 3.1.2
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -17,17 +17,14 @@
                         programming language.
 
 homepage                http://www.python.org/
-master_sites            ${homepage}/ftp/python/${version}/ \
-                        ftp://ftp.python.org/pub/python/${version}/ \
-                        ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
-                        ftp://ftp.python.jp/pub/python/${version}/
+master_sites            ${homepage}ftp/python/${version}/
 
 distname                Python-${version}
 use_bzip2               yes
 
-checksums               md5     d1ddd9f16e3c6a51c7208f33518cd674 \
-                        sha1    42eb37bf75fae5731f6df1b195902960ae1789e0 \
-                        rmd160  d60b64e1346b2ff15d65b032ea35fb3ad8b0dc66
+checksums               md5     45350b51b58a46b029fb06c61257e350 \
+                        sha1    eecbddf020a1400f3201f049caa3be7e9d403d0c \
+                        rmd160  94b75a68c9d9f1c0206f112cae6eb9db79bda901
 
 patchfiles              patch-Makefile.pre.in.diff \
                         patch-setup.py.diff \
@@ -148,7 +145,9 @@
             ${worksrcpath}/configure
       }
    }
-   if {${macosx_version} == "10.4" && ${os.arch} == "powerpc"} {
+   if {[info exists configure.sdkroot] && ${configure.sdkroot} != ""} {
+      configure.args-append   --enable-universalsdk=${configure.sdkroot}
+   } elseif {${macosx_version} == "10.4" && ${os.arch} == "powerpc"} {
       configure.args-append   --enable-universalsdk=${developer_dir}/SDKs/MacOSX10.4u.sdk
    } else {
       configure.args-append   --enable-universalsdk=/

Modified: trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff	2010-05-11 11:47:54 UTC (rev 67507)
+++ trunk/dports/lang/python31/files/patch-Lib-distutils-dist.py.diff	2010-05-11 12:12:46 UTC (rev 67508)
@@ -20,7 +20,7 @@
 +
          self.finalize_options()
  
- 
+     def get_option_dict(self, command):
 @@ -315,6 +322,9 @@
          Distutils __inst__.py file lives), a file in the user's home
          directory named .pydistutils.cfg on Unix and pydistutils.cfg
@@ -48,4 +48,4 @@
 +            print("using config files: %s" % ', '.join(files))
          return files
  
- 
+     def parse_config_files(self, filenames=None):

Modified: trunk/dports/lang/python31/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-configure-arch_only.diff	2010-05-11 11:47:54 UTC (rev 67507)
+++ trunk/dports/lang/python31/files/patch-configure-arch_only.diff	2010-05-11 12:12:46 UTC (rev 67508)
@@ -4,16 +4,16 @@
      if test "${enable_universalsdk}"; then
  	    :
      else
--	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
-+	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
++        LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
      fi
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 @@ -13267,7 +13267,7 @@
-         else
-             LIBTOOL_CRUFT=""
+ 	#ARCH_RUN_32BIT="true"
      fi
--    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
+ 
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
 +    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100511/7e4f2b95/attachment.html>