Changes 4.4.2: * FIX color specification "lc N" * FIX clipping error in filled curves * FIX segfault if "refresh" command follows an interrupted replot Changes 4.4.1: * NEW Support the "%s" format specifier in strftime() * NEW Optional 6th data column in candlesticks style to specific box width * NEW If integer arithmetic i*j or i**j would overflow, return value as a real * NEW "set style circle radius <default-radius>" * FIX autoconfiguration of readline support in OSX * FIX font problems in win terminal * FIX Protect against runaway recursion by limiting depth of nested functions * FIX metapost terminal: Fix inheritance of line thickness by text strings * FIX cairo terminals could segfault on certain enhanced text strings * FIX pdfcairo output to stdout now works * FIX font ",size" in non-enhanced mode postscript terminals * FIX Do a better job of estimating the width of UTF-8 encoded strings * FIX baseline bug in canvas terminal rotation of enhanced text * FIX Allow "with labels" to work for binary input data * FIX update user GPVAL variables after plot in table mode * CHANGE depth-sorting of pm3d surfaces now applies jointly to all in the plot * CHANGE 3D impulses are now always drawn from z=0 * CHANGE Enable HIDDEN_QUADTREE by default * CHANGE Enable "set fit errorvariables" by default * CHANGE Regardless of current timefmt, read time from binary files as a binary * CHANGE do not limit 3D rotation to 0<rotx<180diff -r1.52 -r1.53 pkgsrc/graphics/gnuplot/Makefile
(adam)
@@ -1,13 +1,51 @@ | @@ -1,13 +1,51 @@ | |||
1 | # $NetBSD: Makefile,v 1.52 2011/01/13 13:38:05 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.53 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | CATEGORIES+= x11 | 3 | DISTNAME= gnuplot-4.4.2 | |
4 | PKGREVISION= 4 | 4 | CATEGORIES+= graphics | |
5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} | |||
6 | ||||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | |||
8 | HOMEPAGE= http://gnuplot.sourceforge.net/ | |||
9 | COMMENT= Portable interactive, function plotting utility | |||
5 | 10 | |||
6 | CONFLICTS+= gnuplot-nox11-[0-9]* | 11 | CONFLICTS+= gnuplot-nox11-[0-9]* | |
7 | 12 | |||
8 | .include "../../graphics/gnuplot/Makefile.common" | 13 | PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches | |
9 | .include "../../graphics/gnuplot/options.mk" | 14 | DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo | |
15 | ||||
16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | |||
18 | ||||
19 | USE_TOOLS+= makeinfo pkg-config | |||
20 | GNU_CONFIGURE= yes | |||
21 | #CONFIGURE_ARGS+= --enable-history-file | |||
22 | CONFIGURE_ARGS+= --with-plot=${PREFIX} | |||
23 | CONFIGURE_ARGS+= --without-latex | |||
24 | CONFIGURE_ARGS+= --without-lisp-files | |||
25 | CONFIGURE_ARGS+= --without-tutorial | |||
26 | INFO_FILES= yes | |||
27 | ||||
28 | # Use BSD editline wherever possible: | |||
29 | .include "../../mk/bsd.prefs.mk" | |||
30 | ||||
31 | .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" | |||
32 | CONFIGURE_ARGS+= --with-readline=bsd | |||
33 | .include "../../mk/curses.buildlink3.mk" | |||
34 | .else | |||
35 | CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} | |||
36 | .include "../../devel/readline/buildlink3.mk" | |||
37 | .endif | |||
38 | ||||
39 | # Make this available to patch-ah so the font path can include pkgsrc fonts. | |||
40 | SUBST_CLASSES+= fontpath | |||
41 | SUBST_STAGE.fontpath= pre-configure | |||
42 | SUBST_MESSAGE.fontpath= Fixing font path. | |||
43 | SUBST_FILES.fontpath= src/variable.c | |||
44 | SUBST_SED.fontpath= -e 's,@PKGSRC_PREFIX@,"${PREFIX}",' | |||
45 | ||||
46 | .include "options.mk" | |||
10 | 47 | |||
48 | .include "../../devel/pango/buildlink3.mk" | |||
49 | .include "../../graphics/cairo/buildlink3.mk" | |||
11 | .include "../../graphics/plotutils/buildlink3.mk" | 50 | .include "../../graphics/plotutils/buildlink3.mk" | |
12 | .include "../../x11/libXaw/buildlink3.mk" | |||
13 | .include "../../mk/bsd.pkg.mk" | 51 | .include "../../mk/bsd.pkg.mk" |
@@ -1,17 +1,32 @@ | @@ -1,17 +1,32 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.12 2009/06/14 17:59:15 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.13 2011/02/08 13:13:41 adam Exp $ | |
2 | bin/gnuplot | 2 | bin/gnuplot | |
3 | info/gnuplot.info | 3 | info/gnuplot.info | |
4 | lib/X11/app-defaults/Gnuplot | 4 | ${PLIST.x11}libexec/gnuplot/4.4/gnuplot_x11 | |
5 | libexec/gnuplot/4.2/gnuplot_x11 | |||
6 | man/man1/gnuplot.1 | 5 | man/man1/gnuplot.1 | |
7 | share/gnuplot/4.2/PostScript/8859-1.ps | 6 | share/gnuplot/4.4/PostScript/8859-1.ps | |
8 | share/gnuplot/4.2/PostScript/8859-15.ps | 7 | share/gnuplot/4.4/PostScript/8859-15.ps | |
9 | share/gnuplot/4.2/PostScript/8859-2.ps | 8 | share/gnuplot/4.4/PostScript/8859-2.ps | |
10 | share/gnuplot/4.2/PostScript/cp1250.ps | 9 | share/gnuplot/4.4/PostScript/8859-9.ps | |
11 | share/gnuplot/4.2/PostScript/cp437.ps | 10 | share/gnuplot/4.4/PostScript/aglfn.txt | |
12 | share/gnuplot/4.2/PostScript/cp850.ps | 11 | share/gnuplot/4.4/PostScript/cp1250.ps | |
13 | share/gnuplot/4.2/PostScript/cp852.ps | 12 | share/gnuplot/4.4/PostScript/cp437.ps | |
14 | share/gnuplot/4.2/PostScript/koi8r.ps | 13 | share/gnuplot/4.4/PostScript/cp850.ps | |
15 | share/gnuplot/4.2/PostScript/koi8u.ps | 14 | share/gnuplot/4.4/PostScript/cp852.ps | |
16 | share/gnuplot/4.2/PostScript/prologue.ps | 15 | share/gnuplot/4.4/PostScript/koi8r.ps | |
17 | share/gnuplot/4.2/gnuplot.gih | 16 | share/gnuplot/4.4/PostScript/koi8u.ps | |
17 | share/gnuplot/4.4/PostScript/prologue.ps | |||
18 | share/gnuplot/4.4/PostScript/utf-8.ps | |||
19 | ${PLIST.x11}share/gnuplot/4.4/app-defaults/Gnuplot | |||
20 | share/gnuplot/4.4/gnuplot.gih | |||
21 | share/gnuplot/4.4/js/README | |||
22 | share/gnuplot/4.4/js/canvasmath.js | |||
23 | share/gnuplot/4.4/js/canvastext.js | |||
24 | share/gnuplot/4.4/js/gnuplot_common.js | |||
25 | share/gnuplot/4.4/js/gnuplot_mouse.css | |||
26 | share/gnuplot/4.4/js/gnuplot_mouse.js | |||
27 | share/gnuplot/4.4/js/grid.png | |||
28 | share/gnuplot/4.4/js/help.png | |||
29 | share/gnuplot/4.4/js/nextzoom.png | |||
30 | share/gnuplot/4.4/js/previouszoom.png | |||
31 | share/gnuplot/4.4/js/textzoom.png | |||
32 | share/gnuplot/4.4/lua/gnuplot-tikz.lua |
@@ -1,13 +1,12 @@ | @@ -1,13 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2011/01/06 07:03:55 dholland Exp $ | 1 | $NetBSD: distinfo,v 1.16 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (gnuplot-4.2.6.tar.gz) = d11fdde8218bee98597ee836cbc17e4bf6093b70 | 3 | SHA1 (gnuplot-4.4.2.tar.gz) = 35666be22e877ade5e272199d3d81555c141cef5 | |
4 | RMD160 (gnuplot-4.2.6.tar.gz) = 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 | 4 | RMD160 (gnuplot-4.4.2.tar.gz) = 077d6d353e0370d1f8463693380030722f5789af | |
5 | Size (gnuplot-4.2.6.tar.gz) = 2936753 bytes | 5 | Size (gnuplot-4.4.2.tar.gz) = 3299690 bytes | |
6 | SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92 | 6 | SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92 | |
7 | SHA1 (patch-ab) = f64716b79fbdab9b85fb7df89c9c24a6db313d26 | |||
8 | SHA1 (patch-ac) = 36bbe7654e581d7323dfe2a0c358c0f99aae2c6f | 7 | SHA1 (patch-ac) = 36bbe7654e581d7323dfe2a0c358c0f99aae2c6f | |
9 | SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413 | 8 | SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413 | |
10 | SHA1 (patch-ae) = 622630495587a963fe713ca18d871b5b51aafadc | 9 | SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048 | |
11 | SHA1 (patch-af) = 02a661965a9af633f9a4dc6ef74f8ad312610362 | 10 | SHA1 (patch-af) = b6c7dafd61efcee89cc1323202bf76df7ee20936 | |
12 | SHA1 (patch-ag) = 22354c38ac2a8a85c804c269bbfa8da03ae55708 | 11 | SHA1 (patch-ag) = 8c1f4a4a94cf136d94b0019954453553c17be7b2 | |
13 | SHA1 (patch-ah) = 43303314778c4e921e9f9457c34e564acfcd1e69 | 12 | SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765 |
@@ -1,16 +1,25 @@ | @@ -1,16 +1,25 @@ | |||
1 | # $NetBSD: options.mk,v 1.1 2010/02/19 14:09:58 asau Exp $ | 1 | # $NetBSD: options.mk,v 1.2 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot | |
4 | PKG_SUPPORTED_OPTIONS= gd pdf | 4 | PKG_SUPPORTED_OPTIONS= gd pdf x11 | |
5 | PKG_SUGGESTED_OPTIONS= gd pdf | 5 | PKG_SUGGESTED_OPTIONS= gd pdf x11 | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | .if !empty(PKG_OPTIONS:Mpdf) | 9 | PLIST_VARS+= x11 | |
10 | CONFIGURE_ARGS+= --with-pdf | |||
11 | .include "../../print/pdflib/buildlink3.mk" | |||
12 | .endif | |||
13 | 10 | |||
14 | .if !empty(PKG_OPTIONS:Mgd) | 11 | .if !empty(PKG_OPTIONS:Mgd) | |
15 | .include "../../graphics/gd/buildlink3.mk" | 12 | .include "../../graphics/gd/buildlink3.mk" | |
16 | .endif | 13 | .endif | |
14 | ||||
15 | .if !empty(PKG_OPTIONS:Mpdf) | |||
16 | CONFIGURE_ARGS+= --with-pdf | |||
17 | .include "../../print/pdflib-lite/buildlink3.mk" | |||
18 | .endif | |||
19 | ||||
20 | .if !empty(PKG_OPTIONS:Mx11) | |||
21 | PLIST.x11= yes | |||
22 | .include "../../x11/libXaw/buildlink3.mk" | |||
23 | .else | |||
24 | CONFIGURE_ARGS+= --without-x | |||
25 | .endif |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-ae,v 1.1 2009/09/14 18:52:03 asau Exp $ | 1 | $NetBSD: patch-ae,v 1.2 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | NetBSD editline keeps header files in "readline", not "editline". | 3 | NetBSD editline keeps header files in "readline", not "editline". | |
4 | Same applies to DragonFly. | 4 | Same applies to DragonFly. | |
5 | 5 | |||
6 | --- src/plot.c.orig 2008-12-15 07:18:36.000000000 +0300 | 6 | --- src/plot.c.orig 2008-12-15 07:18:36.000000000 +0300 | |
7 | +++ src/plot.c 2009-09-14 17:22:09.000000000 +0400 | 7 | +++ src/plot.c 2009-09-14 17:22:09.000000000 +0400 | |
8 | @@ -120,7 +120,7 @@ | 8 | @@ -118,7 +118,7 @@ | |
9 | /* BSD editline | 9 | /* BSD editline | |
10 | */ | 10 | */ | |
11 | #ifdef HAVE_LIBEDITLINE | 11 | #ifdef HAVE_LIBEDITLINE | |
12 | -# include <editline/readline.h> | 12 | -# include <editline/readline.h> | |
13 | +# include <readline/readline.h> | 13 | +# include <readline/readline.h> | |
14 | #endif | 14 | #endif | |
15 | 15 | |||
16 | /* enable gnuplot history with readline */ | 16 | /* enable gnuplot history with readline */ |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-af,v 1.1 2009/09/14 18:52:03 asau Exp $ | 1 | $NetBSD: patch-af,v 1.2 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | NetBSD editline keeps header files in "readline", not "editline". | 3 | NetBSD editline keeps header files in "readline", not "editline". | |
4 | Same applies to DragonFly. | 4 | Same applies to DragonFly. | |
5 | 5 | |||
6 | --- configure.in.orig 2009-03-15 06:39:15.000000000 +0300 | 6 | --- configure.in.orig 2009-03-15 06:39:15.000000000 +0300 | |
7 | +++ configure.in 2009-09-14 17:35:06.000000000 +0400 | 7 | +++ configure.in 2009-09-14 17:35:06.000000000 +0400 | |
8 | @@ -305,7 +305,7 @@ | 8 | @@ -339,7 +339,7 @@ | |
9 | if test "$ac_cv_lib_edit_readline" = yes; then | 9 | if test "$ac_cv_lib_edit_readline" = yes; then | |
10 | AC_DEFINE(HAVE_LIBEDITLINE,1, | 10 | AC_DEFINE(HAVE_LIBEDITLINE,1, | |
11 | [ Define if you are using the BSD editline library. ]) | 11 | [ Define if you are using the BSD editline library. ]) | |
12 | - AC_CHECK_HEADERS(editline/readline.h,, | 12 | - AC_CHECK_HEADERS(editline/readline.h,, | |
13 | + AC_CHECK_HEADERS(readline/readline.h,, | 13 | + AC_CHECK_HEADERS(readline/readline.h,, | |
14 | AC_MSG_WARN([found BSD editline library but not readline.h please add path to readline.h to CPPFLAGS in Makefile])) | 14 | AC_MSG_WARN([found BSD editline library but not readline.h please add path to readline.h to CPPFLAGS in Makefile])) | |
15 | 15 | |||
16 | if test "$enable_history_file" = yes; then | 16 | if test "$enable_history_file" = yes; then |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-ah,v 1.1 2011/01/06 07:03:55 dholland Exp $ | 1 | $NetBSD: patch-ah,v 1.2 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | Add NetBSD native X and pkgsrc modular X directories to the candidate | 3 | Add NetBSD native X and pkgsrc modular X directories to the candidate | |
4 | font path list. | 4 | font path list. | |
5 | 5 | |||
6 | --- src/variable.c.orig 2008-12-15 04:18:36.000000000 +0000 | 6 | --- src/variable.c.orig 2008-12-15 04:18:36.000000000 +0000 | |
7 | +++ src/variable.c | 7 | +++ src/variable.c | |
8 | @@ -262,6 +262,12 @@ static const struct path_table fontpath_ | 8 | @@ -275,6 +275,12 @@ static const struct path_table fontpath_ | |
9 | { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" }, | 9 | { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" }, | |
10 | { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, | 10 | { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, | |
11 | #endif | 11 | #endif | |
12 | + /* NetBSD pkgsrc X.org */ | 12 | + /* NetBSD pkgsrc X.org */ | |
13 | + { PKGSRC_PREFIX "/lib/X11/fonts/Type1" }, | 13 | + { @PKGSRC_PREFIX@ "/lib/X11/fonts/Type1" }, | |
14 | + { PKGSRC_PREFIX "/lib/X11/fonts/truetype" }, | 14 | + { @PKGSRC_PREFIX@ "/lib/X11/fonts/truetype" }, | |
15 | + /* NetBSD native X.org */ | 15 | + /* NetBSD native X.org */ | |
16 | + { "/usr/X11R7/lib/X11/fonts/Type1" }, | 16 | + { "/usr/X11R7/lib/X11/fonts/Type1" }, | |
17 | + { "/usr/X11R7/lib/X11/fonts/truetype" }, | 17 | + { "/usr/X11R7/lib/X11/fonts/truetype" }, | |
18 | /* Linux paths */ | 18 | /* Linux paths */ | |
19 | { "/usr/X11R6/lib/X11/fonts/Type1" }, | 19 | { "/usr/X11R6/lib/X11/fonts/Type1" }, | |
20 | { "/usr/X11R6/lib/X11/fonts/truetype" }, | 20 | { "/usr/X11R6/lib/X11/fonts/truetype" }, |
@@ -1,16 +1,65 @@ | @@ -1,16 +1,65 @@ | |||
1 | $NetBSD: patch-ag,v 1.2 2009/10/27 20:48:07 asau Exp $ | 1 | $NetBSD: patch-ag,v 1.3 2011/02/08 13:13:41 adam Exp $ | |
2 | 2 | |||
3 | NetBSD editline keeps header files in "readline", not "editline". | 3 | NetBSD editline keeps header files in "readline", not "editline". | |
4 | Same applies to DragonFly. | 4 | Same applies to DragonFly. | |
5 | 5 | |||
6 | --- configure.orig 2009-10-27 23:40:36.000000000 +0300 | 6 | --- configure.orig 2010-09-23 04:22:39.000000000 +0000 | |
7 | +++ configure 2009-10-27 23:42:16.000000000 +0300 | 7 | +++ configure | |
8 | @@ -9584,7 +9584,7 @@ | 8 | @@ -7119,9 +7119,9 @@ fi | |
9 | _ACEOF | |||
10 | 9 | |||
10 | $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h | |||
11 | 11 | |||
12 | -for ac_header in editline/readline.h | 12 | - for ac_header in editline/readline.h | |
13 | +for ac_header in readline/readline.h | 13 | + for ac_header in readline/readline.h | |
14 | do | 14 | do : | |
15 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 15 | - ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" | |
16 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | 16 | + ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" | |
17 | if test "x$ac_cv_header_editline_readline_h" = x""yes; then : | |||
18 | cat >>confdefs.h <<_ACEOF | |||
19 | #define HAVE_EDITLINE_READLINE_H 1 | |||
20 | @@ -7381,7 +7381,7 @@ _ACEOF | |||
21 | ||||
22 | fi | |||
23 | ||||
24 | - if test "$ac_cv_lib_readline_rl_ding" == no; then | |||
25 | + if test "$ac_cv_lib_readline_rl_ding" = no; then | |||
26 | ||||
27 | $as_echo "#define MISSING_RL_DING 1" >>confdefs.h | |||
28 | ||||
29 | @@ -7431,7 +7431,7 @@ _ACEOF | |||
30 | ||||
31 | fi | |||
32 | ||||
33 | - if test "$ac_cv_lib_readline_rl_forced_update_display" == no; then | |||
34 | + if test "$ac_cv_lib_readline_rl_forced_update_display" = no; then | |||
35 | ||||
36 | $as_echo "#define MISSING_RL_FORCED_UPDATE_DISPLAY 1" >>confdefs.h | |||
37 | ||||
38 | @@ -7481,7 +7481,7 @@ _ACEOF | |||
39 | ||||
40 | fi | |||
41 | ||||
42 | - if test "$ac_cv_lib_readline_rl_reset_after_signal" == yes; then | |||
43 | + if test "$ac_cv_lib_readline_rl_reset_after_signal" = yes; then | |||
44 | ||||
45 | $as_echo "#define HAVE_READLINE_RESET 1" >>confdefs.h | |||
46 | ||||
47 | @@ -7533,7 +7533,7 @@ _ACEOF | |||
48 | ||||
49 | fi | |||
50 | ||||
51 | - if test "$ac_cv_lib_readline_rl_complete_with_tilde_expansion" == no; then | |||
52 | + if test "$ac_cv_lib_readline_rl_complete_with_tilde_expansion" = no; then | |||
53 | ||||
54 | $as_echo "#define MISSING_RL_TILDE_EXPANSION 1" >>confdefs.h | |||
55 | ||||
56 | @@ -7662,7 +7662,9 @@ else | |||
57 | if test -d $withval/lib; then | |||
58 | LDFLAGS="$LDFLAGS -L$withval/lib" | |||
59 | fi | |||
60 | + if test "x$with_x" = xyes; then | |||
61 | TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11" | |||
62 | + fi | |||
63 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pl_textangle in -lplot" >&5 | |||
64 | $as_echo_n "checking for pl_textangle in -lplot... " >&6; } | |||
65 | if test "${ac_cv_lib_plot_pl_textangle+set}" = set; then : |