[108780] users/mojca/wxports/math/gnuplot/Portfile
mojca at macports.org
mojca at macports.org
Thu Aug 1 13:04:41 PDT 2013
Revision: 108780
https://trac.macports.org/changeset/108780
Author: mojca at macports.org
Date: 2013-08-01 13:04:41 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
mojca/gnuplot: set path to wx-config
Modified Paths:
--------------
users/mojca/wxports/math/gnuplot/Portfile
Modified: users/mojca/wxports/math/gnuplot/Portfile
===================================================================
--- users/mojca/wxports/math/gnuplot/Portfile 2013-08-01 19:36:34 UTC (rev 108779)
+++ users/mojca/wxports/math/gnuplot/Portfile 2013-08-01 20:04:41 UTC (rev 108780)
@@ -113,16 +113,18 @@
configure.args-delete --without-cairo
}
-# TODO: possibly rename variants (there is no need for a variant that depends on 2.8)
+# TODO: it should be enough to depend on wxWidgets-3.0, remove all other wxWidgets variants
# One can in principle choose between wxWidgets, wxwidgets30 and wxWidgets-devel,
# but only 2.9 allows building 64-bit binaries.
# If it is acceptable to depend on wxWidgets-devel only,
# one could delete the variant that depends on wxWidgets 2.8.
variant wxwidgets conflicts wxwidgets30 description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
+ wxWidgets.use_version 2.8
depends_lib-append port:wxWidgets-2.8 path:lib/pkgconfig/pango.pc:pango
configure.args-delete --disable-wxwidgets
- configure.args-append --with-wx-config=${prefix}/bin/wx-config
+ configure.args-append --with-wx-config=${prefix}/libexec/wxWidgets/2.8
+ #configure.args-append --with-wx-config=${wxWidgets.confpath}
}
if {[variant_isset wxwidgets]} {
# wxWidgets is not universal and is 32-bit only
@@ -134,7 +136,9 @@
wxWidgets.use_version 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.confpath}
+ configure.args-append --with-wx-config=${prefix}/libexec/wxWidgets/2.9
+ ## doesn't work yet
+ #configure.args-append --with-wx-config=${wxWidgets.confpath}
}
variant qt description "Enable qt terminal" {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/d0920e0f/attachment.html>
More information about the macports-changes
mailing list