[80148] trunk/dports

jmr at macports.org jmr at macports.org
Tue Jul 5 04:49:05 PDT 2011


Revision: 80148
          http://trac.macports.org/changeset/80148
Author:   jmr at macports.org
Date:     2011-07-05 04:49:02 -0700 (Tue, 05 Jul 2011)
Log Message:
-----------
python31:
 * update to 3.1.4
 * split tkinter out into py31-tkinter
 * make pyconfig.h correct for universal builds, just in case

Modified Paths:
--------------
    trunk/dports/lang/python31/Portfile
    trunk/dports/lang/python31/files/patch-Lib-cgi.py.diff
    trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
    trunk/dports/python/py31-tkinter/Portfile
    trunk/dports/python/py31-tkinter/files/setup.py

Added Paths:
-----------
    trunk/dports/lang/python31/files/pyconfig.h-universal.ed
    trunk/dports/python/py31-tkinter/

Removed Paths:
-------------
    trunk/dports/lang/python31/files/patch-Makefile.pre.in.diff
    trunk/dports/lang/python31/files/patch-configure-arch_only.diff
    trunk/dports/lang/python31/files/version.plist

Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/Portfile	2011-07-05 11:49:02 UTC (rev 80148)
@@ -5,8 +5,7 @@
 
 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] .]
 categories              lang
@@ -21,24 +20,18 @@
 master_sites            ${homepage}ftp/python/${version}/
 
 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
 depends_run             port:python_select
@@ -110,12 +103,6 @@
    # ${prefix}/Library/Frameworks/Python.framework/Versions/3.1/Python)
    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} \
       ${destroot}${framewdir}/lib/python${branch}/config/Makefile
@@ -157,17 +144,15 @@
    } else {
       configure.args-append   --enable-universalsdk=/
    }
+   post-configure {
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
+   }
 }
 
 variant ucs4 description {Use 4-byte Unicode characters} {
    configure.args-append   --with-wide-unicode
 }
 
-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/
 livecheck.regex         Python (${branch}(?:\\.\\d+)*)

Modified: trunk/dports/lang/python31/files/patch-Lib-cgi.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-Lib-cgi.py.diff	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/files/patch-Lib-cgi.py.diff	2011-07-05 11:49:02 UTC (rev 80148)
@@ -2,7 +2,7 @@
 +++ Lib/cgi.py	2007-08-21 15:36:54.000000000 +0200
 @@ -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
 -# intentionally NOT "/usr/bin/env python".  On many systems

Deleted: trunk/dports/lang/python31/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-Makefile.pre.in.diff	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/files/patch-Makefile.pre.in.diff	2011-07-05 11:49:02 UTC (rev 80148)
@@ -1,15 +0,0 @@
---- Makefile.pre.in.orig	2009-06-11 17:54:11.000000000 -0500
-+++ Makefile.pre.in	2009-06-30 06:31:51.000000000 -0500
-@@ -463,10 +463,10 @@
- 			-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
- 			-compatibility_version $(VERSION) \
- 			-current_version $(VERSION) \
--			-framework CoreFoundation $(LIBS); \
-+			-framework CoreFoundation $(LIBS) $(LDFLAGS); \
-         else \
- 		/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
--			@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
-+			@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS) $(LDFLAGS);\
- 	fi
- 	$(INSTALL) -d -m $(DIRMODE)  \
- 		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj

Deleted: trunk/dports/lang/python31/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-configure-arch_only.diff	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/files/patch-configure-arch_only.diff	2011-07-05 11:49:02 UTC (rev 80148)
@@ -1,20 +0,0 @@
---- configure.orig	2009-06-09 07:22:57.000000000 +1000
-+++ configure	2009-09-01 08:21:21.000000000 +1000
-@@ -13255,7 +13255,7 @@
-     if test "${enable_universalsdk}"; then
- 	    :
-     else
--        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 @@
- 	#ARCH_RUN_32BIT="true"
-     fi
- 
--    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)';;
- esac

Modified: trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff	2011-07-05 11:49:02 UTC (rev 80148)
@@ -1,7 +1,7 @@
---- 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.
 -disabled_module_list = []

Copied: trunk/dports/lang/python31/files/pyconfig.h-universal.ed (from rev 80144, trunk/dports/lang/python26/files/pyconfig.h-universal.ed)
===================================================================
--- trunk/dports/lang/python31/files/pyconfig.h-universal.ed	                        (rev 0)
+++ trunk/dports/lang/python31/files/pyconfig.h-universal.ed	2011-07-05 11:49:02 UTC (rev 80148)
@@ -0,0 +1,50 @@
+/HAVE_LARGEFILE_SUPPORT/c
+#ifdef __LP64__
+/* #undef HAVE_LARGEFILE_SUPPORT */
+#else
+#define HAVE_LARGEFILE_SUPPORT 1
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_PTHREAD_T/c
+#ifdef __LP64__
+#define SIZEOF_PTHREAD_T 8
+#else
+#define SIZEOF_PTHREAD_T 4
+#endif
+.
+/SIZEOF_SIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/SIZEOF_TIME_T/c
+#ifdef __LP64__
+#define SIZEOF_TIME_T 8
+#else
+#define SIZEOF_TIME_T 4
+#endif
+.
+/SIZEOF_UINTPTR_T/c
+#ifdef __LP64__
+#define SIZEOF_UINTPTR_T 8
+#else
+#define SIZEOF_UINTPTR_T 4
+#endif
+.
+/SIZEOF_VOID_P/c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+w

Deleted: trunk/dports/lang/python31/files/version.plist
===================================================================
--- trunk/dports/lang/python31/files/version.plist	2011-07-05 09:57:42 UTC (rev 80147)
+++ trunk/dports/lang/python31/files/version.plist	2011-07-05 11:49:02 UTC (rev 80148)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildVersion</key>
-	<string>1</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
-	<key>CFBundleVersion</key>
-	<string>3.0.1</string>
-	<key>ProjectName</key>
-	<string>Python</string>
-	<key>SourceVersion</key>
-	<string>3.0.1</string>
-</dict>
-</plist>

Modified: trunk/dports/python/py31-tkinter/Portfile
===================================================================
--- trunk/dports/python/py27-tkinter/Portfile	2011-07-05 00:39:43 UTC (rev 80127)
+++ trunk/dports/python/py31-tkinter/Portfile	2011-07-05 11:49:02 UTC (rev 80148)
@@ -2,25 +2,24 @@
 # $Id$
 
 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
 
@@ -40,4 +39,4 @@
 
 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\]+)

Modified: trunk/dports/python/py31-tkinter/files/setup.py
===================================================================
--- trunk/dports/python/py27-tkinter/files/setup.py	2011-07-05 00:39:43 UTC (rev 80127)
+++ trunk/dports/python/py31-tkinter/files/setup.py	2011-07-05 11:49:02 UTC (rev 80148)
@@ -6,7 +6,7 @@
     from distutils.command.install import install
     from distutils.core import setup, Extension
 except:
-    raise SystemExit, "Distutils problem"
+    raise SystemExit("Distutils problem")
 
 tkversion = "__TK-VERSION__"
 prefix = "__PREFIX__"
@@ -14,7 +14,7 @@
 lib_dirs = [prefix + "/lib"]
 libs = ["tcl" + tkversion, "tk" + tkversion]
 
-setup(name = "Tkinter",
+setup(name = "tkinter",
       description = "Tk Extension to Python",
       
       ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110705/eb400048/attachment.html>


More information about the macports-changes mailing list