[109582] users/mojca/wxports
mojca at macports.org
mojca at macports.org
Sat Aug 17 14:26:12 PDT 2013
Revision: 109582
https://trac.macports.org/changeset/109582
Author: mojca at macports.org
Date: 2013-08-17 14:26:12 -0700 (Sat, 17 Aug 2013)
Log Message:
-----------
mojca/wxwidgets: use wxWidgets.port instead of explicit port names
Modified Paths:
--------------
users/mojca/wxports/aqua/pgAdmin3/Portfile
users/mojca/wxports/gis/grass/Portfile
users/mojca/wxports/graphics/wxPython-3.0/Portfile
users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
users/mojca/wxports/math/fityk/Portfile
users/mojca/wxports/math/gnuplot/Portfile
users/mojca/wxports/math/wxMaxima/Portfile
users/mojca/wxports/multimedia/mkvtoolnix/Portfile
users/mojca/wxports/perl/p5-alien-wxwidgets/Portfile
users/mojca/wxports/python/py-wxpython-2.8/Portfile
users/mojca/wxports/python/py-wxpython-3.0/Portfile
users/mojca/wxports/science/gnuradio/Portfile
users/mojca/wxports/science/stimfit/Portfile
users/mojca/wxports/sysutils/wxWidgets_select/Portfile
users/mojca/wxports/www/FileZilla/Portfile
Modified: users/mojca/wxports/aqua/pgAdmin3/Portfile
===================================================================
--- users/mojca/wxports/aqua/pgAdmin3/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/aqua/pgAdmin3/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -37,10 +37,10 @@
depends_lib port:openssl \
port:libxml2 \
port:libxslt \
- port:wxWidgets-3.0
+ port:${wxWidgets.port}
configure.args --with-wx=${wxWidgets.prefix} \
- --with-wx-version=2.9 \
+ --with-wx-version=${wxWidgets.version} \
--with-libxml2=${prefix} \
--with-libxslt=${prefix} \
--with-arch-x86_64 \
Modified: users/mojca/wxports/gis/grass/Portfile
===================================================================
--- users/mojca/wxports/gis/grass/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/gis/grass/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -196,7 +196,7 @@
}
variant wxwidgets description {Add WXWidgets support} {
- depends_lib-append port:wxPython-3.0
+ depends_lib-append port:${wxWidgets.port}
configure.args-delete --disable-wxwidgets
configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
}
Modified: users/mojca/wxports/graphics/wxPython-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxPython-3.0/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/graphics/wxPython-3.0/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -7,8 +7,8 @@
# temporary conflict to prevent wrong linking
PortGroup conflicts_build 1.0
-name wxPython-3.0
wxWidgets.use wxPython-3.0
+name ${wxWidgets.port}
# (temporary)
conflicts_build wxgtk wxWidgets wxWidgets-python wxWidgets30 wxWidgets-devel
version 2.9.4.0
Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -7,8 +7,8 @@
# temporary conflict to prevent wrong linking
PortGroup conflicts_build 1.0
-name wxWidgets-3.0
wxWidgets.use wxWidgets-3.0
+name ${wxWidgets.port}
# (temporary)
conflicts_build wxgtk wxWidgets wxWidgets-python wxWidgets30 wxWidgets-devel
version 2.9.5
Modified: users/mojca/wxports/math/fityk/Portfile
===================================================================
--- users/mojca/wxports/math/fityk/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/math/fityk/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -44,7 +44,7 @@
port:lua \
port:zlib \
port:python27 \
- port:wxWidgets30
+ port:${wxWidgets.port}
# TODO: gnuplot is probably a runtime dependency
Modified: users/mojca/wxports/math/gnuplot/Portfile
===================================================================
--- users/mojca/wxports/math/gnuplot/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/math/gnuplot/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -119,7 +119,7 @@
variant wxwidgets description "Enable wxt terminal" {
wxWidgets.use wxWidgets-3.0
- depends_lib-append port:wxWidgets-3.0 path:lib/pkgconfig/pango.pc:pango
+ depends_lib-append port:${wxWidgets.port} path:lib/pkgconfig/pango.pc:pango
configure.args-delete --disable-wxwidgets
configure.args-append --with-wx-config=${wxWidgets.wxdir}
}
Modified: users/mojca/wxports/math/wxMaxima/Portfile
===================================================================
--- users/mojca/wxports/math/wxMaxima/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/math/wxMaxima/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -31,7 +31,7 @@
depends_lib port:libiconv \
path:lib/pkgconfig/sdl.pc:libsdl \
port:libxml2 \
- port:wxWidgets-3.0 \
+ port:${wxWidgets.port} \
port:zlib
depends_run port:maxima
Modified: users/mojca/wxports/multimedia/mkvtoolnix/Portfile
===================================================================
--- users/mojca/wxports/multimedia/mkvtoolnix/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/multimedia/mkvtoolnix/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -58,7 +58,7 @@
--disable-wxwidgets
variant wxwidgets description {Build with the wxWidgets GUI} {
- depends_lib-append port:wxWidgets-3.0
+ depends_lib-append port:${wxWidgets.port}
configure.args-delete \
--diable-gui \
Modified: users/mojca/wxports/perl/p5-alien-wxwidgets/Portfile
===================================================================
--- users/mojca/wxports/perl/p5-alien-wxwidgets/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/perl/p5-alien-wxwidgets/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -30,7 +30,7 @@
perl5.use_module_build
if {${perl5.major} != ""} {
- depends_lib-append port:wxWidgets-3.0
+ depends_lib-append port:${wxWidgets.port}
# author says that Makefile.PL shouldn't be there
# this line is not really needed, but it's a guard
Modified: users/mojca/wxports/python/py-wxpython-2.8/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/python/py-wxpython-2.8/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -48,7 +48,7 @@
variant carbon conflicts gtk description {use 32-bit carbon-based wxWidgets} {
wxWidgets.use wxWidgets-2.8
- depends_lib-append port: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}"
@@ -66,7 +66,7 @@
variant gtk conflicts carbon description {use wxGTK} {
wxWidgets.use wxGTK-2.8
- depends_lib-append port: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}"
Modified: users/mojca/wxports/python/py-wxpython-3.0/Portfile
===================================================================
--- users/mojca/wxports/python/py-wxpython-3.0/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/python/py-wxpython-3.0/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -44,7 +44,7 @@
if {$subport != $name} {
wxWidgets.use wxPython-3.0
- depends_lib-append port:wxPython-3.0
+ depends_lib-append port:${wxWidgets.port}
patchfiles patch-config.py.diff
Modified: users/mojca/wxports/science/gnuradio/Portfile
===================================================================
--- users/mojca/wxports/science/gnuradio/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/science/gnuradio/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -339,7 +339,7 @@
variant wxgui description "Install GNU Radio with support for Wx GUI" {
depends_lib-append \
- port:wxPython-3.0
+ port:${wxWidgets.port}
configure.args-append \
-DENABLE_GR_WXGUI=ON
Modified: users/mojca/wxports/science/stimfit/Portfile
===================================================================
--- users/mojca/wxports/science/stimfit/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/science/stimfit/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -24,7 +24,7 @@
depends_lib port:boost \
port:fftw-3 \
port:hdf5-18 \
- port:wxPython-3.0
+ port:${wxWidgets.port}
configure.args --with-wx-config=${wxWidgets.wxconfig} \
--disable-dependency-tracking \
Modified: users/mojca/wxports/sysutils/wxWidgets_select/Portfile
===================================================================
--- users/mojca/wxports/sysutils/wxWidgets_select/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/sysutils/wxWidgets_select/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup wxwidgets 1.0
name wxWidgets_select
version 1.0
Modified: users/mojca/wxports/www/FileZilla/Portfile
===================================================================
--- users/mojca/wxports/www/FileZilla/Portfile 2013-08-17 21:09:36 UTC (rev 109581)
+++ users/mojca/wxports/www/FileZilla/Portfile 2013-08-17 21:26:12 UTC (rev 109582)
@@ -48,21 +48,21 @@
variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxWidgets 2.9 (not fully functional yet)} {
wxWidgets.use wxWidgets-3.0
- depends_lib-append port:wxWidgets-3.0
+ depends_lib-append port:${wxWidgets.port}
configure.args-append --with-wxdir=${wxWidgets.wxdir}
configure.env-append WXRC=${wxWidgets.wxrc}
}
variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxWidgets 2.8} {
wxWidgets.use wxWidgets-2.8
- depends_lib-append port:wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
configure.args-append --with-wxdir=${wxWidgets.wxdir}
configure.env-append WXRC=${wxWidgets.wxrc}
}
variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use wxWidgets 2.8 with GTK} {
wxWidgets.use wxGTK-2.8
- depends_lib-append port:wxgtk-2.8
+ depends_lib-append port:${wxWidgets.port}
configure.args-append --with-wxdir=${wxWidgets.wxdir}
configure.env-append WXRC=${wxWidgets.wxrc}
}
@@ -74,7 +74,7 @@
}
}
-if {![variant_isset wxgtk28] && ![variant_isset wxwidgets28] && ![variant_isset wxwidgets30]} {
+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
if {[vercmp $xcodeversion 4.4] >= 0} {
default_variants +wxgtk28
} else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130817/aff312d6/attachment.html>
More information about the macports-changes
mailing list