[109347] users/mojca/wxports
mojca at macports.org
mojca at macports.org
Tue Aug 13 12:19:52 PDT 2013
Revision: 109347
https://trac.macports.org/changeset/109347
Author: mojca at macports.org
Date: 2013-08-13 12:19:52 -0700 (Tue, 13 Aug 2013)
Log Message:
-----------
mojca/wxports: set empty values to variables in wxwidgets portgroup to provent problems, add gtk variant to py-wxpython-2.8
Modified Paths:
--------------
users/mojca/wxports/_resources/port1.0/group/wxwidgets-1.0.tcl
users/mojca/wxports/math/gnuplot/Portfile
users/mojca/wxports/python/py-wxpython-2.8/Portfile
Modified: users/mojca/wxports/_resources/port1.0/group/wxwidgets-1.0.tcl
===================================================================
--- users/mojca/wxports/_resources/port1.0/group/wxwidgets-1.0.tcl 2013-08-13 19:17:25 UTC (rev 109346)
+++ users/mojca/wxports/_resources/port1.0/group/wxwidgets-1.0.tcl 2013-08-13 19:19:52 UTC (rev 109347)
@@ -12,6 +12,15 @@
options wxWidgets.sdk
options wxWidgets.macosx_version_min
+wxWidgets.name ""
+wxWidgets.trueversion ""
+wxWidgets.prefix ""
+wxWidgets.wxdir ""
+wxWidgets.wxconfig ""
+wxWidgets.wxrc ""
+wxWidgets.sdk ""
+wxWidgets.macosx_version_min ""
+
# Poedit also needs
# build.env-append GETTEXT_PREFIX=${prefix} WX_ROOT=${prefix}
@@ -44,8 +53,6 @@
if {"set" != ${action}} {
return
}
- wxWidgets.sdk ""
- wxWidgets.macosx_version_min ""
if {${args} == "wxWidgets-2.8"} {
wxWidgets.name "wxWidgets"
Modified: users/mojca/wxports/math/gnuplot/Portfile
===================================================================
--- users/mojca/wxports/math/gnuplot/Portfile 2013-08-13 19:17:25 UTC (rev 109346)
+++ users/mojca/wxports/math/gnuplot/Portfile 2013-08-13 19:19:52 UTC (rev 109347)
@@ -117,9 +117,8 @@
configure.args-delete --without-cairo
}
-# TODO: this should be placed inside the variant, but it doesn't work that way for some strange reason
-wxWidgets.use wxWidgets-3.0
variant wxwidgets description "Enable wxt terminal" {
+ wxWidgets.use wxWidgets-3.0
depends_lib-append port:wxWidgets-3.0 path:lib/pkgconfig/pango.pc:pango
configure.args-delete --disable-wxwidgets
configure.args-append --with-wx-config=${wxWidgets.wxdir}
Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-13 19:17:25 UTC (rev 109346)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-13 19:19:52 UTC (rev 109347)
@@ -43,10 +43,27 @@
extract.post_args "| tar -xf - ${worksrcdir} ${distname}-src-${version}/docs"
if {$subport != $name} {
- # TODO: a variant for wxgtk-2.8
- wxWidgets.use wxWidgets-2.8
- depends_lib-append port:wxWidgets-2.8
-
+ 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
post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130813/ccdd410a/attachment.html>
More information about the macports-changes
mailing list