pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/gnuplot gnuplot: updated to 5.2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/b69eda366e29
branches: trunk
changeset: 371099:b69eda366e29
user: adam <adam%pkgsrc.org@localhost>
date: Fri Nov 03 15:00:10 2017 +0000
description:
gnuplot: updated to 5.2.1
Release 5.2.1
A few bug-fixes present in the distributed package for 5.2.1 are not yet
commited upstream because the repository is in the process of migration
from cvs to git.
* src/graphics.c (plot_betweencurves):
plot 'foo' with filledcurves below y=bar
would fail to identify "below" regions where the y value foo[x] at the
start or end of the region was exactly equal to bar.
* src/axis.c (gen_tics): `set log x; set xtics foo` would always place
the first axis tic at foo rather than at (foo / base^N) for suitable N.
* src/win/winmain.c (ConsolePutS, ConsolePutCh): Use standard file IO
instead of Console API to enable word-wrapping on Windows 10 and to
allow for redirection of stdout/stderr.
* term/post.trm: Raise the limit on number of relative moves before
a "stroke" so that a full circle as drawn by do_arc() does not glitch
due to insertion of a "stroke xx yy M" sequence that resets the
dot/dash pattern.
* src/plot2d.c (eval_plots): If the range for logscaled y axis is empty,
e.g. the plot holds a single point, auto-extend the range rather than
giving up with an error.
diffstat:
graphics/gnuplot/Makefile | 7 +-
graphics/gnuplot/PLIST | 10 ++--
graphics/gnuplot/distinfo | 22 +++++-----
graphics/gnuplot/options.mk | 20 +++++---
graphics/gnuplot/patches/patch-ac | 20 ---------
graphics/gnuplot/patches/patch-ad | 16 -------
graphics/gnuplot/patches/patch-ae | 16 -------
graphics/gnuplot/patches/patch-af | 16 -------
graphics/gnuplot/patches/patch-ag | 57 ---------------------------
graphics/gnuplot/patches/patch-ah | 23 ----------
graphics/gnuplot/patches/patch-configure | 57 +++++++++++++++++++++++++++
graphics/gnuplot/patches/patch-src_command.c | 16 +++++++
graphics/gnuplot/patches/patch-src_gp__hist.h | 20 +++++++++
graphics/gnuplot/patches/patch-src_plot.c | 16 +++++++
graphics/gnuplot/patches/patch-src_readline.h | 16 +++++++
graphics/gnuplot/patches/patch-src_variable.c | 23 ++++++++++
16 files changed, 180 insertions(+), 175 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/Makefile
--- a/graphics/gnuplot/Makefile Fri Nov 03 14:44:46 2017 +0000
+++ b/graphics/gnuplot/Makefile Fri Nov 03 15:00:10 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2017/08/21 15:06:53 adam Exp $
+# $NetBSD: Makefile,v 1.116 2017/11/03 15:00:10 adam Exp $
-DISTNAME= gnuplot-5.0.7
-API_VERSION= ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
+DISTNAME= gnuplot-5.2.1
CATEGORIES+= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
@@ -10,6 +9,8 @@
COMMENT= Portable interactive, function plotting utility
#LICENSE= gnuplot + BSD
+API_VERSION= ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
+
CONFLICTS+= gnuplot-nox11-[0-9]*
USE_LANGUAGES= c
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/PLIST
--- a/graphics/gnuplot/PLIST Fri Nov 03 14:44:46 2017 +0000
+++ b/graphics/gnuplot/PLIST Fri Nov 03 15:00:10 2017 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.20 2015/10/25 10:13:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2017/11/03 15:00:10 adam Exp $
bin/gnuplot
-${PLIST.qt4}libexec/gnuplot/${API_VERSION}/gnuplot_qt
+${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
-man/man1/gnuplot-ja.1
share/gnuplot/${API_VERSION}/PostScript/8859-1.ps
share/gnuplot/${API_VERSION}/PostScript/8859-15.ps
share/gnuplot/${API_VERSION}/PostScript/8859-2.ps
@@ -41,5 +41,5 @@
share/gnuplot/${API_VERSION}/js/return.png
share/gnuplot/${API_VERSION}/js/textzoom.png
share/gnuplot/${API_VERSION}/lua/gnuplot-tikz.lua
-${PLIST.qt4}share/gnuplot/${API_VERSION}/qt/qtgnuplot_fr.qm
-${PLIST.qt4}share/gnuplot/${API_VERSION}/qt/qtgnuplot_ja.qm
+${PLIST.qt}share/gnuplot/${API_VERSION}/qt/qtgnuplot_fr.qm
+${PLIST.qt}share/gnuplot/${API_VERSION}/qt/qtgnuplot_ja.qm
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/distinfo
--- a/graphics/gnuplot/distinfo Fri Nov 03 14:44:46 2017 +0000
+++ b/graphics/gnuplot/distinfo Fri Nov 03 15:00:10 2017 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.36 2017/08/21 15:06:53 adam Exp $
+$NetBSD: distinfo,v 1.37 2017/11/03 15:00:10 adam Exp $
-SHA1 (gnuplot-5.0.7.tar.gz) = 6cdb03ebd096ef020f4653a1f4faf76ba9bce495
-RMD160 (gnuplot-5.0.7.tar.gz) = 9ef7cf8e4f3333af64ea68e82d62d77ea8cf0398
-SHA512 (gnuplot-5.0.7.tar.gz) = 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
-Size (gnuplot-5.0.7.tar.gz) = 5100186 bytes
-SHA1 (patch-ac) = ba7d48926faca78399fe10f44020364a244f87e0
-SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
-SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
-SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
-SHA1 (patch-ag) = 8729e8f56fa529575f29f08028c3168e2732fa87
-SHA1 (patch-ah) = f768abaddc7b326648e36f82b3edd2c9bead8b11
+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 (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
+SHA1 (patch-src_variable.c) = 90a9372c715791efe42bc019025aa61fb5ece80c
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/options.mk
--- a/graphics/gnuplot/options.mk Fri Nov 03 14:44:46 2017 +0000
+++ b/graphics/gnuplot/options.mk Fri Nov 03 15:00:10 2017 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.11 2015/10/28 19:03:17 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2017/11/03 15:00:10 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot
-PKG_SUPPORTED_OPTIONS= cairo cerf gd lua pdf gnuplot-pdf-doc x11 qt4 wxwidgets
+PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua pdf qt4 qt5 wxwidgets x11
PKG_SUGGESTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc x11
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gnuplot-pdf-doc x11 qt4
+PLIST_VARS+= gnuplot-pdf-doc qt x11
.if !empty(PKG_OPTIONS:Mcairo)
.include "../../devel/pango/buildlink3.mk"
@@ -57,19 +57,23 @@
.if !empty(PKG_OPTIONS:Mqt4)
USE_LANGUAGES+= c++
CONFIGURE_ARGS+= --with-qt=qt4
-PLIST.qt4= yes
+PLIST.qt= yes
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mqt5)
+USE_LANGUAGES+= c++11
+CONFIGURE_ARGS+= --with-qt=qt5
+PLIST.qt= yes
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
.else
CONFIGURE_ARGS+= --with-qt=no
.endif
.if !empty(PKG_OPTIONS:Mwxwidgets)
USE_LANGUAGES+= c++
-# force wxt terminal into single threaded mode to avoid crashes
-# c.f. http://sourceforge.net/p/gnuplot/mailman/message/31928881/
-CONFIGURE_ARGS+= --enable-wxwidgets --with-wx-single-threaded
-.include "../../x11/wxGTK28/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-wxwidgets
+.include "../../x11/wxGTK30/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-wxwidgets
.endif
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-ac
--- a/graphics/gnuplot/patches/patch-ac Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2014/03/25 23:19:19 asau Exp $
-
-NetBSD editline keeps header files in "readline", not "editline".
-Same applies to DragonFly.
-FreeBSD requires additional header file to get access to history.
-
---- src/gp_hist.h.orig 2011-02-21 07:56:57.000000000 +0000
-+++ src/gp_hist.h
-@@ -70,7 +70,10 @@ extern long int gnuplot_history_size;
- * (almost) compatible readline replacement
- */
- #if defined(HAVE_LIBEDITLINE)
--# include <editline/readline.h>
-+# if defined(__FreeBSD__)
-+# include <readline/history.h>
-+# endif
-+# include <readline/readline.h>
- #endif
-
- #if defined(READLINE) && !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDITLINE)
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-ad
--- a/graphics/gnuplot/patches/patch-ad Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/09/14 18:52:03 asau Exp $
-
-NetBSD editline keeps header files in "readline", not "editline".
-Same applies to DragonFly.
-
---- src/readline.h.orig 2008-12-15 07:18:36.000000000 +0300
-+++ src/readline.h 2009-09-14 17:16:14.000000000 +0400
-@@ -51,7 +51,7 @@
- # include <readline/readline.h>
- #endif
- #if defined(HAVE_LIBEDITLINE)
--# include <editline/readline.h>
-+# include <readline/readline.h>
- #endif
-
- #if defined(HAVE_LIBEDITLINE)
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-ae
--- a/graphics/gnuplot/patches/patch-ae Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/02/08 13:13:41 adam Exp $
-
-NetBSD editline keeps header files in "readline", not "editline".
-Same applies to DragonFly.
-
---- src/plot.c.orig 2008-12-15 07:18:36.000000000 +0300
-+++ src/plot.c 2009-09-14 17:22:09.000000000 +0400
-@@ -118,7 +118,7 @@
- /* BSD editline
- */
- #ifdef HAVE_LIBEDITLINE
--# include <editline/readline.h>
-+# include <readline/readline.h>
- #endif
-
- /* enable gnuplot history with readline */
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-af
--- a/graphics/gnuplot/patches/patch-af Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.3 2011/03/14 08:06:53 adam Exp $
-
-NetBSD editline keeps header files in "readline", not "editline".
-Same applies to DragonFly.
-
---- configure.in.orig 2009-03-15 06:39:15.000000000 +0300
-+++ configure.in 2009-09-14 17:35:06.000000000 +0400
-@@ -352,7 +352,7 @@
- if test "$ac_cv_lib_edit_readline" = yes; then
- AC_DEFINE(HAVE_LIBEDITLINE,1,
- [ Define if you are using the BSD editline library. ])
-- AC_CHECK_HEADERS(editline/readline.h,,
-+ AC_CHECK_HEADERS(readline/readline.h,,
- AC_MSG_WARN([found BSD editline library but not readline.h please add path to readline.h to CPPFLAGS in Makefile]))
-
- if test "$enable_history_file" = yes; then
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-ag
--- a/graphics/gnuplot/patches/patch-ag Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2015/08/01 01:29:00 mef 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 2015-01-02 04:27:52.000000000 +0900
-+++ configure 2015-03-01 21:42:48.000000000 +0900
-@@ -8861,7 +8861,7 @@ $as_echo "yes" >&6; }
-
- # Check whether --with-aquaterm was given.
- if test "${with_aquaterm+set}" = set; then :
-- withval=$with_aquaterm; if test "$withval" == yes; then
-+ withval=$with_aquaterm; if test "$withval" = yes; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm framework presence" >&5
- $as_echo_n "checking for AquaTerm framework presence... " >&6; }
-@@ -10164,9 +10164,9 @@ fi
-
- $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
-
-- for ac_header in editline/readline.h
-+ for ac_header in readline/readline.h
- do :
-- ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
-+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
- if test "x$ac_cv_header_editline_readline_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_EDITLINE_READLINE_H 1
-@@ -16239,7 +16241,7 @@ $as_echo " tek40xx, tek410x, texdraw,
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-
--if test "$with_bitmap_terminals" == yes; then
-+if test "$with_bitmap_terminals" = yes; then
- { $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
-@@ -16327,7 +16329,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; }
- else
-@@ -16335,7 +16337,7 @@ else
- $as_echo " gpic terminal: no (use --with-gpic 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; }
- else
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-ah
--- a/graphics/gnuplot/patches/patch-ah Fri Nov 03 14:44:46 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2014/06/01 16:58:21 wiz 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
-@@ -281,6 +281,15 @@ static const struct path_table fontpath_
- { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
- { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
- #endif
-+ /* NetBSD pkgsrc X.org */
-+ { @PKGSRC_PREFIX@ "/lib/X11/fonts/Type1" },
-+ { @PKGSRC_PREFIX@ "/lib/X11/fonts/truetype" },
-+ /* NetBSD pkgsrc default font path */
-+ { @PKGSRC_PREFIX@ "/share/fonts/X11/Type1" },
-+ { @PKGSRC_PREFIX@ "/share/fonts/X11/TTF" },
-+ /* NetBSD native X.org */
-+ { "/usr/X11R7/lib/X11/fonts/Type1" },
-+ { "/usr/X11R7/lib/X11/fonts/truetype" },
- /* Linux paths */
- { "/usr/X11R6/lib/X11/fonts/Type1" },
- { "/usr/X11R6/lib/X11/fonts/truetype" },
diff -r 01c24ab823cb -r b69eda366e29 graphics/gnuplot/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gnuplot/patches/patch-configure Fri Nov 03 15:00:10 2017 +0000
@@ -0,0 +1,57 @@
+$NetBSD: patch-configure,v 1.1 2017/11/03 15:00:10 adam Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
Home |
Main Index |
Thread Index |
Old Index