[115345] trunk/dports
mojca at macports.org
mojca at macports.org
Tue Dec 31 11:30:25 PST 2013
Revision: 115345
https://trac.macports.org/changeset/115345
Author: mojca at macports.org
Date: 2013-12-31 11:30:25 -0800 (Tue, 31 Dec 2013)
Log Message:
-----------
s3cmd: depend on Python 2.7 instead of 2.6 (closes #41765, maintainer timeout)
Modified Paths:
--------------
trunk/dports/net/s3cmd/Portfile
trunk/dports/python/py-robotframework-ride/Portfile
trunk/dports/python/py-wxpython-3.0-phoenix/Portfile
Added Paths:
-----------
trunk/dports/python/py-wxpython-3.0-phoenix/
Modified: trunk/dports/net/s3cmd/Portfile
===================================================================
--- trunk/dports/net/s3cmd/Portfile 2013-12-31 19:29:16 UTC (rev 115344)
+++ trunk/dports/net/s3cmd/Portfile 2013-12-31 19:30:25 UTC (rev 115345)
@@ -2,10 +2,11 @@
# $Id$
PortSystem 1.0
-PortGroup python26 1.0
+PortGroup python27 1.0
name s3cmd
version 1.0.1
+revision 1
categories net
license GPL-2+
maintainers alpha
Modified: trunk/dports/python/py-robotframework-ride/Portfile
===================================================================
--- trunk/dports/python/py-robotframework-ride/Portfile 2013-12-31 19:29:16 UTC (rev 115344)
+++ trunk/dports/python/py-robotframework-ride/Portfile 2013-12-31 19:30:25 UTC (rev 115345)
@@ -4,12 +4,13 @@
PortSystem 1.0
PortGroup python 1.0
PortGroup wxWidgets 1.0
+PortGroup active_variants 1.1
name py-robotframework-ride
set internal_name robotframework-ride
version 1.2.3
-revision 1
+revision 2
license Apache-2
@@ -34,29 +35,50 @@
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-2.8 \
- port:py${python.version}-paver
+ port:py${python.version}-paver
- # TODO: this port probably needs a variant to switch between py-wxpython-2.8 and py-wxpython-3.0
- # until it starts working properly on py-wxpython-3.0
- if {${os.major}>=12} {
- depends_lib-delete port:py${python.version}-wxpython-2.8
- depends_lib-append port:py${python.version}-wxpython-3.0
- }
-
post-extract {
reinplace "s/pybot/pybot-${python.branch}/g" $worksrcpath/src/robotide/contrib/testrunner/runprofiles.py
}
- # with 'py-wxpython-3.0' and 'py-wxpython-2.8 +gtk' this should not be needed
- # this should only be issued when depending on 'py-wxpython-2.8 +carbon' on 64-bit OS or deleted
- # notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32bit architecture"
+ variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxPython 3.0 (not fully functional yet)} {
+ wxWidgets.use wxPython-3.0
+ depends_lib-append port:py${python.version}-wxpython-3.0
+ }
+
+ variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxPython 2.8} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:py${python.version}-wxpython-2.8
+ require_active_variants port:py${python.version}-wxpython-2.8 carbon gtk
+ # TODO: conditionally use the following notes on x86_64 only
+ notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32-bit architecture"
+ }
+
+ variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use GTK-based wxPython 2.8} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:py${python.version}-wxpython-2.8
+ require_active_variants port:py${python.version}-wxpython-2.8 gtk carbon
+ }
+
+ if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+ if {[vercmp $xcodeversion 4.4] < 0} {
+ # if wxWidgets 2.8 can be installed, it is best to use py-wxpython-2.8 anyway (except that one needs to enable 32-bit by default)
+ default_variants +wxwidgets28
+ } else {
+ if { ${python.version} == 27} {
+ # buggy
+ default_variants +wxwidgets30
+ } else {
+ default_variants +wxgtk28
+ }
+ }
+ }
}
if {${name} eq ${subport}} {
- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
+ livecheck.type regex
+ livecheck.url ${homepage}
+ livecheck.regex ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
} else {
- livecheck.type none
+ livecheck.type none
}
Modified: trunk/dports/python/py-wxpython-3.0-phoenix/Portfile
===================================================================
--- trunk/dports/python/py-wxpython-3.0/Portfile 2013-12-31 09:25:02 UTC (rev 115331)
+++ trunk/dports/python/py-wxpython-3.0-phoenix/Portfile 2013-12-31 19:30:25 UTC (rev 115345)
@@ -5,41 +5,42 @@
PortGroup python 1.0
PortGroup wxWidgets 1.0
-name py-wxpython-3.0
-version 3.0.0.0
+name py-wxpython-3.0-phoenix
+version 3.0.1.0-r75494
set wx_version [join [lrange [split ${version} .] 0 2] .]
set branch [join [lrange [split ${version} .] 0 1] .]
categories-append graphics devel
license wxwidgets-3.1
platforms darwin
-maintainers jwa mojca
+maintainers mojca
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++.
+# TODO
+#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++.
-homepage http://www.wxpython.org/
-master_sites sourceforge:wxpython
+homepage http://wiki.wxpython.org/ProjectPhoenix
+# http://www.wxpython.org/
+master_sites http://wxpython.org/Phoenix/snapshot-builds/
-distname wxPython
-use_bzip2 yes
+distname wxPython_Phoenix
-checksums rmd160 75661f0552e9bf3e86002c96fdc9a01157ef791e \
- sha256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11
+checksums rmd160 711ce5775da6855addd39b8a1e4e6722eff85a3b \
+ sha256 a058d61ff1e2a4feb2f5fea22063276e88d9a91463a13e7f021f55faf8c00094
-python.versions 27
-python.default_version 27
+python.versions 27 33 34
+python.default_version 33
-distfiles ${distname}-src-${version}${extract.suffix}
-worksrcdir ${distname}-src-${version}/wxPython
+distfiles ${distname}-${version}-src${extract.suffix}
+worksrcdir ${distname}-${version}-src/Phoenix
dist_subdir wxWidgets/${wx_version}
# extract just the docs and wxPython subdir
-extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
+# extract.post_args "| tar -xf - ${worksrcdir}"
if {${name} ne ${subport}} {
conflicts py${python.version}-wxpython-2.8
@@ -47,14 +48,15 @@
# this port could also depend on wxWidgets-3.0.
# A separate port is there just because wxPython usually lags behind.
wxWidgets.use wxPython-3.0
- depends_lib-append \
+# depends_lib-append \
port:${wxWidgets.port}
- patchfiles patch-config.py.diff
+ # patchfiles patch-config.py.diff
# 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}"
+ build.env WX_CONFIG="${wxWidgets.wxconfig}"
+ build.cmd ${python.bin} build.py
+ # destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
post-destroot {
# When a new release of wxPython comes out, the contents of
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131231/d3fae993/attachment-0001.html>
More information about the macports-changes
mailing list