[109351] users/mojca/wxports/python
mojca at macports.org
mojca at macports.org
Tue Aug 13 13:40:02 PDT 2013
Revision: 109351
https://trac.macports.org/changeset/109351
Author: mojca at macports.org
Date: 2013-08-13 13:40:02 -0700 (Tue, 13 Aug 2013)
Log Message:
-----------
mojca/wxpython: clean up obsolete ports (redirect subports, remove files, add py-wxpython), fix variants in py-wxpython-2.8
Modified Paths:
--------------
users/mojca/wxports/python/py-wxpython/Portfile
users/mojca/wxports/python/py-wxpython-2.8/Portfile
users/mojca/wxports/python/py-wxpython30/Portfile
Added Paths:
-----------
users/mojca/wxports/python/py-wxpython/
Removed Paths:
-------------
users/mojca/wxports/python/py27-wxpython-devel/files/
Modified: users/mojca/wxports/python/py-wxpython/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython30/Portfile 2013-08-13 19:19:52 UTC (rev 109347)
+++ users/mojca/wxports/python/py-wxpython/Portfile 2013-08-13 20:40:02 UTC (rev 109351)
@@ -4,15 +4,21 @@
PortSystem 1.0
PortGroup python 1.0
-replaced_by py-wxpython-3.0
+replaced_by py-wxpython-2.8
PortGroup obsolete 1.0
-name py-wxpython30
-version 2.9.4.0
-revision 1
+name py-wxpython
+version 2.8.12.1
+revision 2
homepage http://www.wxpython.org/
categories python graphics
license wxwidgets-3.1
-python.versions 27
+python.versions 24 25 26 27
+
+foreach {v} ${python.versions} {
+ subport py${v}-wxpython {
+ replaced_by py${v}-wxpython-2.8
+ }
+}
Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-13 19:55:57 UTC (rev 109350)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-13 20:40:02 UTC (rev 109351)
@@ -31,7 +31,6 @@
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
@@ -43,26 +42,6 @@
extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
if {$subport != $name} {
- variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
- wxWidgets.use wxWidgets-2.8
- depends_lib-append port:wxWidgets-2.8
- }
-
- variant gtk conflicts carbon description {use wxGTK} {
- wxWidgets.use wxGTK-2.8
- depends_lib-append port:wxgtk-2.8
- }
-
- # TODO: think a bit more about it
- if {![variant_isset carbon] && ![variant_isset gtk]} {
- # gtk is the default variant on >= 10.7, carbon on <= 10.6
- if {${os.major} >= 11} {
- default_variants-append gtk
- } else {
- default_variants-append carbon
- }
- }
-
# TODO: this patch and reinplace both need a review
patchfiles patch-config.py.diff
@@ -74,12 +53,10 @@
}
}
- # 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}"
-
livecheck.type none
} else {
+ build.cmd {}
+ destroot.cmd {}
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/doc/
file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
@@ -90,3 +67,33 @@
livecheck.url ${homepage}
livecheck.regex wxPython(?: | \\(classic\\) )(2\\.\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)
}
+
+# TODO: should variants be part of the port or part of subports?
+# it doesn't make any difference on how the docs are installed,
+# but user sees the option when asking for 'port info py-wxpython-2.8'
+# TODO: check whether build.cm/destroot.cmd need to be reset for the main port
+variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:wxWidgets-2.8
+ # TODO: the following line would end up with --no-user-cfg
+ #build.args WX_CONFIG="${wxWidgets.wxconfig}"
+ build.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+ destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+}
+
+variant gtk conflicts carbon description {use wxGTK} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:wxgtk-2.8
+ build.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+ destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
+}
+
+# TODO: think a bit more about it
+if {![variant_isset carbon] && ![variant_isset gtk]} {
+ # gtk is the default variant on >= 10.7, carbon on <= 10.6
+ if {${os.major} >= 11} {
+ default_variants-append +gtk
+ } else {
+ default_variants-append +carbon
+ }
+}
Modified: users/mojca/wxports/python/py-wxpython30/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython30/Portfile 2013-08-13 19:55:57 UTC (rev 109350)
+++ users/mojca/wxports/python/py-wxpython30/Portfile 2013-08-13 20:40:02 UTC (rev 109351)
@@ -16,3 +16,9 @@
license wxwidgets-3.1
python.versions 27
+
+foreach {v} ${python.versions} {
+ subport py${v}-wxpython {
+ replaced_by py${v}-wxpython-3.0
+ }
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130813/e4fb5ead/attachment.html>
More information about the macports-changes
mailing list