diff options
| -rw-r--r-- | graphics/gnuplot/Makefile | 5 | ||||
| -rw-r--r-- | graphics/gnuplot/distinfo | 11 | ||||
| -rw-r--r-- | graphics/gnuplot/options.mk | 3 | ||||
| -rw-r--r-- | graphics/gnuplot/patches/patch-src_command.c | 16 |
4 files changed, 9 insertions, 26 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 8d92bb01e5e..b12ccb4caa2 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.121 2018/04/29 05:46:37 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2018/07/07 11:59:05 adam Exp $ -DISTNAME= gnuplot-5.2.1 +DISTNAME= gnuplot-5.2.4 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= 5 #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 45c616e3066..7cf0b835c7d 100644 --- a/graphics/gnuplot/distinfo +++ b/graphics/gnuplot/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.37 2017/11/03 15:00:10 adam Exp $ +$NetBSD: distinfo,v 1.38 2018/07/07 11:59:05 adam Exp $ -SHA1 (gnuplot-5.2.1.tar.gz) = 4e42e668fd0694c2bd475b0104a010eac64e268d -RMD160 (gnuplot-5.2.1.tar.gz) = 5df7dc77b507815cc3616000c30daa39d70dadaf -SHA512 (gnuplot-5.2.1.tar.gz) = e0ef984472ded7b77dbf2094782b18de717c67dcee8d1cc0576f996fcfe88a182f71fb7e1f7eacf2321fdb093250fcb95069512c48216027170f7cf95e7d5929 -Size (gnuplot-5.2.1.tar.gz) = 5295961 bytes +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 (patch-configure) = 0881a50206c9796a2f34b93b72f6cd6eae127a15 -SHA1 (patch-src_command.c) = 1ba4112b77256b72e18b43b0f769aec7869d3131 SHA1 (patch-src_gp__hist.h) = b1549572ba1bacad5ae76e7a5a6b632e693b74a7 SHA1 (patch-src_plot.c) = a91ef7ff92917c54e37f3cca765e92d9857a47a5 SHA1 (patch-src_readline.h) = ae138bb783a5a5e68f89850cdd861cc545399aaf diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk index 4b68b804a74..7058d534436 100644 --- a/graphics/gnuplot/options.mk +++ b/graphics/gnuplot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2017/11/03 15:00:10 adam Exp $ +# $NetBSD: options.mk,v 1.13 2018/07/07 11:59:05 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua pdf qt4 qt5 wxwidgets x11 @@ -66,6 +66,7 @@ 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" .else CONFIGURE_ARGS+= --with-qt=no .endif diff --git a/graphics/gnuplot/patches/patch-src_command.c b/graphics/gnuplot/patches/patch-src_command.c deleted file mode 100644 index bf5a38f91be..00000000000 --- a/graphics/gnuplot/patches/patch-src_command.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_command.c,v 1.3 2017/11/03 15:00:10 adam Exp $ - -Fix for some platforms where WEXITSTATUS gets undefined. - ---- src/command.c.orig 2017-11-03 14:50:58.000000000 +0000 -+++ src/command.c -@@ -3640,6 +3640,9 @@ do_system_func(const char *cmd, char **o - #if defined(_WIN32) && !defined(WEXITSTATUS) - #define WEXITSTATUS(error) (error) - #endif -+#if !defined(WEXITSTATUS) -+#include <sys/wait.h> -+#endif - - static int - report_error(int ierr) |