Revision: 80144 http://trac.macports.org/changeset/80144 Author: jmr@macports.org Date: 2011-07-05 01:13:44 -0700 (Tue, 05 Jul 2011) Log Message: ----------- python26: update to 2.6.7, and make pyconfig.h correct for universal builds just in case Modified Paths: -------------- trunk/dports/lang/python26/Portfile Added Paths: ----------- trunk/dports/lang/python26/files/pyconfig.h-universal.ed Modified: trunk/dports/lang/python26/Portfile =================================================================== --- trunk/dports/lang/python26/Portfile 2011-07-05 07:59:15 UTC (rev 80143) +++ trunk/dports/lang/python26/Portfile 2011-07-05 08:13:44 UTC (rev 80144) @@ -4,8 +4,7 @@ PortGroup select 1.0 name python26 -version 2.6.6 -revision 3 +version 2.6.7 set major [lindex [split $version .] 0] set branch [join [lrange [split ${version} .] 0 1] .] categories lang @@ -17,15 +16,14 @@ programming language. homepage http://www.python.org/ -master_sites ${homepage}/ftp/python/${version}/ \ - ftp://ftp.python.org/pub/python/${version}/ +master_sites ${homepage}ftp/python/${version}/ distname Python-${version} use_bzip2 yes -checksums md5 cf4e6881bb84a7ce6089e4a307f71f14 \ - sha1 a1daf2c2c7cffe0939c015260447572fe75c7e50 \ - rmd160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 +checksums md5 d40ef58ed88438a870bbeb0ac5d4217b \ + sha1 5d35eb746e85fb3deaff8518448137c9b9fb6daa \ + rmd160 513e84a7cb76ca876e3803bb03ed558bd0378063 # patch-Lib-distutils-dist.py.diff comes from # <http://bugs.python.org/issue1180> @@ -159,6 +157,9 @@ } else { configure.args-append --enable-universalsdk=/ } + post-configure { + system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed" + } } variant ucs4 description {Enable support for UCS4} { Copied: trunk/dports/lang/python26/files/pyconfig.h-universal.ed (from rev 80127, trunk/dports/lang/python25/files/pyconfig.h-universal.ed) =================================================================== --- trunk/dports/lang/python26/files/pyconfig.h-universal.ed (rev 0) +++ trunk/dports/lang/python26/files/pyconfig.h-universal.ed 2011-07-05 08:13:44 UTC (rev 80144) @@ -0,0 +1,55 @@ +/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 +. +/WORDS_BIGENDIAN/c +#if __BIG_ENDIAN__ +#define WORDS_BIGENDIAN 1 +#endif +. +w