CVS commit: pkgsrc/graphics/gnuplot

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jan  5 09:08:55 UTC 2025

Modified Files:
        pkgsrc/graphics/gnuplot: Makefile distinfo options.mk
        pkgsrc/graphics/gnuplot/patches: patch-src_plot.c patch-src_readline.h

Log Message:
gnuplot: updated to 6.0.2

Changes in 6.0.2

* NEW    backport plot style "with hsteps"
* NEW    backport plot style "splot with filledcurves" (waterfall plots)
* NEW    general binary keyword option "blank=NaN"
         - faciliates binary input to plot styles sensitive to blank lines
* NEW    polygons in splot can use pm3d coloring
         - facilitates use of triangular tessellated 3D pm3d surfaces
* NEW    - UTF-8 terminal input now works when linked against BSD editline
           ./configure --with-readline=bsd
* CHANGE backport reimplementation of local variables
         - faster function block evaluation, better-defined scope
* CHANGE apply jitter to the horizontal spread of boxplot outliers
* CHANGE dump $GPVAL_LAST_MULTIPLOT at the end of a "save" file
* FIX    backport reworked generation of logscale axis tic marks        Bug 2372 2717
* FIX    Do not save extraneous commands to $GPVAL_LAST_MULTIPLOT       Bug 2714
* FIX    svg: modify gnuplot_svg.js to work in local standalone mode    Bug 2715
* FIX    "set table": honor "nosurface" keyword in splot
* FIX    "set table": honor "set format z" when z is printed from plot
* FIX    better contouring near the edge of a z-clipped surface
* FIX    x11: handle mousing of logscale axes in inactive plot window   Bug 2723
* FIX    qt: handle mousing of logscale axes in inactive plot window    Bug 2723
* FIX    wxt: handle mousing of logscale axes in inactive plot window   Bug 2723
* FIX    wxt: release per-thread font data before entering "persist"    Bug 2693
* FIX    "set tics scale" should not change other axis tick properties  Bug 2724
* FIX    fill properties can be given as part of "splot with circles"
* FIX    some properties of the key title not shown by "show" or "save" Bug 2729
* FIX    points with variable color value NaN should not be drawn       Bug 2737
* FIX    "set term tikz nostandalone" should suppress the latex wrapper Bug 2740
* FIX    handle unusual case of intersecting pm3d surfaces              Bug 2744
* FIX    prevent use-after-free if a function block has no "return"     Bug 2745


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 pkgsrc/graphics/gnuplot/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/gnuplot/distinfo
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/gnuplot/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gnuplot/patches/patch-src_plot.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gnuplot/patches/patch-src_readline.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.194 pkgsrc/graphics/gnuplot/Makefile:1.195
--- pkgsrc/graphics/gnuplot/Makefile:1.194      Fri Dec 27 08:19:57 2024
+++ pkgsrc/graphics/gnuplot/Makefile    Sun Jan  5 09:08:55 2025
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.194 2024/12/27 08:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.195 2025/01/05 09:08:55 adam Exp $
 
-DISTNAME=      gnuplot-6.0.1
+DISTNAME=      gnuplot-6.0.2
 CATEGORIES+=   graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://gnuplot.sourceforge.net/
 COMMENT=       Portable interactive, function plotting utility
-PKGREVISION=   7
 #LICENSE=      gnuplot + BSD
 
 API_VERSION=   ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])+/\1.\2/}

Index: pkgsrc/graphics/gnuplot/distinfo
diff -u pkgsrc/graphics/gnuplot/distinfo:1.53 pkgsrc/graphics/gnuplot/distinfo:1.54
--- pkgsrc/graphics/gnuplot/distinfo:1.53       Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/distinfo    Sun Jan  5 09:08:55 2025
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.53 2024/06/05 13:56:14 adam Exp $
+$NetBSD: distinfo,v 1.54 2025/01/05 09:08:55 adam Exp $
 
-BLAKE2s (gnuplot-6.0.1.tar.gz) = 2737e2499b7d28bd8b77dacac5843fbec0eceab3657ae777ac745d8c36853c14
-SHA512 (gnuplot-6.0.1.tar.gz) = 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62
-Size (gnuplot-6.0.1.tar.gz) = 7528936 bytes
+BLAKE2s (gnuplot-6.0.2.tar.gz) = 5262f3c0a9282083f29bb626543a71e2d9260d07466a2f2ff3b141d65ba4843c
+SHA512 (gnuplot-6.0.2.tar.gz) = 5c26c91a91238be0dad91b0835427355b4db526e6a83225219219b3c980e245abcd4b54d1c693523d645c469f3c610658da0c889df691ba8ba6799efe440ed01
+Size (gnuplot-6.0.2.tar.gz) = 7637308 bytes
 SHA1 (patch-configure) = 51813d74dc2be0e6fcc2e55fcbcbcf2b4678b954
 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7
