Revision: 89530 http://trac.macports.org/changeset/89530 Author: jwa@macports.org Date: 2012-02-01 10:22:45 -0800 (Wed, 01 Feb 2012) Log Message: ----------- unified port for 2.4, 2.5 and 2.7, changed checksums Modified Paths: -------------- trunk/dports/python/py-wxpython/Portfile Added Paths: ----------- trunk/dports/python/py-wxpython/files/ trunk/dports/python/py-wxpython/files/patch-config.py.diff Removed Paths: ------------- trunk/dports/python/py25-wxpython/ trunk/dports/python/py27-wxpython/ Modified: trunk/dports/python/py-wxpython/Portfile =================================================================== --- trunk/dports/python/py-wxpython/Portfile 2012-02-01 18:11:40 UTC (rev 89529) +++ trunk/dports/python/py-wxpython/Portfile 2012-02-01 18:22:45 UTC (rev 89530) @@ -1,12 +1,14 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 -PortGroup python24 1.0 +PortGroup python 1.0 name py-wxpython version 2.8.12.1 categories python graphics platforms darwin +python.versions 24 25 27 maintainers jwa description Python interface to the wxWindows cross platform GUI long_description wxPython is a GUI toolkit for the Python programming \ @@ -22,15 +24,11 @@ distname wxPython-src-${version} use_bzip2 yes -checksums md5 8c06c5941477beee213b4f2fa78be620 \ - sha1 05688dc03d61631750f5904273122bb40a2115f5 \ - rmd160 94eae06087bdd930e21bf90cc6672f93a1f5a17a +checksums rmd160 94eae06087bdd930e21bf90cc6672f93a1f5a17a \ + sha256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 -#patchfiles patch-config.py +depends_lib-append port:wxWidgets -depends_lib port:python24 \ - port:wxWidgets - # wxWidgets is not 64-bit supported_archs i386 ppc @@ -48,11 +46,13 @@ patchfiles patch-config.py.diff } -post-destroot { - xinstall -d -m 755 ${destroot}${prefix}/share/doc/ - file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name} - file copy ${worksrcpath}/samples \ - ${destroot}${prefix}/share/doc/${name}/examples +if {$subport != $name} { + post-destroot { + xinstall -d -m 755 ${destroot}${prefix}/share/doc/ + file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${subport} + file copy ${worksrcpath}/samples \ + ${destroot}${prefix}/share/doc/${subport}/examples + } } livecheck.type regex Added: trunk/dports/python/py-wxpython/files/patch-config.py.diff =================================================================== --- trunk/dports/python/py-wxpython/files/patch-config.py.diff (rev 0) +++ trunk/dports/python/py-wxpython/files/patch-config.py.diff 2012-02-01 18:22:45 UTC (rev 89530) @@ -0,0 +1,27 @@ +--- config.py 2011-12-04 12:28:13.000000000 +0200 ++++ config.py 2011-12-04 12:36:13.000000000 +0200 +@@ -1031,19 +1031,11 @@ + GENDIR = 'mac' + libs = ['stdc++'] + NO_SCRIPTS = 1 +- if not ARCH == "": +- cflags.append("-arch") +- cflags.append(ARCH) +- lflags.append("-arch") +- lflags.append(ARCH) +- #if ARCH == "ppc": +- # cflags.append("-isysroot") +- # cflags.append("/Developer/SDKs/MacOSX10.3.9.sdk") +- +- if not os.environ.get('CC') or not os.environ.get('CXX'): +- os.environ["CXX"] = "g++-4.0" +- os.environ["CC"] = "gcc-4.0" +- os.environ["CPP"] = "cpp-4.0" ++ os.environ["CXX"] = "llvm-g++-4.2" ++ os.environ["CC"] = "llvm-gcc-4.2" ++ os.environ["CPP"] = "llvm-cpp-4.2" ++ cflags.append("-isysroot") ++ cflags.append("/Developer/SDKs/MacOSX10.6.sdk") + + else: + # Set flags for other Unix type platforms