[109233] users/mojca/wxports

mojca at macports.org mojca at macports.org
Sat Aug 10 15:15:35 PDT 2013


Revision: 109233
          https://trac.macports.org/changeset/109233
Author:   mojca at macports.org
Date:     2013-08-10 15:15:34 -0700 (Sat, 10 Aug 2013)
Log Message:
-----------
mojca/wxports: add py-wxpython-2.8 + other minor patches

Modified Paths:
--------------
    users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
    users/mojca/wxports/python/py-wxpython-3.0/Portfile

Added Paths:
-----------
    users/mojca/wxports/python/py-wxpython-2.8/
    users/mojca/wxports/python/py-wxpython-2.8/Portfile
    users/mojca/wxports/python/py-wxpython-2.8/files/
    users/mojca/wxports/python/py-wxpython-2.8/files/patch-config.py.diff

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-10 21:52:37 UTC (rev 109232)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-10 22:15:34 UTC (rev 109233)
@@ -80,8 +80,8 @@
     # 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
     if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
         return -code return "${name} cannot be built on Moc OS X >= 10.7 with Xcode >= 4.4, please use port ${distname}-3.0 instead"
-    # 10.7
     } else {
+        # 10.7
         if {${os.major} == 11} {
             if {[vercmp $xcodeversion 4.3] < 0} {
                 set sdks_dir "${developer_dir}/SDKs"
@@ -90,9 +90,6 @@
             }
             set conf_sdk "${sdks_dir}/MacOSX10.6.sdk"
             set conf_macosx_version_min "10.6"
-    #   } else {
-    #       set conf_sdk "no"
-    #       set conf_macosx_version_min "no"
         }
     }
 }

Added: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile	                        (rev 0)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile	2013-08-10 22:15:34 UTC (rev 109233)
@@ -0,0 +1,85 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
+# $Id$
+
+PortSystem          1.0
+PortGroup           python 1.0
+
+name                py-wxpython-2.8
+version             2.8.12.1
+set branch          [join [lrange [split ${version} .] 0 1] .]
+categories-append   graphics devel
+license             wxwidgets-3.1
+platforms           darwin
+maintainers         jwa mojca
+
+description         Python interface to the wxWindows cross platform GUI
+long_description    wxPython is a GUI toolkit for the Python programming \
+                    language. It allows Python programmers to create \
+                    programs with a robust, highly functional graphical \
+                    user interface, simply and easily. It is implemented \
+                    as a Python extension module (native code) that wraps \
+                    the popular wxWindows cross platform GUI library, \
+                    which is written in C++.
+
+homepage            http://www.wxpython.org/
+master_sites        sourceforge:wxpython
+
+distname            wxPython
+use_bzip2           yes
+
+checksums           rmd160  94eae06087bdd930e21bf90cc6672f93a1f5a17a \
+                    sha256  1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
+
+# TODO: there is no need to provide all of these; at the moment this is just for testing
+python.versions     24 25 26 27
+python.default_version 27
+
+# TODO: copy these variables from wxPython port or wxWidgets PortGroup
+set installdir      ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/${branch}
+set confscript      ${installdir}/bin/wx-config
+
+pre-fetch {
+    # 10.8 (or later) -or- 10.7 with Xcode 4.4 (or later)
+    if {${os.major} >= 12 || [vercmp $xcodeversion 4.4] >= 0} {
+        return -code return "${name} cannot be built on Moc OS X >= 10.7 with Xcode >= 4.4, please use port ${distname}-3.0 instead"
+    }
+}
+
+
+distfiles           ${distname}-src-${version}${extract.suffix}
+dist_subdir         ${distname}/${version}
+worksrcdir          ${distname}-src-${version}/wxPython
+
+# extract just the docs and wxPython subdir
+extract.post_args   "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
+
+if {$subport != $name} {
+    depends_lib-append  port:wxWidgets-2.8
+    supported_archs     i386 ppc
+    
+    patchfiles      patch-config.py.diff
+
+    post-patch {
+        if {[vercmp $xcodeversion 4.3] >= 0} {
+            reinplace "s;@developer_dir@;${developer_dir}/Platforms/MacOSX.platform/Developer;" ${worksrcpath}/config.py
+        } else {
+            reinplace "s;@developer_dir@;${developer_dir};" ${worksrcpath}/config.py
+        }
+    }
+
+    # TODO: is it possible to use build arguments instead of redefining the whole command?
+    build.cmd       ${python.bin} setup.py WX_CONFIG="${confscript}"
+    destroot.cmd    ${python.bin} setup.py WX_CONFIG="${confscript}"
+
+    livecheck.type  none
+} else {
+    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
+    }
+
+    livecheck.type  regex
+    livecheck.url   ${homepage}
+    livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
+}


Property changes on: users/mojca/wxports/python/py-wxpython-2.8/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: users/mojca/wxports/python/py-wxpython-2.8/files/patch-config.py.diff
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/files/patch-config.py.diff	                        (rev 0)
+++ users/mojca/wxports/python/py-wxpython-2.8/files/patch-config.py.diff	2013-08-10 22:15:34 UTC (rev 109233)
@@ -0,0 +1,24 @@
+--- config.py	2012-04-08 18:41:21.000000000 +0300
++++ config.py	2012-04-08 18:44:32.000000000 +0300
+@@ -1031,19 +1031,8 @@
+         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"
++        cflags.append("-isysroot")
++        cflags.append("@developer_dir@/SDKs/MacOSX10.6.sdk")
+ 
+     else:
+         # Set flags for other Unix type platforms

Modified: users/mojca/wxports/python/py-wxpython-3.0/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-3.0/Portfile	2013-08-10 21:52:37 UTC (rev 109232)
+++ users/mojca/wxports/python/py-wxpython-3.0/Portfile	2013-08-10 22:15:34 UTC (rev 109233)
@@ -6,7 +6,8 @@
 
 name                py-wxpython-3.0
 version             2.9.4.0
-categories          graphics devel
+set branch          [join [lrange [split ${version} .] 0 1] .]
+categories-append   graphics devel
 license             wxwidgets-3.1
 platforms           darwin
 maintainers         jwa mojca
@@ -31,11 +32,10 @@
 
 # TODO: there is no need to provide all of these; at the moment this is just for testing
 python.versions     24 25 26 27
-#python.default_version  27
+python.default_version 27
 
-# TODO: number 2.9 should be automatic based on version
-#       copy these variables from wxPython port or wxWidgets PortGroup
-set installdir      ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/2.9
+# TODO: copy these variables from wxPython port or wxWidgets PortGroup
+set installdir      ${frameworks_dir}/wxWidgets.framework/Versions/${distname}/${branch}
 set confscript      ${installdir}/bin/wx-config
 
 if {${os.major} < 9} {
@@ -52,14 +52,6 @@
 # extract just the docs and wxPython subdir
 extract.post_args   "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
 
-# TODO: please check why
-# universal_variant no
-
-# from the old port, doesn't work for me
-# build.env       UNICODE="1" WXPORT="osx_cocoa" PATH="${installdir}/lib/wx/config:$env(PATH)"
-# destroot.env    UNICODE="1" WXPORT="osx_cocoa" PATH="${installdir}/lib/wx/config:$env(PATH)"
-
-
 if {$subport != $name} {
     depends_lib-append  port:wxPython-3.0
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130810/8377c0be/attachment-0001.html>


More information about the macports-changes mailing list