Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170288777126660"
MIME-Version: 1.0
Date: Mon, 18 Dec 2023 08:22:51 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/gnuplot
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: adam@netbsd.org
Message-Id: <20231218082251.DB809FA42@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_170288777126660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Mon Dec 18 08:22:51 UTC 2023

Modified Files:
	pkgsrc/graphics/gnuplot: Makefile distinfo options.mk

Log Message:
gnuplot: updated to 5.4.10

Changes in 5.4.10

FIX postscript: build failed in 5.4.9 if neither gd nor cairo libraries present
FIX data-dependent variable point properties in polar plots
FIX configure script modified to work with macOS+Homebrew
CHANGE use 64-bit integers for iteration (allows iteration over dates)

Changes in 5.4.9

NEW qt: support building with Qt6
CHANGE check plugin version at time of import
FIX prevent segfault if GNUPLOT_DRIVER_DIR is invalid
FIX (regression) only y autoscale yerrorbars to points in xrang
FIX possible memory corruption if clipping causes 0-size polygons
FIX wxt: initialization of key box toggle state
FIX post: handle pixmaps


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 pkgsrc/graphics/gnuplot/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/gnuplot/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/gnuplot/options.mk

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


--_----------=_170288777126660
Content-Disposition: inline
Content-Length: 3906
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.181 pkgsrc/graphics/gnuplot/Makefile:1.182
--- pkgsrc/graphics/gnuplot/Makefile:1.181	Tue Nov 14 14:02:04 2023
+++ pkgsrc/graphics/gnuplot/Makefile	Mon Dec 18 08:22:51 2023
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.181 2023/11/14 14:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2023/12/18 08:22:51 adam Exp $
 
-DISTNAME=	gnuplot-5.4.8
+DISTNAME=	gnuplot-5.4.10
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gnuplot.info/
 COMMENT=	Portable interactive, function plotting utility
-PKGREVISION=	5
 #LICENSE=	gnuplot + BSD
 
-API_VERSION=	${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
+API_VERSION=	${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])+/\1.\2/}
 
 CONFLICTS+=		gnuplot-nox11-[0-9]*
 

Index: pkgsrc/graphics/gnuplot/distinfo
diff -u pkgsrc/graphics/gnuplot/distinfo:1.51 pkgsrc/graphics/gnuplot/distinfo:1.52
--- pkgsrc/graphics/gnuplot/distinfo:1.51	Sat Aug 26 08:30:12 2023
+++ pkgsrc/graphics/gnuplot/distinfo	Mon Dec 18 08:22:51 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2023/08/26 08:30:12 adam Exp $
+$NetBSD: distinfo,v 1.52 2023/12/18 08:22:51 adam Exp $
 
-BLAKE2s (gnuplot-5.4.8.tar.gz) = 94b14cd17da3650abaa76bd7a5c40a5b896e83cfa9cee331a3971bab966803ca
-SHA512 (gnuplot-5.4.8.tar.gz) = 3fe0ed783db85d95bdbc13e24ec5dc9bb6b2d85b3571cc87d3c17c94f4463fb6e681376394e0918cf3915f8f53896e6423ce76cb8b6fdbefcd6ec3e1b3b80125
-Size (gnuplot-5.4.8.tar.gz) = 5684061 bytes
+BLAKE2s (gnuplot-5.4.10.tar.gz) = 76605805bf82eb22387c2bda2687e5f1d481780bc12057cb33a834e31834dc0d
+SHA512 (gnuplot-5.4.10.tar.gz) = fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f
+Size (gnuplot-5.4.10.tar.gz) = 5687565 bytes
 SHA1 (patch-configure) = 51813d74dc2be0e6fcc2e55fcbcbcf2b4678b954
 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7
 SHA1 (patch-src_plot.c) = a91ef7ff92917c54e37f3cca765e92d9857a47a5

Index: pkgsrc/graphics/gnuplot/options.mk
diff -u pkgsrc/graphics/gnuplot/options.mk:1.23 pkgsrc/graphics/gnuplot/options.mk:1.24
--- pkgsrc/graphics/gnuplot/options.mk:1.23	Wed Jun  7 10:09:46 2023
+++ pkgsrc/graphics/gnuplot/options.mk	Mon Dec 18 08:22:51 2023
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.23 2023/06/07 10:09:46 wiz Exp $
+# $NetBSD: options.mk,v 1.24 2023/12/18 08:22:51 adam Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuplot
-PKG_SUPPORTED_OPTIONS=	cairo cerf gd gnuplot-pdf-doc lua qt5 wxwidgets x11
-PKG_SUGGESTED_OPTIONS=	cairo cerf gd x11
+PKG_OPTIONS_VAR=		PKG_OPTIONS.gnuplot
+PKG_SUPPORTED_OPTIONS=		cairo cerf gd gnuplot-pdf-doc lua wxwidgets x11
+PKG_OPTIONS_OPTIONAL_GROUPS=	gui
+PKG_OPTIONS_GROUP.gui=		qt5 qt6
+PKG_SUGGESTED_OPTIONS=		cairo cerf gd x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -59,13 +61,22 @@ post-install:
 	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION}
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt5)
+.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
+PLIST.qt=		yes
+.  if !empty(PKG_OPTIONS:Mqt5)
 USE_LANGUAGES+=		c++11
 CONFIGURE_ARGS+=	--with-qt=qt5
-PLIST.qt=		yes
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
+.    include "../../x11/qt5-qtbase/buildlink3.mk"
+.    include "../../x11/qt5-qtsvg/buildlink3.mk"
+.    include "../../x11/qt5-qttools/buildlink3.mk"
+.  elif !empty(PKG_OPTIONS:Mqt6)
+USE_LANGUAGES+=		c++17
+CONFIGURE_ARGS+=	--with-qt=qt6
+.    include "../../devel/qt6-qt5compat/buildlink3.mk"
+.    include "../../devel/qt6-qttools/buildlink3.mk"
+.    include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.    include "../../x11/qt6-qtbase/buildlink3.mk"
+.  endif
 .else
 CONFIGURE_ARGS+=	--with-qt=no
 .endif


--_----------=_170288777126660--