gnuplot: updated to 5.2.5

CHANGES IN 5.2.5

NEW "set pm3d depthorder base" sorts pm3d quadrangles by projecting to z=0
NEW "set jitter vertical" displaces y coordinate rather than x coordinate
NEW array size can be determined automatically from the initializer
CHANGE place titles along x axis in plots with columnstacked histograms
CHANGE equivalent slope constraint for mcs splines at both ends of the range
CHANGE treat imaginary values plotted from a using spec as UNDEFINED (NaN)
CHANGE allow "reset" between plots in a multiplot layout
CHANGE Deprecate linux and vgagl terminals (to be removed in 5.3)
CHANGE placement of axis and tic labels in 3D projections on to xz or yz plane
CHANGE default to ./configure --without-wx-multithreading
FIX parametric function plots did not work with logscale x (regression in 5.2.0-4)
FIX polar mode "set trange" was assumed to use radians, now it tracks "set angle"
FIX clip polar grid lines and ticks to x/y range limits
FIX clipping of plot "with lines" when axes are nonlinear (regression from 5.0)
FIX clipping of all elements in finanacebars/candlesticks/boxplots
FIX clipping of 3D splot "with labels"
FIX strange interaction of "noautoscale" with blank data lines
FIX alignment of boxed text to center for eps/cairolatex
FIX incompatibility of "pm3d depthorder" and rgb color taken from data column
FIX aqua terminal font changes in enhanced text mode

4 files changed, 29 insertions, 12 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 8da65ddbc84..6c358387f7a 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.125 2018/11/14 22:21:40 kleink Exp $
+# $NetBSD: Makefile,v 1.126 2018/11/21 17:12:06 adam Exp $
 
-DISTNAME=	gnuplot-5.2.4
+DISTNAME=	gnuplot-5.2.5
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gnuplot.sourceforge.net/
 COMMENT=	Portable interactive, function plotting utility
-PKGREVISION=	3
 #LICENSE=	gnuplot + BSD
 
 API_VERSION=	${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 7cf0b835c7d..400af4cdddf 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.38 2018/07/07 11:59:05 adam Exp $
+$NetBSD: distinfo,v 1.39 2018/11/21 17:12:06 adam Exp $
 
-SHA1 (gnuplot-5.2.4.tar.gz) = e31e8d9875216f65f9ed0e57b2f62d9dfb0f0714
-RMD160 (gnuplot-5.2.4.tar.gz) = fcf8e239cb40b9bd0e4bf19b3da398e81b4abec5
-SHA512 (gnuplot-5.2.4.tar.gz) = b276e379fe5e493a176750d9ccd84a8b02c8784b1d8701dc4252945a7e9e0455eebba0085d0d98824a4acf5da0def3b71ad3362803365a32e7c29f18af7854bb
-Size (gnuplot-5.2.4.tar.gz) = 5292321 bytes
+SHA1 (gnuplot-5.2.5.tar.gz) = 6c0e43968ec19f813241b91cbcf15e44f6ad5c73
+RMD160 (gnuplot-5.2.5.tar.gz) = 7054759e91c1bd44d9b1acf9aa15816d4e386a16
+SHA512 (gnuplot-5.2.5.tar.gz) = e516f33b678963e13c2464679efec6c387e57df4f92a57d319baec8bbd29ab46e545cd5d70b2d17644d734040892769da745b8a5441467dcdb8f9c892a493ca4
+Size (gnuplot-5.2.5.tar.gz) = 5305288 bytes
 SHA1 (patch-configure) = 0881a50206c9796a2f34b93b72f6cd6eae127a15
 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7
+SHA1 (patch-src_libcerf.c) = 2503759216b169d0e1e8588a7c6634ef30f8bd24
 SHA1 (patch-src_plot.c) = a91ef7ff92917c54e37f3cca765e92d9857a47a5
 SHA1 (patch-src_readline.h) = ae138bb783a5a5e68f89850cdd861cc545399aaf
 SHA1 (patch-src_variable.c) = 90a9372c715791efe42bc019025aa61fb5ece80c
diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk
index 7058d534436..3e6cb8dc84c 100644
--- a/graphics/gnuplot/options.mk
+++ b/graphics/gnuplot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2018/07/07 11:59:05 adam Exp $
+# $NetBSD: options.mk,v 1.14 2018/11/21 17:12:06 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuplot
 PKG_SUPPORTED_OPTIONS=	cairo cerf gd gnuplot-pdf-doc lua pdf qt4 qt5 wxwidgets x11
@@ -41,10 +41,10 @@ PLIST.gnuplot-pdf-doc=	yes
 BUILD_DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 BUILD_DEPENDS+=	tex-ucs-[0-9]*:../../print/tex-ucs
 post-build:
-	(cd ${WRKSRC}/docs; ${GMAKE} gnuplot.pdf)
+	cd ${WRKSRC}/docs && ${GMAKE} gnuplot.pdf
 post-install:
-	(cd ${WRKSRC}/docs; \
-	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION})
+	cd ${WRKSRC}/docs && \
+	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION}
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
diff --git a/graphics/gnuplot/patches/patch-src_libcerf.c b/graphics/gnuplot/patches/patch-src_libcerf.c
new file mode 100644
index 00000000000..1a8449991f0
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-src_libcerf.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_libcerf.c,v 1.1 2018/11/21 17:12:06 adam Exp $
+
+Re-order includes to avoid buidling problems.
+
+--- src/libcerf.c.orig	2018-11-21 16:52:31.000000000 +0000
++++ src/libcerf.c
+@@ -12,9 +12,8 @@
+ #include "syscfg.h"
+ #ifdef HAVE_LIBCERF
+ #include <complex.h>	/* C99 _Complex */
+-#include <cerf.h>	/* libcerf library header */
+-
+ #include "eval.h"
++#include <cerf.h>	/* libcerf library header */
+ #include "stdfn.h"	/* for not_a_number */
+ #include "util.h"	/* for int_error() */
+ #include "libcerf.h"	/* our own prototypes */