[99946] trunk/dports/science/plplot/Portfile

[takeshi at macports.org]

Revision: 99946
          https://trac.macports.org/changeset/99946
Author:   takeshi at macports.org
Date:     2012-11-21 17:36:21 -0800 (Wed, 21 Nov 2012)
Log Message:
-----------
plplot: deprecated no_x11 and added x11 variant as default, closing #37035

Modified Paths:
--------------
    trunk/dports/science/plplot/Portfile

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2012-11-22 01:21:50 UTC (rev 99945)
+++ trunk/dports/science/plplot/Portfile	2012-11-22 01:36:21 UTC (rev 99946)
@@ -5,7 +5,7 @@
 
 name            plplot
 version         5.9.9
-revision        5
+revision        6
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -65,10 +65,8 @@
                         -DCMAKE_LIBRARY_PATH=${prefix}/lib \
                         -DTCL_INCLUDE_PATH=${prefix}/include \
                         -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
-                        -DTCL_STUB_LIBRARY=${prefix}/lib/libtclstub8.5.a \
                         -DTK_INCLUDE_PATH=${prefix}/include \
                         -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
-                        -DTK_STUB_LIBRARY=${prefix}/lib/libtkstub8.5.a \
                         -DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
                         -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
                         -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
@@ -85,7 +83,9 @@
                         -DPLD_svgcairo=ON \
                         -DPLD_tk=ON \
                         -DPLD_wxwidgets=OFF \
-                        -DPLD_xcairo=ON  \
+                        -DPLD_xcairo=OFF  \
+                        -DPLD_xwin=OFF \
+                        -DPLD_xfig=OFF \
                         -DPLD_tkwin=OFF \
                         -DENABLE_ada=OFF \
                         -DENABLE_d=OFF \
@@ -147,7 +147,8 @@
 
 if {${os.platform}=="darwin"} {
     default_variants    +aquaterm
-} 
+}
+default_variants-append +x11
 
 subport ${name}-single {
     configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}/lib/${subport}
@@ -227,15 +228,14 @@
                             -DAQT_FRAMEWORK=${frameworks_dir}/AquaTerm.framework
 }
 
-variant no_x11 {
-    depends_lib-delete      path:lib/pkgconfig/pango.pc:pango \
-                            port:tk
-    configure.args-delete   -DPLD_xcairo=ON  \
-                            -DPLD_tk=ON \
-                            -DTK_INCLUDE_PATH=${prefix}/include \
-                            -DTK_LIBRARY=${prefix}/lib/libtk.dylib
-    configure.args-append   -DPLD_xcairo=OFF \
+variant no_x11 conflicts x11 description {Deprecated dummy variant} {
+}
+
+variant x11 conflicts no_x11 {
+    configure.args-append   -DPLD_xcairo=ON  \
+                            -DPLD_xwin=ON \
+                            -DPLD_xfig=ON
+    configure.args-delete   -DPLD_xcairo=OFF \
                             -DPLD_xwin=OFF \
-                            -DPLD_tk=OFF \
-                            -DENABLE_tk=OFF
+                            -DPLD_xfig=OFF
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121121/dd5b9926/attachment-0001.html>