-SHA1 (patch-src_plot.c) = e0e56991a76daadcabbd7dc54a538ddd386947ab
+SHA1 (patch-src_plot.c) = e690f48ece5070a45cfbf9609acc460cdee4ef7d
 SHA1 (patch-src_qtterminal_QtGnuplotApplication.h) = de110ef5be8c66a760c8d53fd71e1928e44d4462
 SHA1 (patch-src_qtterminal_QtGnuplotItems.h) = 6079c4174df9e7915b7a0a97fdf6561bec034068
 SHA1 (patch-src_qtterminal_QtGnuplotScene.h) = fd1a539afc7da994dc69e5d1a3681bf71fba72b3
 SHA1 (patch-src_qtterminal_QtGnuplotWidget.h) = 2c04c0e4ee9b564dbdd8ce7ecc9e13271e6bbadb
 SHA1 (patch-src_qtterminal_QtGnuplotWindow.h) = 505759b11e596beb316d98f42f1e56c33444bc90
 SHA1 (patch-src_qtterminal_qt__embed__example.h) = 6aebdcd91e97718ac9a4a085f19055eeaaa85fb8
-SHA1 (patch-src_readline.h) = ae138bb783a5a5e68f89850cdd861cc545399aaf
+SHA1 (patch-src_readline.h) = cae9299249eb10c50fe026921c95ba2a299e3d62

Index: pkgsrc/graphics/gnuplot/options.mk
diff -u pkgsrc/graphics/gnuplot/options.mk:1.25 pkgsrc/graphics/gnuplot/options.mk:1.26
--- pkgsrc/graphics/gnuplot/options.mk:1.25     Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/options.mk  Sun Jan  5 09:08:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2024/06/05 13:56:14 adam Exp $
+# $NetBSD: options.mk,v 1.26 2025/01/05 09:08:55 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gnuplot
 PKG_SUPPORTED_OPTIONS=         cairo cerf gd gnuplot-pdf-doc lua wxwidgets x11
@@ -72,6 +72,7 @@ CONFIGURE_ARGS+=      --with-qt=qt5
 .    include "../../x11/qt5-qttools/buildlink3.mk"
 .  elif !empty(PKG_OPTIONS:Mqt6)
 USE_CXX_FEATURES=      c++17
+FORCE_CXX_STD=         c++17
 CONFIGURE_ARGS+=       --with-qt=qt6
 .    include "../../devel/qt6-qt5compat/buildlink3.mk"
 .    include "../../devel/qt6-qttools/buildlink3.mk"

Index: pkgsrc/graphics/gnuplot/patches/patch-src_plot.c
diff -u pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.2 pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.3
--- pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.2        Wed Jun  5 13:56:14 2024
+++ pkgsrc/graphics/gnuplot/patches/patch-src_plot.c    Sun Jan  5 09:08:55 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_plot.c,v 1.2 2024/06/05 13:56:14 adam Exp $
+$NetBSD: patch-src_plot.c,v 1.3 2025/01/05 09:08:55 adam Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- src/plot.c.orig    2023-12-18 23:28:58.000000000 +0000
+--- src/plot.c.orig    2024-12-20 00:26:46.000000000 +0000
 +++ src/plot.c
 @@ -81,7 +81,7 @@
  /* BSD editline
@@ -11,6 +11,6 @@ Same applies to DragonFly.
  #ifdef HAVE_LIBEDITLINE
 -#  include <editline/readline.h>
 +#  include <readline/readline.h>
- #  ifdef GNUPLOT_HISTORY
- #    include <histedit.h>
- #  endif
+ #  include <histedit.h>
+ #endif
+ 

Index: pkgsrc/graphics/gnuplot/patches/patch-src_readline.h
diff -u pkgsrc/graphics/gnuplot/patches/patch-src_readline.h:1.1 pkgsrc/graphics/gnuplot/patches/patch-src_readline.h:1.2
--- pkgsrc/graphics/gnuplot/patches/patch-src_readline.h:1.1    Fri Nov  3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_readline.h        Sun Jan  5 09:08:55 2025
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_readline.h,v 1.1 2017/11/03 15:00:10 adam Exp $
+$NetBSD: patch-src_readline.h,v 1.2 2025/01/05 09:08:55 adam Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- src/readline.h.orig        2016-05-26 01:10:06.000000000 +0000
+--- src/readline.h.orig        2024-10-29 17:28:55.000000000 +0000
 +++ src/readline.h
-@@ -51,7 +51,7 @@
+@@ -40,7 +40,7 @@
  # include <readline/readline.h>
  
  #elif defined(HAVE_LIBEDITLINE)
 -# include <editline/readline.h>
 +# include <readline/readline.h>
+ # include <histedit.h>
  #endif
  
- #if defined(READLINE)