[110279] trunk/dports
mojca at macports.org
mojca at macports.org
Thu Aug 29 07:19:20 PDT 2013
Revision: 110279
https://trac.macports.org/changeset/110279
Author: mojca at macports.org
Date: 2013-08-29 07:19:20 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
wxPython and its dependencies: use the new wxWidgets ports (some ports lack proper testing) #38375
Modified Paths:
--------------
trunk/dports/editors/spe/Portfile
trunk/dports/games/sounddecompress/Portfile
trunk/dports/gis/grass/Portfile
trunk/dports/net/bittorrent/Portfile
trunk/dports/python/py-dsv/Portfile
trunk/dports/python/py-pyface/Portfile
trunk/dports/python/py-robotframework-ride/Portfile
trunk/dports/python/py-winpdb/Portfile
trunk/dports/python/py-wxpython/Portfile
trunk/dports/python/py-wxpython-2.8/Portfile
trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff
trunk/dports/python/py-wxpython-3.0/Portfile
trunk/dports/python/py-wxpython-3.0/files/patch-config.py.diff
trunk/dports/python/py-wxpython30/Portfile
trunk/dports/python/py26-pyphant/Portfile
trunk/dports/python/py27-wxpython-devel/Portfile
trunk/dports/science/gnuradio/Portfile
trunk/dports/science/relax/Portfile
trunk/dports/science/stimfit/Portfile
Added Paths:
-----------
trunk/dports/python/py-wxpython/
trunk/dports/python/py-wxpython-2.8/
trunk/dports/python/py-wxpython-3.0/
trunk/dports/python/py-wxpython30/
Removed Paths:
-------------
trunk/dports/python/py-wxpython/
trunk/dports/python/py-wxpython/files/
trunk/dports/python/py-wxpython30/
trunk/dports/python/py-wxpython30/files/
trunk/dports/python/py26-wxpython/
trunk/dports/python/py27-wxpython-devel/files/
Modified: trunk/dports/editors/spe/Portfile
===================================================================
--- trunk/dports/editors/spe/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/editors/spe/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,37 +1,40 @@
+# -*- 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 python 1.0
+PortSystem 1.0
+PortGroup python 1.0
+PortGroup wxWidgets 1.0
-name spe
-version 0.8.4.h
-categories editors python
-license GPL-2+
-platforms darwin
-supported_archs noarch
-maintainers nomaintainer
-description spe - Stani's Python Editor
-long_description spe - Stani's Python Editor \
- Free Python IDE with Blender, Kiki, PyChecker, \
- Remote Debugger, Uml and wxGlade support.
+name spe
+version 0.8.4.h
+revision 1
+categories editors python
+license GPL-2+
+platforms darwin
+supported_archs noarch
+maintainers nomaintainer
+description spe - Stani's Python Editor
+long_description spe - Stani's Python Editor \
+ Free Python IDE with Blender, Kiki, PyChecker, \
+ Remote Debugger, Uml and wxGlade support.
-homepage http://pythonide.blogspot.com/
-master_sites http://download.berlios.de/python/
-distname spe-${version}-wx2.6.1.0
-checksums md5 55230b8b643b273912a1d6c3163cca27 \
- sha1 09d89c347976d984cd1e2c9c0c14d999520c8219
+homepage http://pythonide.blogspot.com/
+master_sites http://download.berlios.de/python/
+distname spe-${version}-wx2.6.1.0
+checksums md5 55230b8b643b273912a1d6c3163cca27 \
+ sha1 09d89c347976d984cd1e2c9c0c14d999520c8219
python.default_version 26
-depends_lib-append port:py26-wxpython
-depends_run port:py26-checker
+depends_lib-append port:py26-wxpython-2.8
+depends_run port:py26-checker
-worksrcdir spe-${version}
+worksrcdir spe-${version}
patch {
- reinplace "s|/usr/bin/env python|${prefix}/bin/pythonw2.6|1" ${worksrcpath}/_spe/spe
+ reinplace "s|/usr/bin/env python|${prefix}/bin/pythonw2.6|1" ${worksrcpath}/_spe/spe
}
post-destroot {
- file delete ${destroot}${prefix}/bin/spe_wininst.py
+ file delete ${destroot}${prefix}/bin/spe_wininst.py
}
Modified: trunk/dports/games/sounddecompress/Portfile
===================================================================
--- trunk/dports/games/sounddecompress/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/games/sounddecompress/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+#PortSystem wxWidgets 1.0
name sounddecompress
version 1.11
@@ -39,7 +40,7 @@
depends_lib port:libhsplasma \
port:sox
-# port:py26-wxpython
+# port:py26-wxpython-2.8
depends_run port:python26
Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/gis/grass/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,11 +1,12 @@
# $Id$
-PortSystem 1.0
+PortSystem 1.0
+PortGroup wxWidgets 1.0
name grass
epoch 1
version 6.4.2
-revision 3
+revision 4
maintainers nomaintainer
categories gis
license GPL-2+
@@ -21,6 +22,8 @@
checksums rmd160 2a8a2a63edf8e1cc53b7b26975087eef59c9a397 \
sha256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca
+wxWidgets.use wxPython-3.0
+
depends_build port:pkgconfig
depends_lib port:fftw-3 \
port:freetype \
@@ -35,8 +38,6 @@
path:lib/pkgconfig/cairo.pc:cairo \
port:readline
-use_parallel_build yes
-
# https://trac.macports.org/ticket/32790
# this should probably only apply to some Xcode versions
compiler.blacklist clang
@@ -195,13 +196,13 @@
}
variant wxwidgets description {Add WXWidgets support} {
- depends_lib-append port:wxwidgets30
+ depends_lib-append port:${wxWidgets.port}
configure.args-delete --disable-wxwidgets
- configure.args-append --with-wxwidgets=${prefix}/bin/wx-config
+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
}
variant wxPython requires wxwidgets description {Enable support for wxGUI Python extensions} {
- depends_lib port:py27-wxpython30
+ depends_lib port:py27-wxpython-3.0
configure.args-delete --disable-python
configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7-config
}
Modified: trunk/dports/net/bittorrent/Portfile
===================================================================
--- trunk/dports/net/bittorrent/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/net/bittorrent/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,36 +1,36 @@
# -*- 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 python 1.0
+PortSystem 1.0
+PortGroup python 1.0
+PortGroup wxWidgets 1.0
-name bittorrent
-version 5.2.0
-revision 1
-categories net python
-maintainers nomaintainer
-description peer-to-peer tool for distributing files
-long_description \
- BitTorrent is a tool for distributing files. It's extremely \
- easy to use - downloads are started by clicking on hyperlinks. \
- Whenever more than one person is downloading at once they send \
- pieces of the file(s) to each other, thus relieving the \
- central server's bandwidth burden. Even with many simultaneous \
- downloads, the upload burden on the central server remains \
- quite small, since each new downloader introduces new upload \
- capacity.
-homepage http://www.bittorrent.com/
-platforms darwin
-supported_archs noarch
+name bittorrent
+version 5.2.0
+revision 2
+categories net python
+maintainers nomaintainer
+description peer-to-peer tool for distributing files
+long_description BitTorrent is a tool for distributing files. It's extremely \
+ easy to use - downloads are started by clicking on hyperlinks. \
+ Whenever more than one person is downloading at once they send \
+ pieces of the file(s) to each other, thus relieving the \
+ central server's bandwidth burden. Even with many simultaneous \
+ downloads, the upload burden on the central server remains \
+ quite small, since each new downloader introduces new upload \
+ capacity.
+homepage http://www.bittorrent.com/
+platforms darwin
+supported_archs noarch
-master_sites http://download.bittorrent.com/dl/ \
- http://distfiles.macports.org/python/
-distname BitTorrent-${version}
-checksums md5 b35d1de939b0768fd5c62978326864eb \
- sha1 ff89b8e585b48dda4a87f5379636c0458a876277
+master_sites http://download.bittorrent.com/dl/ \
+ http://distfiles.macports.org/python/
+distname BitTorrent-${version}
+checksums md5 b35d1de939b0768fd5c62978326864eb \
+ sha1 ff89b8e585b48dda4a87f5379636c0458a876277
python.default_version 25
-depends_lib port:py${python.version}-wxpython \
- port:py${python.version}-twisted \
- port:py${python.version}-crypto
+depends_lib port:py${python.version}-wxpython-2.8 \
+ port:py${python.version}-twisted \
+ port:py${python.version}-crypto
Modified: trunk/dports/python/py-dsv/Portfile
===================================================================
--- trunk/dports/python/py-dsv/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-dsv/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup python 1.0
+PortGroup wxWidgets 1.0
name py-dsv
version 1.4.0
@@ -35,6 +36,6 @@
}
variant wx {
- depends_lib-append port:py${python.version}-wxpython
+ depends_run-append port:py${python.version}-wxpython-2.8
}
}
Modified: trunk/dports/python/py-pyface/Portfile
===================================================================
--- trunk/dports/python/py-pyface/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-pyface/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup python 1.0
+#PortGroup wxWidgets 1.0
name py-pyface
version 4.2.0
@@ -30,11 +31,13 @@
depends_lib-append port:py${python.version}-traits
}
-variant wx description {Use wxWidgets backend} {
- if {$subport != $name} {
- depends_lib-append port:py${python.version}-wxpython
- }
-}
+# removing wx variant until wxwidgets/wxpython mess gets sorted out; see ticke
+# 38375, JJS 8/2/13
+# variant wx description {Use wxWidgets backend} {
+# if {$subport != $name} {
+# depends_lib-append port:py${python.version}-wxpython-2.8
+# }
+# }
variant pyqt4 conflicts pyside description "Qt backend using PyQt4" {
if {$subport != $name} {
Modified: trunk/dports/python/py-robotframework-ride/Portfile
===================================================================
--- trunk/dports/python/py-robotframework-ride/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-robotframework-ride/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,11 +3,13 @@
PortSystem 1.0
PortGroup python 1.0
+PortGroup wxWidgets 1.0
-name py-robotframework-ride
-set internal_name robotframework-ride
+name py-robotframework-ride
+set internal_name robotframework-ride
version 1.1
+revision 1
license Apache-2
@@ -16,14 +18,17 @@
description Robot Framework test case editor
long_description ${description}
-homepage http://code.google.com/p/${internal_name}
+homepage http://code.google.com/p/${internal_name}
platforms darwin
-python.versions 26 27
-python.default_version 27
+python.versions 26 27
+python.default_version 27
-universal_variant no
-supported_archs i386
+# TODO: this is not a proper way to do it;
+# wxWidgets.use should take care of supported architectures
+# depending on whether the port depends on carbon or gtk variant of wxpython-2.8
+universal_variant no
+supported_archs i386
master_sites googlecode:${internal_name}
distname ${internal_name}-${version}
@@ -34,14 +39,14 @@
if {$subport != $name} {
build.cmd ${python.bin} setup.py
destroot.cmd ${python.bin} setup.py
- depends_lib-append port:py${python.version}-robotframework \
- port:py${python.version}-wxpython \
+ depends_lib-append port:py${python.version}-robotframework \
+ port:py${python.version}-wxpython-2.8 \
port:py${python.version}-paver
- platform darwin 12 {
+ if {${os.major}>=12} {
supported_archs x86_64
- depends_lib-delete port:py${python.version}-wxpython
- depends_lib-append port:py${python.version}-wxpython30
+ depends_lib-delete port:py${python.version}-wxpython-2.8
+ depends_lib-append port:py${python.version}-wxpython-3.0
}
post-extract {
Modified: trunk/dports/python/py-winpdb/Portfile
===================================================================
--- trunk/dports/python/py-winpdb/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-winpdb/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,10 +3,11 @@
PortSystem 1.0
PortGroup python 1.0
+PortGroup wxWidgets 1.0
name py-winpdb
version 1.4.8
-revision 0
+revision 1
python.versions 27
python.default_version 27
platforms darwin
@@ -26,15 +27,12 @@
master_sites http://winpdb.googlecode.com/files/
distname winpdb-${version}
-# py-wxpython-devel is not universal
-universal_variant no
-
checksums \
rmd160 67e900708c3cc0e6e52eac9c858ae029d8f50b67 \
sha256 daa146446d0a04fec93ee951ba3432016c6b63108711c036124902928968776e
if {$subport != $name } {
- depends_lib-append port:py${python.version}-wxpython-devel \
+ depends_lib-append port:py${python.version}-wxpython-3.0 \
port:py${python.version}-cython
}
Modified: trunk/dports/python/py-wxpython/Portfile
===================================================================
--- trunk/dports/python/py-wxpython/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-wxpython/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,82 +1,24 @@
# -*- 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 python 1.0
+PortSystem 1.0
+PortGroup python 1.0
-name py-wxpython
-version 2.8.12.1
-revision 1
-categories-append graphics
-platforms darwin
-python.versions 24 25 27
-maintainers nomaintainer
-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++.
+replaced_by py-wxpython-2.8
+PortGroup obsolete 1.0
-homepage http://www.wxpython.org/
-master_sites sourceforge:wxpython
-distname wxPython-src-${version}
-use_bzip2 yes
+name py-wxpython
+version 2.8.12.1
+revision 2
-checksums rmd160 94eae06087bdd930e21bf90cc6672f93a1f5a17a \
- sha256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
+homepage http://www.wxpython.org/
+categories python graphics
+license wxwidgets-3.1
-if {$subport != $name} {
+python.versions 24 25 26 27
-depends_lib-append port:wxWidgets
-
-# wxWidgets is not 64-bit
-supported_archs i386 ppc
-
-worksrcdir ${distname}/wxPython
-
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}/docs"
-
-patchfiles patch-config.py.diff
-
-universal_variant no
-
-build.env UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx-devel/bin:$env(PATH)"
-
-destroot.env UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx-devel/bin:$env(PATH)"
-
-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
+foreach {v} ${python.versions} {
+ subport py${v}-wxpython {
+ replaced_by py${v}-wxpython-2.8
}
}
-
-
-if {${os.platform} == "darwin" && ${os.major} >= 10} {
- build.env-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
- destroot.env-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
-}
-
- 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
- }
-}
-
-if {$subport == $name} {
- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
-} else {
- livecheck.type none
-}
Modified: trunk/dports/python/py-wxpython-2.8/Portfile
===================================================================
--- trunk/dports/python/py-wxpython/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-wxpython-2.8/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,82 +1,106 @@
-# -*- 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
+# -*- 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
+PortSystem 1.0
+PortGroup python 1.0
+PortGroup wxWidgets 1.0
-name py-wxpython
-version 2.8.12.1
-revision 1
-categories-append graphics
-platforms darwin
-python.versions 24 25 27
-maintainers nomaintainer
-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++.
+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
-homepage http://www.wxpython.org/
-master_sites sourceforge:wxpython
-distname wxPython-src-${version}
-use_bzip2 yes
+description Python interface to the wxWidgets ${branch} 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 wxWidgets cross platform GUI library, written in C++. \
+ Version 2.8 is provided for compatibility reasons only. \
+ See description of wxWidgets-2.8 for further details.
+homepage http://www.wxpython.org/
+master_sites sourceforge:wxpython
+
+distname wxPython
+use_bzip2 yes
+
checksums rmd160 94eae06087bdd930e21bf90cc6672f93a1f5a17a \
sha256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
-if {$subport != $name} {
+python.versions 24 25 26 27
+python.default_version 27
-depends_lib-append port:wxWidgets
+distfiles ${distname}-src-${version}${extract.suffix}
+dist_subdir ${distname}/${version}
+worksrcdir ${distname}-src-${version}/wxPython
-# wxWidgets is not 64-bit
-supported_archs i386 ppc
+# extract just the docs and wxPython subdir
+extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
-worksrcdir ${distname}/wxPython
+if {$subport != $name} {
+ conflicts py${python.version}-wxpython-3.0
+ patchfiles patch-config.py.diff
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}/docs"
+ variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ # TODO: the following line would end up with --no-user-cfg
+ #build.args WX_CONFIG="${wxWidgets.wxconfig}"
+ build.cmd ${python.bin} setup.py WXPORT="mac" WX_CONFIG="${wxWidgets.wxconfig}"
+ destroot.cmd ${python.bin} setup.py WXPORT="mac" WX_CONFIG="${wxWidgets.wxconfig}"
-patchfiles patch-config.py.diff
+ # TODO: test if this works on 10.7
+ post-patch {
+ reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
+ reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
+ if {${wxWidgets.sdk} != ""} {
+ reinplace "s|# @@FLAGS3@@|cflags.extend(\[\"-isysroot\", \"${wxWidgets.sdk}\"\])|" ${worksrcpath}/config.py
+ }
+ }
+ post-destroot {
+ delete ${destroot}${wxWidgets.prefix}
+ }
+ }
-universal_variant no
+ variant gtk conflicts carbon description {use wxGTK} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:${wxWidgets.port}
+ build.cmd ${python.bin} setup.py WXPORT="gtk2" WX_CONFIG="${wxWidgets.wxconfig}"
+ destroot.cmd ${python.bin} setup.py WXPORT="gtk2" WX_CONFIG="${wxWidgets.wxconfig}"
-build.env UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx-devel/bin:$env(PATH)"
+ post-patch {
+ reinplace "s|# @@FLAGS1@@|cflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
+ reinplace "s|# @@FLAGS2@@|lflags.extend(\[\"-arch\", \"[join [get_canonical_archs] {\", \"-arch\", \"}]\"\])|" ${worksrcpath}/config.py
+ }
+ post-destroot {
+ delete ${destroot}${wxWidgets.prefix}
+ }
+ }
-destroot.env UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx-devel/bin:$env(PATH)"
-
-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
+ if {![variant_isset carbon] && ![variant_isset gtk]} {
+ # gtk will be the default variant on >= 10.7, carbon on <= 10.6
+ # (using +carbon is possible on 10.7 with an old Xcode version)
+ if {${os.major} >= 11} {
+ default_variants-append +gtk
+ } else {
+ default_variants-append +carbon
+ }
}
-}
-
-if {${os.platform} == "darwin" && ${os.major} >= 10} {
- build.env-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
- destroot.env-append CC=${configure.cc} \
- CXX=${configure.cxx} \
- CPP=${configure.cpp}
-}
-
+ livecheck.type none
+} else {
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
+ file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
+ file copy ${worksrcpath}/samples ${destroot}${prefix}/share/doc/${name}/examples
}
-}
-if {$subport == $name} {
- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
-} else {
- livecheck.type none
+ livecheck.type regex
+ livecheck.url ${homepage}
+ livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
}
Modified: trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff
===================================================================
--- trunk/dports/python/py-wxpython/files/patch-config.py.diff 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py-wxpython-2.8/files/patch-config.py.diff 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,9 +1,23 @@
---- config.py 2012-04-08 18:41:21.000000000 +0300
-+++ config.py 2012-04-08 18:44:32.000000000 +0300
-@@ -1031,19 +1031,8 @@
+--- config.py.orig
++++ config.py
+@@ -1024,27 +1024,16 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
+ WXRELEASE = os.popen(WX_CONFIG + ' --release').read()[:-1]
+ WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
+
+-
+- if sys.platform[:6] == "darwin" and WXPORT == 'mac':
++ if sys.platform[:6] == "darwin":
++ libs = ['stdc++']
++ NO_SCRIPTS = 1
++ # @@FLAGS1@@
++ # @@FLAGS2@@
++ # @@FLAGS3@@
++ if WXPORT == 'mac':
+ # Flags and such for a Darwin (Max OS X) build of Python
+ WXPLAT = '__WXMAC__'
GENDIR = 'mac'
- libs = ['stdc++']
- NO_SCRIPTS = 1
+- libs = ['stdc++']
+- NO_SCRIPTS = 1
- if not ARCH == "":
- cflags.append("-arch")
- cflags.append(ARCH)
@@ -17,8 +31,22 @@
- 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
+ GENDIR = WXPORT
+@@ -1070,14 +1059,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
+
+ cflags += portcfg.split()
+
+- # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
+- # wx-config doesn't output that for some reason. For now, just
+- # add it unconditionally but we should really check if the lib is
+- # really found there or wx-config should be fixed.
+- if WXPORT != 'msw':
+- libdirs.append("/usr/X11R6/lib")
+-
+-
+ # Move the various -I, -D, etc. flags we got from the *config scripts
+ # into the distutils lists.
+ cflags = adjustCFLAGS(cflags, defines, includes)
Modified: trunk/dports/python/py-wxpython-3.0/Portfile
===================================================================
--- trunk/dports/python/py-wxpython30/Portfile 2013-08-29 07:29:56 UTC (rev 110241)
+++ trunk/dports/python/py-wxpython-3.0/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,64 +1,70 @@
+# -*- 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
+PortSystem 1.0
+PortGroup python 1.0
+PortGroup wxWidgets 1.0
-name py-wxpython30
-version 2.9.4.0
+name py-wxpython-3.0
+version 2.9.4.0
+set branch [join [lrange [split ${version} .] 0 1] .]
+categories-append graphics devel
+license wxwidgets-3.1
+platforms darwin
+maintainers jwa mojca
-categories python graphics
-platforms darwin
-license wxwidgets-3.1
+description Python interface to the wxWidgets ${branch} 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 wxWidgets cross platform GUI library, written in C++.
-maintainers jwa
-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
-homepage http://www.wxpython.org/
-master_sites sourceforge:wxpython
+distname wxPython
+use_bzip2 yes
-python.versions 27
-
-distname wxPython-src-${version}
-use_bzip2 yes
checksums rmd160 35e823d9161dc99083f3025383567000680e012f \
sha256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be
-worksrcdir ${distname}/wxPython
+python.versions 27
+python.default_version 27
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}/docs"
+distfiles ${distname}-src-${version}${extract.suffix}
+dist_subdir ${distname}/${version}
+worksrcdir ${distname}-src-${version}/wxPython
-universal_variant no
+# extract just the docs and wxPython subdir
+extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
-build.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
+if {$subport != $name} {
+ conflicts py${python.version}-wxpython-2.8
+ wxWidgets.use wxPython-3.0
+ depends_lib-append port:${wxWidgets.port}
-destroot.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
+ patchfiles patch-config.py.diff
-if {$subport != $name} {
- depends_lib-append port:wxWidgets30
+ # TODO: is it possible to use build arguments instead of redefining the whole command?
+ build.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+ destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
- if {${os.platform} == "darwin" && ${os.major} >= 10} {
- patchfiles patch-config.py.diff
+ post-destroot {
+ # this has already been added by wxWidgets
+ delete ${destroot}${wxWidgets.prefix}
}
+ 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
+ file copy ${worksrcpath}/samples ${destroot}${prefix}/share/doc/${name}/examples
}
-}
-if {$subport == $name} {
- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
-} else {
- livecheck.type none
+ livecheck.type regex
+ livecheck.url ${homepage}
+ livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
}
Modified: trunk/dports/python/py-wxpython-3.0/files/patch-config.py.diff
===================================================================
--- trunk/dports/python/py-wxpython30/files/patch-config.py.diff 2013-08-29 07:29:56 UTC (rev 110241)
+++ trunk/dports/python/py-wxpython-3.0/files/patch-config.py.diff 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,11 +1,11 @@
---- config.py 2011-12-13 13:45:14.000000000 +0200
-+++ config.py 2011-12-13 13:46:54.000000000 +0200
-@@ -247,7 +247,7 @@
-
+--- config.py.orig
++++ config.py
+@@ -248,7 +248,7 @@ cleaning = 'clean' in sys.argv
+
# change the PORT default for wxMac
if sys.platform[:6] == "darwin":
- WXPORT = 'osx_carbon'
+ WXPORT = 'osx_cocoa'
-
+
# and do the same for wxMSW, just for consistency
if os.name == 'nt':
Modified: trunk/dports/python/py-wxpython30/Portfile
===================================================================
--- trunk/dports/python/py-wxpython30/Portfile 2013-08-29 07:29:56 UTC (rev 110241)
+++ trunk/dports/python/py-wxpython30/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,64 +1,24 @@
+# -*- 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 python 1.0
+PortSystem 1.0
+PortGroup python 1.0
-name py-wxpython30
-version 2.9.4.0
+replaced_by py-wxpython-3.0
+PortGroup obsolete 1.0
-categories python graphics
-platforms darwin
-license wxwidgets-3.1
+name py-wxpython30
+version 2.9.4.0
+revision 1
-maintainers jwa
-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/
+categories python graphics
+license wxwidgets-3.1
-homepage http://www.wxpython.org/
-master_sites sourceforge:wxpython
+python.versions 27
-python.versions 27
-
-distname wxPython-src-${version}
-use_bzip2 yes
-checksums rmd160 35e823d9161dc99083f3025383567000680e012f \
- sha256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be
-
-worksrcdir ${distname}/wxPython
-
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}/docs"
-
-universal_variant no
-
-build.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
-
-destroot.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
-
-if {$subport != $name} {
- depends_lib-append port:wxWidgets30
-
- if {${os.platform} == "darwin" && ${os.major} >= 10} {
- patchfiles patch-config.py.diff
+foreach {v} ${python.versions} {
+ subport py${v}-wxpython {
+ replaced_by py${v}-wxpython-3.0
}
-
- 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} {
- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
-} else {
- livecheck.type none
-}
Modified: trunk/dports/python/py26-pyphant/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py26-pyphant/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,9 +3,11 @@
PortSystem 1.0
PortGroup python26 1.0
+PortGroup wxWidgets 1.0
name py26-pyphant
version 0.8a1
+revision 1
categories-append science
maintainers fmf.uni-freiburg.de:klaus.zimmermann rowue
description python framework for analysing and managing scientific data
@@ -40,7 +42,7 @@
port:py26-antlr3 \
port:py26-matplotlib \
port:py26-scientific \
- port:py26-wxpython \
+ port:py26-wxpython-2.8 \
port:py26-simplejson \
port:py26-paste \
port:py26-mx-base \
Modified: trunk/dports/python/py27-wxpython-devel/Portfile
===================================================================
--- trunk/dports/python/py27-wxpython-devel/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/python/py27-wxpython-devel/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -1,55 +1,16 @@
+# -*- 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 python27 1.0
+PortSystem 1.0
+PortGroup python27 1.0
-name py27-wxpython-devel
-version 2.9.4.0
+replaced_by py27-wxpython-3.0
+PortGroup obsolete 1.0
-categories python graphics
-platforms darwin
-license wxwidgets-3.1
+name py27-wxpython-devel
+version 2.9.4.0
+revision 1
-maintainers jwa
-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-src-${version}
-use_bzip2 yes
-checksums rmd160 35e823d9161dc99083f3025383567000680e012f \
- sha256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be
-
-depends_lib port:wxWidgets-devel
-
-worksrcdir ${distname}/wxPython
-
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}/docs"
-
-universal_variant no
-
-build.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
-
-destroot.env UNICODE="1" WXPORT="osx_cocoa" PATH="${prefix}/lib/wx/config:$env(PATH)"
-
-if {${os.platform} == "darwin" && ${os.major} >= 10} {
- 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
-}
-
-livecheck.type regex
-livecheck.url ${homepage}
-livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
+homepage http://www.wxpython.org/
+categories python graphics
+license wxwidgets-3.1
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/science/gnuradio/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup cmake 1.0
+PortGroup wxWidgets 1.0
PortGroup active_variants 1.1
name gnuradio
@@ -15,6 +16,8 @@
license GPL-3
platforms darwin macosx
+wxWidgets.use wxPython-3.0
+
dist_subdir gnuradio
if {${subport} == ${name}} {
@@ -245,7 +248,7 @@
if {[variant_isset wxgui]} {
depends_lib-append \
- port:py${s}-wxpython-devel
+ port:py${s}-wxpython-3.0
}
@@ -336,7 +339,7 @@
variant wxgui description "Install GNU Radio with support for Wx GUI" {
depends_lib-append \
- port:wxWidgets-devel
+ port:${wxWidgets.port}
configure.args-append \
-DENABLE_GR_WXGUI=ON
Modified: trunk/dports/science/relax/Portfile
===================================================================
--- trunk/dports/science/relax/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/science/relax/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup python27 1.0
+PortGroup wxWidgets 1.0
name relax
version 2.2.4
@@ -22,7 +23,7 @@
rmd160 815834bc2f6b63a4f2fa0f68839de25166694274
use_bzip2 yes
depends_lib-append port:scons port:py27-scipy port:py27-numpy \
- port:py27-wxpython-devel port:pymol
+ port:py27-wxpython-3.0 port:pymol
patchfiles relax.patch
post-patch {
reinplace "s|'i386', 'ppc', 'x86_64'|'${build_arch}'|g" ${worksrcpath}/sconstruct
Modified: trunk/dports/science/stimfit/Portfile
===================================================================
--- trunk/dports/science/stimfit/Portfile 2013-08-29 13:43:07 UTC (rev 110278)
+++ trunk/dports/science/stimfit/Portfile 2013-08-29 14:19:20 UTC (rev 110279)
@@ -2,10 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup wxWidgets 1.0
name stimfit
version 0.12.4
-revision 1
+revision 2
categories science
platforms darwin
license GPL-2
@@ -18,21 +19,19 @@
checksums rmd160 042ef333806e960f5b18a911fe4a2ca96d9e4093 \
sha256 3ca98068941f0544fa869bdfc0aae3145ed811e76d237d361eef60f11dfadc0f
-universal_variant no
+wxWidgets.use wxPython-3.0
-supported_archs i386 x86_64
-
depends_lib port:boost \
port:fftw-3 \
port:hdf5-18 \
- port:wxWidgets30
+ port:${wxWidgets.port}
-configure.args --with-wx-config=${prefix}/bin/wx-config \
+configure.args --with-wx-config=${wxWidgets.wxconfig} \
--disable-dependency-tracking \
--disable-python \
- CC="`${prefix}/bin/wx-config --cc`" \
- CXX="`${prefix}/bin/wx-config --cxx`" \
- LD="`${prefix}/bin/wx-config --ld`"
+ CC="`${wxWidgets.wxconfig} --cc`" \
+ CXX="`${wxWidgets.wxconfig} --cxx`" \
+ LD="`${wxWidgets.wxconfig} --ld`"
# Only Python 2.7 is supported until wxpython gets available for Python 3.x
variant python27 description {Build with Python shell.} {
@@ -41,7 +40,7 @@
depends_lib-append \
port:python27 \
- port:py27-wxpython30 \
+ port:py27-wxpython-3.0 \
port:py27-numpy \
port:py27-matplotlib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/2598576a/attachment-0001.html>
More information about the macports-changes
mailing list