pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/gnuplot
Module Name: pkgsrc
Committed By: adam
Date: Fri Nov 3 15:00:10 UTC 2017
Modified Files:
pkgsrc/graphics/gnuplot: Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/graphics/gnuplot/patches: patch-configure patch-src_command.c
patch-src_gp__hist.h patch-src_plot.c patch-src_readline.h
patch-src_variable.c
Removed Files:
pkgsrc/graphics/gnuplot/patches: patch-ac patch-ad patch-ae patch-af
patch-ag patch-ah
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/graphics/gnuplot/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/gnuplot/PLIST
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/gnuplot/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/gnuplot/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/gnuplot/patches/patch-ac \
pkgsrc/graphics/gnuplot/patches/patch-af \
pkgsrc/graphics/gnuplot/patches/patch-ah
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/gnuplot/patches/patch-ad
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/gnuplot/patches/patch-ae
cvs rdiff -u -r1.8 -r0 pkgsrc/graphics/gnuplot/patches/patch-ag
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gnuplot/patches/patch-configure \
pkgsrc/graphics/gnuplot/patches/patch-src_gp__hist.h \
pkgsrc/graphics/gnuplot/patches/patch-src_plot.c \
pkgsrc/graphics/gnuplot/patches/patch-src_readline.h \
pkgsrc/graphics/gnuplot/patches/patch-src_variable.c
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/gnuplot/patches/patch-src_command.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.115 pkgsrc/graphics/gnuplot/Makefile:1.116
--- pkgsrc/graphics/gnuplot/Makefile:1.115 Mon Aug 21 15:06:53 2017
+++ pkgsrc/graphics/gnuplot/Makefile Fri Nov 3 15:00:10 2017
@@ -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 @@ HOMEPAGE= http://gnuplot.sourceforge.net
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
Index: pkgsrc/graphics/gnuplot/PLIST
diff -u pkgsrc/graphics/gnuplot/PLIST:1.20 pkgsrc/graphics/gnuplot/PLIST:1.21
--- pkgsrc/graphics/gnuplot/PLIST:1.20 Sun Oct 25 10:13:53 2015
+++ pkgsrc/graphics/gnuplot/PLIST Fri Nov 3 15:00:10 2017
@@ -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.1
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
share/gnuplot/${API_VERSION}/PostScript/8859-2.ps
@@ -41,5 +41,5 @@ share/gnuplot/${API_VERSION}/js/previous
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
Index: pkgsrc/graphics/gnuplot/distinfo
diff -u pkgsrc/graphics/gnuplot/distinfo:1.36 pkgsrc/graphics/gnuplot/distinfo:1.37
--- pkgsrc/graphics/gnuplot/distinfo:1.36 Mon Aug 21 15:06:53 2017
+++ pkgsrc/graphics/gnuplot/distinfo Fri Nov 3 15:00:10 2017
@@ -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
Index: pkgsrc/graphics/gnuplot/options.mk
diff -u pkgsrc/graphics/gnuplot/options.mk:1.11 pkgsrc/graphics/gnuplot/options.mk:1.12
--- pkgsrc/graphics/gnuplot/options.mk:1.11 Wed Oct 28 19:03:17 2015
+++ pkgsrc/graphics/gnuplot/options.mk Fri Nov 3 15:00:10 2017
@@ -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 @@ CONFIGURE_ARGS+= --without-x
.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
Added files:
Index: pkgsrc/graphics/gnuplot/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-configure:1.1
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-configure Fri Nov 3 15:00:10 2017
@@ -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".
+Same applies to DragonFly.
+
+Also get rid of a non-portable "test ... ==" instance.
+
+--- configure.orig 2017-10-15 02:45:26.000000000 +0000
++++ configure
+@@ -8891,7 +8891,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; }
+@@ -10189,9 +10189,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
+@@ -16679,7 +16679,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
+@@ -16756,7 +16756,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
+@@ -16764,7 +16764,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
Index: pkgsrc/graphics/gnuplot/patches/patch-src_gp__hist.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_gp__hist.h:1.1
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_gp__hist.h Fri Nov 3 15:00:10 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_gp__hist.h,v 1.1 2017/11/03 15:00:10 adam 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 2016-05-26 01:10:06.000000000 +0000
++++ src/gp_hist.h
+@@ -57,7 +57,10 @@ extern TBOOLEAN history_full;
+ /* NetBSD editline / WinEditLine
+ * (almost) compatible readline replacement
+ */
+-# include <editline/readline.h>
++# if defined(__FreeBSD__)
++# include <readline/history.h>
++# endif
++# include <readline/readline.h>
+
+
+ #elif defined(READLINE)
Index: pkgsrc/graphics/gnuplot/patches/patch-src_plot.c
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_plot.c:1.1
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_plot.c Fri Nov 3 15:00:10 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_plot.c,v 1.1 2017/11/03 15:00:10 adam Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/plot.c.orig 2017-06-02 01:43:38.000000000 +0000
++++ src/plot.c
+@@ -107,7 +107,7 @@ extern smg$create_key_table();
+ /* BSD editline
+ */
+ #ifdef HAVE_LIBEDITLINE
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+
+ /* enable gnuplot history with readline */
Index: pkgsrc/graphics/gnuplot/patches/patch-src_readline.h
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_readline.h:1.1
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_readline.h Fri Nov 3 15:00:10 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_readline.h,v 1.1 2017/11/03 15:00:10 adam Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/readline.h.orig 2016-05-26 01:10:06.000000000 +0000
++++ src/readline.h
+@@ -51,7 +51,7 @@
+ # include <readline/readline.h>
+
+ #elif defined(HAVE_LIBEDITLINE)
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+
+ #if defined(READLINE)
Index: pkgsrc/graphics/gnuplot/patches/patch-src_variable.c
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_variable.c:1.1
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_variable.c Fri Nov 3 15:00:10 2017
@@ -0,0 +1,23 @@
+$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 */
++ { @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" },
Index: pkgsrc/graphics/gnuplot/patches/patch-src_command.c
diff -u /dev/null pkgsrc/graphics/gnuplot/patches/patch-src_command.c:1.3
--- /dev/null Fri Nov 3 15:00:10 2017
+++ pkgsrc/graphics/gnuplot/patches/patch-src_command.c Fri Nov 3 15:00:10 2017
@@ -0,0 +1,16 @@
+$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)
Home |
Main Index |
Thread Index |
Old Index