[110241] trunk/dports/math/gnuplot/Portfile

[mojca at macports.org]

Revision: 110241
          https://trac.macports.org/changeset/110241
Author:   mojca at macports.org
Date:     2013-08-29 00:29:56 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
gnuplot: use new wxWidgets-3.0 dependency by default and make variants wxwidgets_devel/wxwidgets30 obsolete

Modified Paths:
--------------
    trunk/dports/math/gnuplot/Portfile

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2013-08-29 07:22:22 UTC (rev 110240)
+++ trunk/dports/math/gnuplot/Portfile	2013-08-29 07:29:56 UTC (rev 110241)
@@ -2,13 +2,14 @@
 # $Id$
 
 PortSystem                  1.0
-PortGroup                   xcodeversion 1.0
-PortGroup                   texlive 1.0
-PortGroup                   elisp 1.0
+PortGroup                   elisp           1.0
+PortGroup                   texlive         1.0
+PortGroup                   xcodeversion    1.0
+PortGroup                   wxWidgets       1.0
 
 name                        gnuplot
 version                     4.6.3
-revision                    3
+revision                    4
 categories                  math science
 # the license has some inconvenient requirements that we're not meeting
 # to be allowed to distribute binaries
@@ -40,7 +41,7 @@
                             rmd160  91c0832dc41f6e08fd0f67264e710d8afdc088bc \
                             sha256  3da1b3f5c435d3e1d770081f09ab6b77432f20284be199d0fee0cda4b6abe269
 
-depends_build               port:pkgconfig
+depends_build               path:bin/pkg-config:pkgconfig
 
 depends_lib                 port:expat \
                             port:fontconfig \
@@ -109,33 +110,17 @@
     configure.args-delete   --without-cairo
 }
 
-# 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 wxwidgets_devel description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
-    depends_lib-append      port:wxWidgets path:lib/pkgconfig/pango.pc:pango
+variant wxwidgets description "Enable wxt terminal" {
+    wxWidgets.use           wxWidgets-3.0
+    depends_lib-append      port:${wxWidgets.port} path:lib/pkgconfig/pango.pc:pango
     configure.args-delete   --disable-wxwidgets
-    configure.args-append   --with-wx-config=${prefix}/bin
+    configure.args-append   --with-wx-config=${wxWidgets.wxdir}
 }
-if {[variant_isset wxwidgets]} {
-    # wxWidgets is not universal and is 32-bit only
-    universal_variant       no
-    supported_archs         i386 ppc
-}
 
-variant wxwidgets30 conflicts wxwidgets wxwidgets_devel description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
-    depends_lib-append      port:wxWidgets30 path:lib/pkgconfig/pango.pc:pango
-    configure.args-delete   --disable-wxwidgets
-    configure.args-append   --with-wx-config=${prefix}/bin
-}
+# remove in September 2014
+variant wxwidgets30     description "Legacy compatibility variant" {}
+variant wxwidgets_devel description "Legacy compatibility variant" {}
 
-variant wxwidgets_devel conflicts wxwidgets wxwidgets30 description "Enable wxt terminal (using wxWidgets devel, supports 64-bit)" {
-    depends_lib-append      port:wxWidgets-devel path:lib/pkgconfig/pango.pc:pango
-    configure.args-delete   --disable-wxwidgets
-    configure.args-append   --with-wx-config=${prefix}/bin
-}
-
 variant qt description "Enable qt terminal" {
     depends_lib-append      port:qt4-mac
     configure.args-append   --enable-qt
@@ -150,6 +135,10 @@
 
 default_variants            +aquaterm +luaterm +pangocairo +x11
 
+if {[variant_isset wxwidgets30] || [variant_isset wxwidgets_devel]} {
+    default_variants-append +wxwidgets
+}
+
 # Building and installing TeX macro files for TikZ could/should be done by gnuplot's Makefile,
 # but without a patch that would require a dependency on texlive.
 # Apart from that the files would fly to the wrong place in TDS,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/f9e153ba/attachment.html>