[80446] trunk/dports
jmr at macports.org
jmr at macports.org
Wed Jul 13 04:32:18 PDT 2011
Revision: 80446
http://trac.macports.org/changeset/80446
Author: jmr at macports.org
Date: 2011-07-13 04:32:16 -0700 (Wed, 13 Jul 2011)
Log Message:
-----------
python32: fix patches (#30158), split out tkinter into separate port, add universal fixups for pyconfig.h just in case
Modified Paths:
--------------
trunk/dports/lang/python32/Portfile
trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff
trunk/dports/python/py32-tkinter/Portfile
Added Paths:
-----------
trunk/dports/lang/python32/files/pyconfig.h-universal.ed
trunk/dports/python/py32-tkinter/
Removed Paths:
-------------
trunk/dports/lang/python32/files/patch-Makefile.pre.in.diff
trunk/dports/lang/python32/files/patch-configure-arch_only.diff
Modified: trunk/dports/lang/python32/Portfile
===================================================================
--- trunk/dports/lang/python32/Portfile 2011-07-13 10:11:02 UTC (rev 80445)
+++ trunk/dports/lang/python32/Portfile 2011-07-13 11:32:16 UTC (rev 80446)
@@ -18,29 +18,23 @@
programming language.
homepage http://www.python.org/
-master_sites ${homepage}/ftp/python/${version}/
+master_sites ${homepage}ftp/python/${version}/
distname Python-${version}
+# consider changing to xz with next release
use_bzip2 yes
checksums md5 f0869ba3f3797aacb1f954ef24c256f3 \
sha1 876943a2585e6365fdd7ffce1771d1bb689746a5 \
rmd160 398adb5ebb676006a97296d71d82a2a0cb9b984c
-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 \
- patch-configure.diff
+ patch-configure.diff \
+ patch-setup_no_tkinter.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
-}
-
-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
@@ -106,12 +100,6 @@
# ${prefix}/Library/Frameworks/Python.framework/Versions/3.2/Python)
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config-${branch}m/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-${branch}m/Makefile
@@ -148,17 +136,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+)*)
Deleted: trunk/dports/lang/python32/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python32/files/patch-Makefile.pre.in.diff 2011-07-13 10:11:02 UTC (rev 80445)
+++ trunk/dports/lang/python32/files/patch-Makefile.pre.in.diff 2011-07-13 11:32:16 UTC (rev 80446)
@@ -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) $(PY_LDFLAGS); \
- else \
- /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-- @LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
-+ @LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS) $(PY_LDFLAGS);\
- fi
- $(INSTALL) -d -m $(DIRMODE) \
- $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
Deleted: trunk/dports/lang/python32/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python32/files/patch-configure-arch_only.diff 2011-07-13 10:11:02 UTC (rev 80445)
+++ trunk/dports/lang/python32/files/patch-configure-arch_only.diff 2011-07-13 11:32:16 UTC (rev 80446)
@@ -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/python32/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff 2011-07-13 10:11:02 UTC (rev 80445)
+++ trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff 2011-07-13 11:32:16 UTC (rev 80446)
@@ -1,11 +1,11 @@
---- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
-+++ setup.py 2009-09-17 00:33:12.000000000 -0600
-@@ -17,7 +17,7 @@
- from distutils.command.install_lib import install_lib
+--- setup.py.orig 2011-07-09 16:58:56.000000000 +1000
++++ setup.py 2011-07-13 20:50:12.000000000 +1000
+@@ -21,7 +21,7 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
+disabled_module_list = ["_tkinter"]
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
+ # File which contains the directory for shared mods (for sys.path fixup
+ # when running from the build dir, see Modules/getpath.c)
Copied: trunk/dports/lang/python32/files/pyconfig.h-universal.ed (from rev 80444, trunk/dports/lang/python31/files/pyconfig.h-universal.ed)
===================================================================
--- trunk/dports/lang/python32/files/pyconfig.h-universal.ed (rev 0)
+++ trunk/dports/lang/python32/files/pyconfig.h-universal.ed 2011-07-13 11:32:16 UTC (rev 80446)
@@ -0,0 +1,78 @@
+/DOUBLE_IS_BIG_ENDIAN_IEEE754/c
+#ifdef __BIG_ENDIAN__
+#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1
+#else
+/* #undef DOUBLE_IS_BIG_ENDIAN_IEEE754 */
+#endif
+.
+/DOUBLE_IS_LITTLE_ENDIAN_IEEE754/c
+#ifdef __LITTLE_ENDIAN__
+#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
+#else
+/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */
+#endif
+.
+/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
+.
+/SIZEOF__BOOL/c
+#if defined(__LP64__) || !defined(__POWERPC__)
+#define SIZEOF__BOOL 1
+#else
+#define SIZEOF__BOOL 4
+#endif
+.
+/VA_LIST_IS_ARRAY/c
+#ifdef __LP64__
+#define VA_LIST_IS_ARRAY 1
+#else
+/* #undef VA_LIST_IS_ARRAY */
+#endif
+.
+w
Modified: trunk/dports/python/py32-tkinter/Portfile
===================================================================
--- trunk/dports/python/py31-tkinter/Portfile 2011-07-13 10:00:40 UTC (rev 80444)
+++ trunk/dports/python/py32-tkinter/Portfile 2011-07-13 11:32:16 UTC (rev 80446)
@@ -2,10 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup python31 1.0
+PortGroup python32 1.0
-name py31-tkinter
-version 3.1.4
+name py32-tkinter
+version 3.2.1
categories python graphics
platforms darwin
maintainers nomaintainer
@@ -15,11 +15,12 @@
homepage http://docs.python.org/release/${version}/library/tkinter.html
master_sites http://www.python.org/ftp/python/${version}/
distname Python-${version}
-dist_subdir python31
-checksums md5 dcd128e69f8ee239182b54e33313aac7 \
- sha1 e5767a4fc92433816451de75c8721f2e1a81f6ea \
- rmd160 beb24a2a1227aa2bc036263b4c808daa72fa3e02
-use_xz yes
+dist_subdir python32
+checksums md5 f0869ba3f3797aacb1f954ef24c256f3 \
+ sha1 876943a2585e6365fdd7ffce1771d1bb689746a5 \
+ rmd160 398adb5ebb676006a97296d71d82a2a0cb9b984c
+# consider changing to xz with next python32 release
+use_bzip2 yes
depends_lib-append port:tk
@@ -39,4 +40,4 @@
livecheck.type regex
livecheck.url http://www.python.org/download/releases/
-livecheck.regex Python (3\\.1\\.\[0-9\]+)
+livecheck.regex Python (3\\.2\\.\[0-9\]+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110713/d01cf1d1/attachment.html>
More information about the macports-changes
mailing list