Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 30DD91A921F for ; Fri, 20 Nov 2020 17:25:05 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6B6D085135; Fri, 20 Nov 2020 17:25:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A5A0E85133 for ; Fri, 20 Nov 2020 17:25:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id k9Ntgr1qSPmm for ; Fri, 20 Nov 2020 17:25:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 76B1184CE8 for ; Fri, 20 Nov 2020 17:25:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70362FA9D; Fri, 20 Nov 2020 17:25:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1605893102113740" MIME-Version: 1.0 Date: Fri, 20 Nov 2020 17:25:02 +0000 From: "Patrick Welche" Subject: CVS commit: pkgsrc/graphics/gnuplot To: pkgsrc-changes@NetBSD.org Reply-To: prlw1@netbsd.org X-Mailer: log_accum Message-Id: <20201120172502.70362FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1605893102113740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: prlw1 Date: Fri Nov 20 17:25:02 UTC 2020 Modified Files: pkgsrc/graphics/gnuplot: Makefile PLIST distinfo options.mk pkgsrc/graphics/gnuplot/patches: patch-configure Removed Files: pkgsrc/graphics/gnuplot/patches: patch-src_term.c patch-src_variable.c Log Message: Update gnuplot to 5.4.0 The lua option is there to enable the TikZ terminal, so install its LaTeX style files to make use of it. Replace and deprecate old "set loadpath" command means the list of font paths is gone. Highlights: * Support for 64-bit integer arithmetic o All evaluation of expressions and functions uses 64-bit arithmetic if supported by the hardware platform. o Integer overflow is detected and handled according to user preference. * Voxel grids o Gnuplot now supports operations based on 3D grids of voxel data. o The current content of one or more voxel grids can be referenced by splot commands to assign colors or other properties to plot elements. o Data in a voxel grids can be plotted by splot styles dots, points, or isosurface. * Pixmaps as objects o "set pixmap" allows import of a png/jpeg/gif image as a pixmap that can be positioned anywhere in a plot or on the page. Unlike plotting "with image", pixmap objects retain their original aspect ratio and size independent of axis scaling or rotation. Example: http://gnuplot.info/demo_5.4/pixmap.html * New plot styles and plot options o 3D plot style "with polygons" reads polygon faces from a data file. These can be used to create a surface or to describe a solid object. Example: http://gnuplot.info/demo_5.4/polygons.html o "splot $voxelgrid with isosurface" creates a tessellated 3D surface enclosing voxels above a requested threshold level. Example: http://gnuplot.info/demo_5.4/isosurface.html o "set spiderplot" selects a new plotting mode for creating spider plots, also known as radar charts. These are essentially parallel axis plots in which the axes are arranged radially rather than vertically. Example: http://gnuplot.info/demo_5.4/spiderplot.html o Plot styles "with circles" and "with boxes" can be used in 3D plots. Example: http://gnuplot.info/demo_5.4/3Dboxes.html o 2D plot style "with arrows" is a variant of "with vectors" in which each arrow is specified by x:y:length:angle rather than x:y:dx:dy. o pm3d surfaces can have individual fill styles and separate top/bottom fill colors. Example: http://gnuplot.info/demo_5.4/hidden_compare.html o pm3d option "noclipcb" causes quadrangles with palette color outside cbrange to be omitted from the plot rather than being assigned a color clipped to cbmin or cbmax. o Contour line types can be customized. Example: http://gnuplot.info/demo_5.4/custom_contours.html ... To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 pkgsrc/graphics/gnuplot/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/gnuplot/PLIST cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/gnuplot/distinfo cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/gnuplot/options.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gnuplot/patches/patch-configure cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/gnuplot/patches/patch-src_term.c \ pkgsrc/graphics/gnuplot/patches/patch-src_variable.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1605893102113740 Content-Disposition: inline Content-Length: 10805 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.147 pkgsrc/graphics/gnuplot/Makefile:1.148 --- pkgsrc/graphics/gnuplot/Makefile:1.147 Thu Nov 5 09:08:21 2020 +++ pkgsrc/graphics/gnuplot/Makefile Fri Nov 20 17:25:02 2020 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.147 2020/11/05 09:08:21 ryoon Exp $ +# $NetBSD: Makefile,v 1.148 2020/11/20 17:25:02 prlw1 Exp $ -DISTNAME= gnuplot-5.2.8 -PKGREVISION= 11 +DISTNAME= gnuplot-5.4.0 CATEGORIES+= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://gnuplot.sourceforge.net/ +HOMEPAGE= http://gnuplot.info/ COMMENT= Portable interactive, function plotting utility #LICENSE= gnuplot + BSD @@ -18,7 +17,6 @@ USE_LANGUAGES= c USE_TOOLS+= makeinfo pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-latex -CONFIGURE_ARGS+= --without-tutorial CONFIGURE_ARGS+= ac_cv_prog_EMACS= INFO_FILES= yes TEST_TARGET= check @@ -26,13 +24,6 @@ TEST_TARGET= check PLIST_SUBST+= API_VERSION=${API_VERSION} LDFLAGS.SunOS+= -liconv -# Make this available to patch-src_variable.c so the font path can include pkgsrc fonts. -SUBST_CLASSES+= fontpath -SUBST_STAGE.fontpath= pre-configure -SUBST_MESSAGE.fontpath= Fixing font path. -SUBST_FILES.fontpath= src/variable.c -SUBST_SED.fontpath= -e 's,@PKGSRC_PREFIX@,"${PREFIX}",' - .include "options.mk" .include "../../mk/readline.buildlink3.mk" Index: pkgsrc/graphics/gnuplot/PLIST diff -u pkgsrc/graphics/gnuplot/PLIST:1.21 pkgsrc/graphics/gnuplot/PLIST:1.22 --- pkgsrc/graphics/gnuplot/PLIST:1.21 Fri Nov 3 15:00:10 2017 +++ pkgsrc/graphics/gnuplot/PLIST Fri Nov 20 17:25:02 2020 @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.21 2017/11/03 15:00:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2020/11/20 17:25:02 prlw1 Exp $ bin/gnuplot ${PLIST.qt}libexec/gnuplot/${API_VERSION}/gnuplot_qt ${PLIST.x11}libexec/gnuplot/${API_VERSION}/gnuplot_x11 -man/man1/gnuplot-ja.1 man/man1/gnuplot.1 share/gnuplot/${API_VERSION}/PostScript/8859-1.ps share/gnuplot/${API_VERSION}/PostScript/8859-15.ps @@ -34,6 +33,7 @@ share/gnuplot/${API_VERSION}/js/gnuplot_ share/gnuplot/${API_VERSION}/js/gnuplot_mouse.css share/gnuplot/${API_VERSION}/js/gnuplot_mouse.js share/gnuplot/${API_VERSION}/js/gnuplot_svg.js +share/gnuplot/${API_VERSION}/js/gnuplot_svg_2018.js share/gnuplot/${API_VERSION}/js/grid.png share/gnuplot/${API_VERSION}/js/help.png share/gnuplot/${API_VERSION}/js/nextzoom.png @@ -43,3 +43,7 @@ share/gnuplot/${API_VERSION}/js/textzoom share/gnuplot/${API_VERSION}/lua/gnuplot-tikz.lua ${PLIST.qt}share/gnuplot/${API_VERSION}/qt/qtgnuplot_fr.qm ${PLIST.qt}share/gnuplot/${API_VERSION}/qt/qtgnuplot_ja.qm +${PLIST.lua}share/texmf-dist/tex/context/gnuplot/t-gnuplot-lua-tikz.tex +${PLIST.lua}share/texmf-dist/tex/generic/gnuplot/gnuplot-lua-tikz-common.tex +${PLIST.lua}share/texmf-dist/tex/generic/gnuplot/gnuplot-lua-tikz.tex +${PLIST.lua}share/texmf-dist/tex/latex/gnuplot/gnuplot-lua-tikz.sty Index: pkgsrc/graphics/gnuplot/distinfo diff -u pkgsrc/graphics/gnuplot/distinfo:1.43 pkgsrc/graphics/gnuplot/distinfo:1.44 --- pkgsrc/graphics/gnuplot/distinfo:1.43 Tue Sep 22 19:08:55 2020 +++ pkgsrc/graphics/gnuplot/distinfo Fri Nov 20 17:25:02 2020 @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.43 2020/09/22 19:08:55 bsiegert Exp $ +$NetBSD: distinfo,v 1.44 2020/11/20 17:25:02 prlw1 Exp $ -SHA1 (gnuplot-5.2.8.tar.gz) = dc018b1e0a31b770d4635958badff13498babc4d -RMD160 (gnuplot-5.2.8.tar.gz) = 1048f333f14be3f27bd8a6fa866371c6308f4f5d -SHA512 (gnuplot-5.2.8.tar.gz) = 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c -Size (gnuplot-5.2.8.tar.gz) = 5340677 bytes -SHA1 (patch-configure) = 0881a50206c9796a2f34b93b72f6cd6eae127a15 +SHA1 (gnuplot-5.4.0.tar.gz) = b4660dff7d047a453c55fd77faba11f63bb2d5ed +RMD160 (gnuplot-5.4.0.tar.gz) = fca7270c9a7d8633aa457a661bcf91778c6e1f3d +SHA512 (gnuplot-5.4.0.tar.gz) = abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66 +Size (gnuplot-5.4.0.tar.gz) = 5622595 bytes +SHA1 (patch-configure) = 17e4b17519ab0801e1374130a6bc0102207a5fd0 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7 SHA1 (patch-src_plot.c) = a91ef7ff92917c54e37f3cca765e92d9857a47a5 SHA1 (patch-src_readline.h) = ae138bb783a5a5e68f89850cdd861cc545399aaf -SHA1 (patch-src_term.c) = 5bf2d0fad2100aded705c7a17a9cf321a3b9946d -SHA1 (patch-src_variable.c) = 90a9372c715791efe42bc019025aa61fb5ece80c Index: pkgsrc/graphics/gnuplot/options.mk diff -u pkgsrc/graphics/gnuplot/options.mk:1.17 pkgsrc/graphics/gnuplot/options.mk:1.18 --- pkgsrc/graphics/gnuplot/options.mk:1.17 Wed Aug 19 22:09:15 2020 +++ pkgsrc/graphics/gnuplot/options.mk Fri Nov 20 17:25:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2020/08/19 22:09:15 wiz Exp $ +# $NetBSD: options.mk,v 1.18 2020/11/20 17:25:02 prlw1 Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua qt5 wxwidgets x11 @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= cairo cerf gd x11 PKG_OPTIONS_LEGACY_OPTS+= pdf:cairo .include "../../mk/bsd.options.mk" -PLIST_VARS+= gnuplot-pdf-doc qt x11 +PLIST_VARS+= gnuplot-pdf-doc lua qt x11 .if !empty(PKG_OPTIONS:Mcairo) .include "../../devel/pango/buildlink3.mk" @@ -26,7 +26,25 @@ CONFIGURE_ARGS+= --without-cairo .endif .if !empty(PKG_OPTIONS:Mlua) +PLIST.lua= yes +CONFIGURE_ARGS+= --with-lua + +INSTALLATION_DIRS+= share/texmf-dist/tex/context/gnuplot +INSTALLATION_DIRS+= share/texmf-dist/tex/generic/gnuplot +INSTALLATION_DIRS+= share/texmf-dist/tex/latex/gnuplot + +post-install: + ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/t-gnuplot-lua-tikz.tex \ + ${DESTDIR}${PREFIX}/share/texmf-dist/tex/context/gnuplot + ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.tex\ + ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot + ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz-common.tex\ + ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot + ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.sty\ + ${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/gnuplot + .include "../../lang/lua/buildlink3.mk" +.include "../../print/kpathsea/texmf.mk" .else CONFIGURE_ARGS+= --without-lua .endif @@ -43,13 +61,6 @@ post-install: ${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION} .endif -.if !empty(PKG_OPTIONS:Mx11) -PLIST.x11= yes -.include "../../x11/libXaw/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-x -.endif - .if !empty(PKG_OPTIONS:Mqt5) USE_LANGUAGES+= c++11 CONFIGURE_ARGS+= --with-qt=qt5 @@ -68,3 +79,10 @@ CONFIGURE_ARGS+= --enable-wxwidgets .else CONFIGURE_ARGS+= --disable-wxwidgets .endif + +.if !empty(PKG_OPTIONS:Mx11) +PLIST.x11= yes +.include "../../x11/libXaw/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-x +.endif Index: pkgsrc/graphics/gnuplot/patches/patch-configure diff -u pkgsrc/graphics/gnuplot/patches/patch-configure:1.1 pkgsrc/graphics/gnuplot/patches/patch-configure:1.2 --- pkgsrc/graphics/gnuplot/patches/patch-configure:1.1 Fri Nov 3 15:00:10 2017 +++ pkgsrc/graphics/gnuplot/patches/patch-configure Fri Nov 20 17:25:02 2020 @@ -1,13 +1,13 @@ -$NetBSD: patch-configure,v 1.1 2017/11/03 15:00:10 adam Exp $ +$NetBSD: patch-configure,v 1.2 2020/11/20 17:25:02 prlw1 Exp $ NetBSD editline keeps header files in "readline", not "editline". Same applies to DragonFly. Also get rid of a non-portable "test ... ==" instance. ---- configure.orig 2017-10-15 02:45:26.000000000 +0000 +--- configure.orig 2020-07-13 03:38:14.000000000 +0000 +++ configure -@@ -8891,7 +8891,7 @@ $as_echo "yes" >&6; } +@@ -8969,7 +8969,7 @@ $as_echo "yes" >&6; } # Check whether --with-aquaterm was given. if test "${with_aquaterm+set}" = set; then : @@ -16,7 +16,7 @@ Also get rid of a non-portable "test ... { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm framework presence" >&5 $as_echo_n "checking for AquaTerm framework presence... " >&6; } -@@ -10189,9 +10189,9 @@ fi +@@ -10185,9 +10185,9 @@ fi $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h @@ -28,7 +28,7 @@ Also get rid of a non-portable "test ... if test "x$ac_cv_header_editline_readline_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_EDITLINE_READLINE_H 1 -@@ -16679,7 +16679,7 @@ $as_echo " tek40xx, tek410x, texdraw, +@@ -16582,7 +16584,7 @@ $as_echo " pict2e, pslatex, pstex, ps { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } @@ -37,21 +37,39 @@ Also get rid of a non-portable "test ... { $as_echo "$as_me:${as_lineno-$LINENO}: result: dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5 $as_echo " dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; } else -@@ -16756,7 +16756,7 @@ else - $as_echo " ggi terminal: no (use --with-ggi to enable, requires libggi)" >&6; } +@@ -16596,7 +16598,7 @@ $as_echo " hp500c, hpdj, hpljii, hppj + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + $as_echo "" >&6; } + +-if test "$with_tektronix" == no; then ++if test "$with_tektronix" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: tektronix terminal emulators: no ( --with-tektronix to enable)" >&5 + $as_echo " tektronix terminal emulators: no ( --with-tektronix to enable)" >&6; } + else +@@ -16626,7 +16628,7 @@ else + $as_echo " ggi terminal: no (use --with-ggi to enable, requires libggi)" >&6; } fi -if test "$with_gpic" == yes; then +if test "$with_gpic" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gpic terminal: yes" >&5 - $as_echo " gpic terminal: yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gpic terminal: yes" >&5 + $as_echo " gpic terminal: yes" >&6; } + else +@@ -16634,7 +16636,7 @@ else + $as_echo " gpic terminal: no (use --with-gpic to enable)" >&6; } + fi + +-if test "$with_tgif" == yes; then ++if test "$with_tgif" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: tgif terminal: yes" >&5 + $as_echo " tgif terminal: yes" >&6; } else -@@ -16764,7 +16764,7 @@ else - $as_echo " gpic terminal: no (use --with-gpic to enable)" >&6; } +@@ -16642,7 +16644,7 @@ else + $as_echo " tgif terminal: no (use --with-tgif to enable)" >&6; } fi -if test "$with_mif" == yes; then +if test "$with_mif" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: mif terminal: yes" >&5 - $as_echo " mif terminal: yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: mif terminal (FrameMaker 3): yes" >&5 + $as_echo " mif terminal (FrameMaker 3): yes" >&6; } else --_----------=_1605893102113740--