4 files changed, 45 insertions, 56 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 2d4af690d190..b1f60c9bd900 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnuplot
-PORTVERSION=	5.2.8
-PORTREVISION=	2
+PORTVERSION=	5.4.0
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 
@@ -88,9 +87,9 @@ post-build-DOCS-on:
 	@cd ${WRKSRC}/docs && ${MAKE} groff
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/5.2 ; \
+	${MKDIR} ${STAGEDIR}${DATADIR}/5.4 ; \
 		${INSTALL_DATA} ${WRKSRC}/share/gnuplotrc \
-		${STAGEDIR}${DATADIR}/5.2/gnuplotrc.sample
+		${STAGEDIR}${DATADIR}/5.4/gnuplotrc.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -104,7 +103,7 @@ post-install-DOCS-on:
 
 .if defined(LITE)
 post-stage:
-	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} libexec/gnuplot/5.2 libexec/gnuplot
+	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} libexec/gnuplot/5.4 libexec/gnuplot
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index b5c55dad9a02..bf1ea5db7512 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575266871
-SHA256 (gnuplot-5.2.8.tar.gz) = 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37
-SIZE (gnuplot-5.2.8.tar.gz) = 5340677
+TIMESTAMP = 1595672042
+SHA256 (gnuplot-5.4.0.tar.gz) = eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47
+SIZE (gnuplot-5.4.0.tar.gz) = 5622595
diff --git a/math/gnuplot/files/patch-src-command.c b/math/gnuplot/files/patch-src-command.c
deleted file mode 100644
index 1f55428c3b1c..000000000000
--- a/math/gnuplot/files/patch-src-command.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/command.c.orig	2017-11-01 18:12:31.201708000 -0700
-+++ src/command.c	2017-11-01 18:13:03.695758000 -0700
-@@ -119,6 +119,7 @@
- 
- #ifndef _Windows
- # include "help.h"
-+# include <sys/wait.h>
- #endif /* _Windows */
- 
- #ifdef _Windows
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index aaf8ca10af58..8c60f6f882b6 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,40 +1,40 @@
 bin/gnuplot
-%%X11%%libexec/gnuplot/5.2/gnuplot_x11
-man/man1/gnuplot-ja.1.gz
+%%X11%%libexec/gnuplot/5.4/gnuplot_x11
 man/man1/gnuplot.1.gz
-%%DATADIR%%/5.2/PostScript/8859-1.ps
-%%DATADIR%%/5.2/PostScript/8859-15.ps
-%%DATADIR%%/5.2/PostScript/8859-2.ps
-%%DATADIR%%/5.2/PostScript/8859-9.ps
-%%DATADIR%%/5.2/PostScript/aglfn.txt
-%%DATADIR%%/5.2/PostScript/cp1250.ps
-%%DATADIR%%/5.2/PostScript/cp1251.ps
-%%DATADIR%%/5.2/PostScript/cp1252.ps
-%%DATADIR%%/5.2/PostScript/cp437.ps
-%%DATADIR%%/5.2/PostScript/cp850.ps
-%%DATADIR%%/5.2/PostScript/cp852.ps
-%%DATADIR%%/5.2/PostScript/koi8r.ps
-%%DATADIR%%/5.2/PostScript/koi8u.ps
-%%DATADIR%%/5.2/PostScript/prologue.ps
-%%DATADIR%%/5.2/PostScript/utf-8.ps
-%%X11%%%%DATADIR%%/5.2/app-defaults/Gnuplot
-%%DATADIR%%/5.2/colors_default.gp
-%%DATADIR%%/5.2/colors_mono.gp
-%%DATADIR%%/5.2/colors_podo.gp
-%%DATADIR%%/5.2/gnuplot.gih
-@sample %%DATADIR%%/5.2/gnuplotrc.sample
-%%DATADIR%%/5.2/js/README
-%%DATADIR%%/5.2/js/canvasmath.js
-%%DATADIR%%/5.2/js/canvastext.js
-%%DATADIR%%/5.2/js/gnuplot_common.js
-%%DATADIR%%/5.2/js/gnuplot_dashedlines.js
-%%DATADIR%%/5.2/js/gnuplot_mouse.css
-%%DATADIR%%/5.2/js/gnuplot_mouse.js
-%%DATADIR%%/5.2/js/gnuplot_svg.js
-%%DATADIR%%/5.2/js/grid.png
-%%DATADIR%%/5.2/js/help.png
-%%DATADIR%%/5.2/js/nextzoom.png
-%%DATADIR%%/5.2/js/previouszoom.png
-%%DATADIR%%/5.2/js/return.png
-%%DATADIR%%/5.2/js/textzoom.png
-%%DATADIR%%/5.2/lua/gnuplot-tikz.lua
+%%DATADIR%%/5.4/PostScript/8859-1.ps
+%%DATADIR%%/5.4/PostScript/8859-15.ps
+%%DATADIR%%/5.4/PostScript/8859-2.ps
+%%DATADIR%%/5.4/PostScript/8859-9.ps
+%%DATADIR%%/5.4/PostScript/aglfn.txt
+%%DATADIR%%/5.4/PostScript/cp1250.ps
+%%DATADIR%%/5.4/PostScript/cp1251.ps
+%%DATADIR%%/5.4/PostScript/cp1252.ps
+%%DATADIR%%/5.4/PostScript/cp437.ps
+%%DATADIR%%/5.4/PostScript/cp850.ps
+%%DATADIR%%/5.4/PostScript/cp852.ps
+%%DATADIR%%/5.4/PostScript/koi8r.ps
+%%DATADIR%%/5.4/PostScript/koi8u.ps
+%%DATADIR%%/5.4/PostScript/prologue.ps
+%%DATADIR%%/5.4/PostScript/utf-8.ps
+%%X11%%%%DATADIR%%/5.4/app-defaults/Gnuplot
+%%DATADIR%%/5.4/colors_default.gp
+%%DATADIR%%/5.4/colors_mono.gp
+%%DATADIR%%/5.4/colors_podo.gp
+%%DATADIR%%/5.4/gnuplot.gih
+@sample %%DATADIR%%/5.4/gnuplotrc.sample
+%%DATADIR%%/5.4/js/README
+%%DATADIR%%/5.4/js/canvasmath.js
+%%DATADIR%%/5.4/js/canvastext.js
+%%DATADIR%%/5.4/js/gnuplot_common.js
+%%DATADIR%%/5.4/js/gnuplot_dashedlines.js
+%%DATADIR%%/5.4/js/gnuplot_mouse.css
+%%DATADIR%%/5.4/js/gnuplot_mouse.js
+%%DATADIR%%/5.4/js/gnuplot_svg.js
+%%DATADIR%%/5.4/js/gnuplot_svg_2018.js
+%%DATADIR%%/5.4/js/grid.png
+%%DATADIR%%/5.4/js/help.png
+%%DATADIR%%/5.4/js/nextzoom.png
+%%DATADIR%%/5.4/js/previouszoom.png
+%%DATADIR%%/5.4/js/return.png
+%%DATADIR%%/5.4/js/textzoom.png
+%%DATADIR%%/5.4/lua/gnuplot-tikz.lua