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<180

5 files changed, 67 insertions, 50 deletions

diff --git a/graphics/gnuplot/patches/patch-ab b/graphics/gnuplot/patches/patch-ab
deleted file mode 100644
index 3a73d0a4f22..00000000000
--- a/graphics/gnuplot/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2009/09/14 18:52:03 asau Exp $
-
---- share/Makefile.in.orig	2009-03-29 00:24:51.000000000 +0300
-+++ share/Makefile.in	2009-09-14 16:20:30.000000000 +0400
-@@ -193,7 +193,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign 1.2h
- EXTRA_DIST = Gnuplot.app-defaults
--SUBDIRS = LaTeX
-+SUBDIRS =
- appdefaultdir = $(libdir)/X11/app-defaults
- APPDEFAULTFILES = Gnuplot
- appdefault_DATA = $(APPDEFAULTFILES)
-@@ -232,13 +232,15 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-appdefaultDATA: $(appdefault_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(appdefaultdir)" || $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
--	@list='$(appdefault_DATA)'; for p in $$list; do \
-+	if test $${INSTALL_XRESOURCE_DATA:-yes} = yes; then \
-+	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"; \
-+	list='$(appdefault_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
- 	  echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
- 	  $(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
--	done
-+	done; \
-+	fi
- 
- uninstall-appdefaultDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/gnuplot/patches/patch-ae b/graphics/gnuplot/patches/patch-ae
index 1eb759cdff0..d360ff90b8b 100644
--- a/graphics/gnuplot/patches/patch-ae
+++ b/graphics/gnuplot/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2009/09/14 18:52:03 asau Exp $
+$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
-@@ -120,7 +120,7 @@
+@@ -118,7 +118,7 @@
  /* BSD editline
  */
  #ifdef HAVE_LIBEDITLINE
diff --git a/graphics/gnuplot/patches/patch-af b/graphics/gnuplot/patches/patch-af
index db632d2f504..63b59181c72 100644
--- a/graphics/gnuplot/patches/patch-af
+++ b/graphics/gnuplot/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.1 2009/09/14 18:52:03 asau Exp $
+$NetBSD: patch-af,v 1.2 2011/02/08 13:13:41 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
-@@ -305,7 +305,7 @@
+@@ -339,7 +339,7 @@
        if test "$ac_cv_lib_edit_readline" = yes; then
          AC_DEFINE(HAVE_LIBEDITLINE,1,
                  [ Define if you are using the BSD editline library. ])
diff --git a/graphics/gnuplot/patches/patch-ag b/graphics/gnuplot/patches/patch-ag
index 475d2d40088..067454fbbbc 100644
--- a/graphics/gnuplot/patches/patch-ag
+++ b/graphics/gnuplot/patches/patch-ag
@@ -1,16 +1,65 @@
-$NetBSD: patch-ag,v 1.2 2009/10/27 20:48:07 asau Exp $
+$NetBSD: patch-ag,v 1.3 2011/02/08 13:13:41 adam Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- configure.orig	2009-10-27 23:40:36.000000000 +0300
-+++ configure	2009-10-27 23:42:16.000000000 +0300
-@@ -9584,7 +9584,7 @@
- _ACEOF
+--- configure.orig	2010-09-23 04:22:39.000000000 +0000
++++ configure
+@@ -7119,9 +7119,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
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-        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" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_EDITLINE_READLINE_H 1
+@@ -7381,7 +7381,7 @@ _ACEOF
+ 
+ fi
+ 
+-    if test "$ac_cv_lib_readline_rl_ding" == no; then
++    if test "$ac_cv_lib_readline_rl_ding" = no; then
+ 
+ $as_echo "#define MISSING_RL_DING 1" >>confdefs.h
+ 
+@@ -7431,7 +7431,7 @@ _ACEOF
+ 
+ fi
+ 
+-    if test "$ac_cv_lib_readline_rl_forced_update_display" == no; then
++    if test "$ac_cv_lib_readline_rl_forced_update_display" = no; then
+ 
+ $as_echo "#define MISSING_RL_FORCED_UPDATE_DISPLAY 1" >>confdefs.h
+ 
+@@ -7481,7 +7481,7 @@ _ACEOF
+ 
+ fi
+ 
+-    if test "$ac_cv_lib_readline_rl_reset_after_signal" == yes; then
++    if test "$ac_cv_lib_readline_rl_reset_after_signal" = yes; then
+ 
+ $as_echo "#define HAVE_READLINE_RESET 1" >>confdefs.h
+ 
+@@ -7533,7 +7533,7 @@ _ACEOF
+ 
+ fi
+ 
+-    if test "$ac_cv_lib_readline_rl_complete_with_tilde_expansion" == no; then
++    if test "$ac_cv_lib_readline_rl_complete_with_tilde_expansion" = no; then
+ 
+ $as_echo "#define MISSING_RL_TILDE_EXPANSION 1" >>confdefs.h
+ 
+@@ -7662,7 +7662,9 @@ else
+ 	 if test -d $withval/lib; then
+ 	   LDFLAGS="$LDFLAGS -L$withval/lib"
+ 	 fi
++	if test "x$with_x" = xyes; then
+ 	 TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11"
++	fi
+ 	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pl_textangle in -lplot" >&5
+ $as_echo_n "checking for pl_textangle in -lplot... " >&6; }
+ if test "${ac_cv_lib_plot_pl_textangle+set}" = set; then :
diff --git a/graphics/gnuplot/patches/patch-ah b/graphics/gnuplot/patches/patch-ah
index 68417f31509..7b091293bdc 100644
--- a/graphics/gnuplot/patches/patch-ah
+++ b/graphics/gnuplot/patches/patch-ah
@@ -1,17 +1,17 @@
-$NetBSD: patch-ah,v 1.1 2011/01/06 07:03:55 dholland Exp $
+$NetBSD: patch-ah,v 1.2 2011/02/08 13:13:41 adam Exp $
 
 Add NetBSD native X and pkgsrc modular X directories to the candidate
 font path list.
 
 --- src/variable.c.orig	2008-12-15 04:18:36.000000000 +0000
 +++ src/variable.c
-@@ -262,6 +262,12 @@ static const struct path_table fontpath_
+@@ -275,6 +275,12 @@ 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" },
++    { @PKGSRC_PREFIX@ "/lib/X11/fonts/Type1" },
++    { @PKGSRC_PREFIX@ "/lib/X11/fonts/truetype" },
 +    /* NetBSD native X.org */
 +    { "/usr/X11R7/lib/X11/fonts/Type1" },
 +    { "/usr/X11R7/lib/X11/fonts/truetype" },