Changeset 80148

Timestamp:

07/05/11 04:49:02 (4 years ago)

Author:

jmr@…

Message:

python31:

• update to 3.1.4
• split tkinter out into py31-tkinter
• make pyconfig.h correct for universal builds, just in case

Location:

trunk/dports

Files:

• lang/python31/Portfile (modified) (5 diffs)
• lang/python31/files/patch-Lib-cgi.py.diff (modified) (1 diff)
• lang/python31/files/patch-Makefile.pre.in.diff (deleted)
• lang/python31/files/patch-configure-arch_only.diff (deleted)
• lang/python31/files/patch-setup_no_tkinter.py.diff (modified) (1 diff)
• lang/python31/files/pyconfig.h-universal.ed (copied) (copied from trunk/dports/lang/python26/files/pyconfig.h-universal.ed) (1 diff)
• lang/python31/files/version.plist (deleted)
• python/py31-tkinter (copied) (copied from trunk/dports/python/py27-tkinter)
• python/py31-tkinter/Portfile (modified) (2 diffs)
• python/py31-tkinter/files/setup.py (modified) (2 diffs)

trunk/dports/lang/python31/Portfile

@@ -6 +6 @@
 name                    python31
 epoch                   1
-version                 3.1.3
-revision                2
+version                 3.1.4
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
@@ -22 +21 @@
 
 distname                Python-${version}
-use_bzip2               yes
+use_xz                  yes
 
-checksums               md5     ad5e5f1c07e829321e0a015f8cafe245 \
-                        sha1    aeadf1eb7f450aab77a8972c042bc5f49bcf2288 \
-                        rmd160  730f3b8eb1a41f1b7c469fc81be734bb802cb9f9
+checksums               md5     dcd128e69f8ee239182b54e33313aac7 \
+                        sha1    e5767a4fc92433816451de75c8721f2e1a81f6ea \
+                        rmd160  beb24a2a1227aa2bc036263b4c808daa72fa3e02
 
-patchfiles              patch-Makefile.pre.in.diff \
-                        patch-setup.py.diff \
+patchfiles              patch-setup.py.diff \
                         patch-Lib-cgi.py.diff \
-                        patch-Lib-distutils-dist.py.diff
-if {![variant_isset universal]} {
-    patchfiles-append   patch-configure-arch_only.diff
-     # -arch ends up getting passed to libtool which doesn't understand it, so we
-     # just clear it since this port doesn't respect build_arch anyway
-     configure.ld_archflags
-}
+                        patch-Lib-distutils-dist.py.diff \
+                        patch-setup_no_tkinter.py.diff
 
-depends_lib             port:zlib port:openssl port:tk \
+depends_lib             port:zlib port:openssl \
                         port:sqlite3 port:ncurses port:gdbm \
                         port:bzip2 port:readline port:gettext
@@ -111 +104 @@
    reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile
 
-   # The framework version.plist isn't currently being installed so
-   # we'll copy ours for now (see http://trac.macports.org/ticket/18773 and
-   # http://bugs.python.org/issue4937)
-   xinstall -m 644 ${filespath}/version.plist \
-      ${destroot}${framewdir}/Resources/version.plist
-
    # remove -arch flags from the config
    reinplace -E {s|-arch [a-z0-9_]+||g} \
@@ -158 +145 @@
       configure.args-append   --enable-universalsdk=/
    }
+   post-configure {
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
+   }
 }
 
@@ -164 +154 @@
 }
 
-variant no_tkinter description {Disable Tkinter support, which will break IDLE} {
-   patchfiles-append    patch-setup_no_tkinter.py.diff
-   depends_lib-delete   port:tk 
-}
-
 livecheck.type          regex
 livecheck.url           ${homepage}download/releases/

trunk/dports/lang/python31/files/patch-Lib-cgi.py.diff

@@ -3 +3 @@
 @@ -1,13 +1,6 @@
 -#! /usr/local/bin/python
-+#! @@PREFIX@@/bin/python3.0
++#! @@PREFIX@@/bin/python3.1
  
 -# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is

trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff

@@ -1 @@
---- setup.py.orig       2009-03-31 12:20:48.000000000 -0600
-+++ setup.py    2009-09-17 00:33:12.000000000 -0600
+--- setup.py.orig       2011-06-12 01:48:52.000000000 +1000
++++ setup.py    2011-07-05 20:35:54.000000000 +1000
 @@ -17,7 +17,7 @@
- from distutils.command.install_lib import install_lib
+ from distutils.spawn import find_executable
  
  # This global variable is used to hold the list of modules to be disabled.

trunk/dports/lang/python31/files/pyconfig.h-universal.ed

@@ -48 +48 @@
 #endif
 .
-/WORDS_BIGENDIAN/c
-#if __BIG_ENDIAN__
-#define WORDS_BIGENDIAN 1
-#endif
-.
 w

trunk/dports/python/py31-tkinter/Portfile

@@ -3 +3 @@
 
 PortSystem 1.0
-PortGroup python27 1.0
+PortGroup python31 1.0
 
-name                    py27-tkinter
-version                 2.7.2
+name                    py31-tkinter
+version                 3.1.4
 categories              python graphics
 platforms               darwin
-maintainers             singingwolfboy openmaintainer
+maintainers             nomaintainer
 description             Python bindings to the Tk widget set
 long_description        ${description}
 
-homepage                http://docs.python.org/library/tkinter.html
-master_sites            http://www.python.org/ftp/python/${version}/ \
-                        ftp://ftp.python.org/pub/python/${version}/
+homepage                http://docs.python.org/release/${version}/library/tkinter.html
+master_sites            http://www.python.org/ftp/python/${version}/
 distname                Python-${version}
-dist_subdir             python27
-checksums               md5     ba7b2f11ffdbf195ee0d111b9455a5bd \
-                        sha1    417bdeea77abfaf1b9257fc6b4a04aaa209f4547 \
-                        rmd160  c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
-use_bzip2               yes
+dist_subdir             python31
+checksums               md5     dcd128e69f8ee239182b54e33313aac7 \
+                        sha1    e5767a4fc92433816451de75c8721f2e1a81f6ea \
+                        rmd160  beb24a2a1227aa2bc036263b4c808daa72fa3e02
+use_xz                  yes
 
 depends_lib-append      port:tk
@@ -41 +40 @@
 livecheck.type  regex
 livecheck.url   http://www.python.org/download/releases/
-livecheck.regex Python (2.7.\[0-9\]+)
+livecheck.regex Python (3\\.1\\.\[0-9\]+)

trunk/dports/python/py31-tkinter/files/setup.py

@@ -7 +7 @@
     from distutils.core import setup, Extension
 except:
-    raise SystemExit, "Distutils problem"
+    raise SystemExit("Distutils problem")
 
 tkversion = "__TK-VERSION__"
@@ -15 +15 @@
 libs = ["tcl" + tkversion, "tk" + tkversion]
 
-setup(name = "Tkinter",
+setup(name = "tkinter",
       description = "Tk Extension to Python",