[133179] trunk/dports/math/gnuplot

mojca at macports.org mojca at macports.org
Mon Feb 23 01:39:27 PST 2015


Revision: 133179
          https://trac.macports.org/changeset/133179
Author:   mojca at macports.org
Date:     2015-02-23 01:39:27 -0800 (Mon, 23 Feb 2015)
Log Message:
-----------
gnuplot: upgrade to 5.0.0 (#43738)

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

Removed Paths:
-------------
    trunk/dports/math/gnuplot/files/

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2015-02-23 09:12:09 UTC (rev 133178)
+++ trunk/dports/math/gnuplot/Portfile	2015-02-23 09:39:27 UTC (rev 133179)
@@ -8,7 +8,7 @@
 PortGroup           wxWidgets       1.0
 
 name                gnuplot
-version             4.6.6
+version             5.0.0
 categories          math science
 # the license has some inconvenient requirements that we're not meeting
 # to be allowed to distribute binaries
@@ -31,14 +31,8 @@
 master_sites        sourceforge:project/gnuplot/gnuplot/${version}
 dist_subdir         ${name}/${version}
 
-distfiles-append    ${name}.pdf
-extract.only        ${distname}.tar.gz
-checksums           ${distname}.tar.gz \
-                    rmd160  eb1185c94d93d19b272311c71d93ba3402eea030 \
-                    sha256  1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274 \
-                    ${name}.pdf \
-                    rmd160  659b2bba04077c3b048b6e501dde870e9f62d413 \
-                    sha256  b26ebf783ef9422856b9be5e8904e7901708baee5c7e86a6bf2dab71de8f9100
+checksums           rmd160  e91ae15d1b50110d323450be451db5d180917f4d \
+                    sha256  417d4bc5bc914a60409bb75cf18dd14f48b07f53c6ad3c4a4d3cd9a8d7370faf
 
 depends_build       path:bin/pkg-config:pkgconfig
 
@@ -46,6 +40,7 @@
                     port:fontconfig \
                     port:gd2 \
                     port:jpeg \
+                    port:libcaca \
                     port:libcerf \
                     port:libiconv \
                     port:libpng \
@@ -53,13 +48,12 @@
                     port:readline \
                     port:zlib
 
-patchfiles          patch-configure-aquaterm.diff
-
 minimum_xcodeversions \
                     {9 3.1}
 
-configure.args      --with-readline=${prefix} \
+configure.args      --with-caca=${prefix} \
                     --with-gd=${prefix} \
+                    --with-readline=${prefix} \
                     --without-aquaterm \
                     --without-x \
                     --infodir='\${prefix}/share/info' \
@@ -71,65 +65,72 @@
                     --without-latex \
                     --without-lua \
                     --without-pdf \
-                    --without-tutorial
+                    --without-qt \
+                    --without-tutorial \
+                    --with-cwdrc
 
 variant aquaterm description "Enable AquaTerm terminal" {
-    depends_lib-append      port:aquaterm
-    configure.args-delete   --without-aquaterm
-    configure.args-append   --with-aquaterm=${frameworks_dir}
+    depends_lib-append          port:aquaterm
+    configure.args-replace      --without-aquaterm --with-aquaterm
+    configure.cflags-append     "-F${frameworks_dir}"
+    configure.ldflags-append    "-F${frameworks_dir}"
 }
 
 variant x11 {
-    configure.args-delete   --without-x
-    configure.args-append   --with-x
-    depends_lib-append      port:xpm
+    configure.args-replace      --without-x --with-x
+    depends_lib-append          port:xpm
 }
 
-variant emacs description "An emacs mode for working with gnuplot" {
-    depends_build-append    port:${emacs_binary_provider}
-    configure.env-append    EMACS=${emacs_binary}
-    configure.args-delete   --without-lisp-files
-    configure.args-append   --with-lisp-files --with-lispdir=${emacs_lispdir}
-}
-
 variant luaterm description "Enable lua-based terminals" {
-    depends_lib-append      port:lua
-    configure.args-delete   --without-lua
-    configure.args-append   --with-lua
+    depends_lib-append          port:lua
+    configure.args-replace      --without-lua --with-lua
 }
 
 variant pangocairo description "Enable cairo-based terminals" {
-    configure.args-delete   --without-cairo
+    configure.args-delete       --without-cairo
 }
 
 variant pdflib description "Enable pdflib-based pdf terminal" {
-    depends_lib-append      port:pdflib
-    configure.args-replace  --without-pdf --with-pdf=${prefix}
+    depends_lib-append          port:pdflib
+    configure.args-replace      --without-pdf --with-pdf=${prefix}
 }
 
 variant wxwidgets description "Enable wxt terminal" {
-    wxWidgets.use           wxWidgets-3.0
-    depends_lib-append      port:${wxWidgets.port}
-    configure.args-delete   --disable-wxwidgets
-    configure.args-append   --with-wx-config=${wxWidgets.wxdir}
+    wxWidgets.use               wxWidgets-3.0
+    depends_lib-append          port:${wxWidgets.port}
+    configure.args-replace      --disable-wxwidgets --with-wx=${wxWidgets.wxdir}
 }
 
-variant qt description "Enable qt terminal" {
-    depends_lib-append      port:qt4-mac
-    configure.args-append   --enable-qt
+variant qt conflicts qt5 description "Enable qt terminal with Qt 4" {
+    depends_lib-append          port:qt4-mac
+    configure.args-replace      --without-qt --with-qt=qt4
 }
 
+variant qt5 conflicts qt description "Enable qt terminal with Qt 5" {
+    depends_lib-append          port:qt5-mac
+    # TODO: this is a workaround for a bug, either in gnuplot or in qt5 packaging on Mac
+    configure.ldflags-append    "-F${frameworks_dir}"
+    configure.cxxflags-append   "-F${frameworks_dir}" \
+                                "-I${frameworks_dir}/QtCore.framework/Versions/5/Headers" \
+                                "-I${frameworks_dir}/QtGui.framework/Versions/5/Headers" \
+                                "-I${frameworks_dir}/QtNetwork.framework/Versions/5/Headers" \
+                                "-I${frameworks_dir}/QtSvg.framework/Versions/5/Headers" \
+                                "-I${frameworks_dir}/QtWidgets.framework/Versions/5/Headers"
+
+    configure.args-replace      --without-qt --with-qt=qt5
+}
+
+
 # Ideally one would enable just PMB by default, but '--with-bitmap-terminals'
 # enables lots of other obsolete terminals which clutter the output of 'set term'.
 variant old_bitmap_terminals description "Enable PBM (Portable Bit Map) and other older bitmap terminals" {
-    configure.args-delete   --without-bitmap-terminals
-    configure.args-append   --with-bitmap-terminals
+    configure.args-replace      --without-bitmap-terminals --with-bitmap-terminals
 }
 
-default_variants            +aquaterm +luaterm +pangocairo +wxwidgets +x11
+default_variants                +aquaterm +luaterm +pangocairo +wxwidgets +x11
 
 if {[variant_isset pangocairo] || [variant_isset wxwidgets]} {
-    depends_lib-append      path:lib/pkgconfig/pango.pc:pango
+    depends_lib-append          path:lib/pkgconfig/pango.pc:pango
 }
 
 # Building and installing TeX macro files for TikZ could/should be done by gnuplot's Makefile,
@@ -160,7 +161,7 @@
 
     set destdocdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d -m 0755 ${destdocdir}
-    xinstall -m 0644 ${distpath}/${name}.pdf ${destdocdir}
+    xinstall -m 0644 ${worksrcpath}/docs/${name}.pdf ${destdocdir}
 
     # copy demo files
     file copy ${worksrcpath}/demo ${destdocdir}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150223/f77cddf9/attachment.html>


More information about the macports-changes mailing list