pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/gnuplot Update gnuplot to 5.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/02ee2a64fb05
branches: trunk
changeset: 442219:02ee2a64fb05
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Fri Nov 20 17:25:02 2020 +0000
description:
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
...
diffstat:
graphics/gnuplot/Makefile | 15 +-------
graphics/gnuplot/PLIST | 8 +++-
graphics/gnuplot/distinfo | 14 +++----
graphics/gnuplot/options.mk | 36 ++++++++++++++++-----
graphics/gnuplot/patches/patch-configure | 44 +++++++++++++++++++-------
graphics/gnuplot/patches/patch-src_term.c | 33 --------------------
graphics/gnuplot/patches/patch-src_variable.c | 23 --------------
7 files changed, 73 insertions(+), 100 deletions(-)
diffs (truncated from 311 to 300 lines):
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/Makefile
--- a/graphics/gnuplot/Makefile Fri Nov 20 17:18:21 2020 +0000
+++ b/graphics/gnuplot/Makefile Fri Nov 20 17:25:02 2020 +0000
@@ -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@localhost
-HOMEPAGE= http://gnuplot.sourceforge.net/
+HOMEPAGE= http://gnuplot.info/
COMMENT= Portable interactive, function plotting utility
#LICENSE= gnuplot + BSD
@@ -18,7 +17,6 @@
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 @@
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"
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/PLIST
--- a/graphics/gnuplot/PLIST Fri Nov 20 17:18:21 2020 +0000
+++ b/graphics/gnuplot/PLIST Fri Nov 20 17:25:02 2020 +0000
@@ -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_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}/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
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/distinfo
--- a/graphics/gnuplot/distinfo Fri Nov 20 17:18:21 2020 +0000
+++ b/graphics/gnuplot/distinfo Fri Nov 20 17:25:02 2020 +0000
@@ -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
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/options.mk
--- a/graphics/gnuplot/options.mk Fri Nov 20 17:18:21 2020 +0000
+++ b/graphics/gnuplot/options.mk Fri Nov 20 17:25:02 2020 +0000
@@ -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_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 @@
.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 @@
${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 @@
.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
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/patches/patch-configure
--- a/graphics/gnuplot/patches/patch-configure Fri Nov 20 17:18:21 2020 +0000
+++ b/graphics/gnuplot/patches/patch-configure Fri Nov 20 17:25:02 2020 +0000
@@ -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 @@
{ $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 @@
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 @@
{ $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
-@@ -16764,7 +16764,7 @@ else
- $as_echo " gpic terminal: no (use --with-gpic to enable)" >&6; }
+@@ -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
+@@ -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
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/patches/patch-src_term.c
--- a/graphics/gnuplot/patches/patch-src_term.c Fri Nov 20 17:18:21 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_term.c,v 1.1 2020/09/22 19:08:55 bsiegert Exp $
-
-Fix for CVE-2020-25559 and CVE-2020-25412, from upstream
-
---- src/term.c.orig 2019-11-19 21:57:18.000000000 +0000
-+++ src/term.c
-@@ -191,6 +191,7 @@ char *enhanced_cur_text = NULL;
- double enhanced_fontscale = 1.0;
- char enhanced_escape_format[16] = "";
- double enhanced_max_height = 0.0, enhanced_min_height = 0.0;
-+#define ENHANCED_TEXT_MAX (&enhanced_text[MAX_LINE_LEN])
- /* flag variable to disable enhanced output of filenames, mainly. */
- TBOOLEAN ignore_enhanced_text = FALSE;
-
-@@ -2207,6 +2208,9 @@ fflush_binary()
- void
- do_enh_writec(int c)
- {
-+ /* Guard against buffer overflow */
-+ if (enhanced_cur_text >= ENHANCED_TEXT_MAX)
-+ return;
- /* note: c is meant to hold a char, but is actually an int, for
- * the same reasons applying to putc() and friends */
- *enhanced_cur_text++ = c;
-@@ -2361,7 +2365,7 @@ enhanced_recursion(
- ++p;
- if (*p != *start_of_fontname) {
- int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
-- p = start_of_fontname;
-+ break;
- }
- start_of_fontname++;
- end_of_fontname = p++;
diff -r 459274de81b8 -r 02ee2a64fb05 graphics/gnuplot/patches/patch-src_variable.c
--- a/graphics/gnuplot/patches/patch-src_variable.c Fri Nov 20 17:18:21 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_variable.c,v 1.1 2017/11/03 15:00:10 adam Exp $
-
-Add NetBSD native X and pkgsrc modular X directories to the candidate
-font path list.
-
---- src/variable.c.orig 2013-07-03 16:31:53.000000000 +0000
-+++ src/variable.c
-@@ -279,6 +279,15 @@ static const struct path_table fontpath_
- { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
- { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
- #endif
-+ /* NetBSD pkgsrc X.org */
Home |
Main Index |
Thread Index |
Old Index