diff --git a/gnuplot-4.6.0-demo.diff b/gnuplot-4.6.0-demo.diff
index 0a80ff8..3b11e5f 100644
--- a/gnuplot-4.6.0-demo.diff
+++ b/gnuplot-4.6.0-demo.diff
@@ -1,7 +1,6 @@
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-4.6.0.demo/demo/ellipse.dem
---- gnuplot-4.6.0/demo/ellipse.dem	2008-08-19 20:48:20.000000000 +0200
-+++ gnuplot-4.6.0.demo/demo/ellipse.dem	2012-03-15 12:05:53.781781358 +0100
-@@ -9,6 +9,7 @@
+--- demo/ellipse.dem
++++ demo/ellipse.dem	2012-03-15 11:05:54.000000000 +0000
+@@ -9,6 +9,7 @@ if ((GPVAL_VERSION == 4.3 || GPVAL_VERSI
      print "This copy of gnuplot was built without support for placing ellipses\n" ; \
      exit ;
  
@@ -9,7 +8,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-
  
  unset key
  set xrange [-8:8]
-@@ -27,7 +28,7 @@
+@@ -27,7 +28,7 @@ set object 1 ellipse center 1.5,1.0 size
  set obj 2 ellipse center 1.5, 1  size 6, 12  angle 20 front fs empty bo 3
  
  A = pi/9.
@@ -18,9 +17,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-
  
  pause -1 "Hit return to continue"
  
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.0.demo/demo/fit.dem
---- gnuplot-4.6.0/demo/fit.dem	2009-10-31 06:24:18.000000000 +0100
-+++ gnuplot-4.6.0.demo/demo/fit.dem	2012-03-15 12:05:53.781781358 +0100
+--- demo/fit.dem
++++ demo/fit.dem	2012-03-15 11:05:54.000000000 +0000
 @@ -5,9 +5,11 @@
  print "Some examples how data fitting using nonlinear least squares fit"
  print "can be done."
@@ -33,7 +31,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
  set title 'data for first fit demo'
  set xlabel "Temperature T  [deg Cels.]"
  set ylabel "Density [g/cm3]"
-@@ -162,7 +164,7 @@
+@@ -162,7 +164,7 @@ pause -1 "(-> return)"
  # Must provide an error estimate for a 3d fit. Use constant 1
  fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound.par'
  #create soundfit.par, reading from sound.par and updating values
@@ -42,7 +40,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
  print  ""
  pause -1 "(-> return)"
  set title 'pseudo-3d multi-branch fit to velocity data'
-@@ -251,6 +253,7 @@
+@@ -251,6 +253,7 @@ print ""
  pause -1 "Hit return to continue"
  
  reset
@@ -50,15 +48,14 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
  set xlabel 'x'
  set ylabel 'y'
  set zlabel 'z'
-@@ -340,3 +343,4 @@
+@@ -340,3 +343,4 @@ print  "from time to time!"
  print  ""
  pause -1 "Done with fitting demo  (-> return)"
  reset
 +set fit logfile logfile
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/poldat.dem gnuplot-4.6.0.demo/demo/poldat.dem
---- gnuplot-4.6.0/demo/poldat.dem	2010-11-19 00:59:58.000000000 +0100
-+++ gnuplot-4.6.0.demo/demo/poldat.dem	2012-03-15 12:05:53.782781367 +0100
-@@ -11,7 +11,7 @@
+--- demo/poldat.dem
++++ demo/poldat.dem	2012-03-15 11:05:54.000000000 +0000
+@@ -11,7 +11,7 @@ unset grid
  unset polar
  set title "Primitive Smith Chart"
  unset key
@@ -67,10 +64,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/poldat.dem gnuplot-4
  set para
  set rrange [-0 : 10]
  set trange [-pi : pi]
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4.6.0.demo/demo/random.dem
---- gnuplot-4.6.0/demo/random.dem	2011-12-28 23:00:37.000000000 +0100
-+++ gnuplot-4.6.0.demo/demo/random.dem	2012-03-15 12:08:48.975459282 +0100
-@@ -46,7 +46,8 @@
+--- demo/random.dem
++++ demo/random.dem	2012-03-15 11:08:49.000000000 +0000
+@@ -46,7 +46,8 @@ print "this case is zero, i.e. a circle.
  print ""
  nsamp = 50
  # Generate N random data points.
@@ -80,7 +76,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
  do for [i=1:nsamp] {
      print sprintf("%8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)))
  }
-@@ -73,7 +74,7 @@
+@@ -73,7 +74,7 @@ set vrange [-3:3]
  set ticslevel 0
  set isosamples 30
  splot u,v,( 1/(2*pi) * exp(-0.5 * (u**2 + v**2)) ) with line lc rgb "black", \
@@ -89,7 +85,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
  pause -1 "Hit return to continue"
  unset contour
  unset parametric
-@@ -96,7 +97,7 @@
+@@ -96,7 +97,7 @@ xlow = -3.0
  xhigh = 3.0
  scale = (binwidth/(xhigh-xlow))
  # Generate N random data points.
@@ -98,7 +94,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
  do for [i=1:nsamp] {
      print sprintf("%8.5g %8.5g", invnorm(rand(0)), (1.0*scale/nsamp))
  }
-@@ -110,7 +111,7 @@
+@@ -110,7 +111,7 @@ set grid
  set xrange [-3:3]
  set yrange [0:0.45]
  bin(x) = (1.0/scale)*floor(x*scale)
@@ -107,7 +103,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
                  title "scaled bin frequency", \
                  normal(x,0,1) with lines title "Gaussian p.d.f."
  pause -1 "Hit return to continue"
-@@ -126,7 +127,7 @@
+@@ -126,7 +127,7 @@ print ""
  reset
  nsamp = 3000
  # Generate N random data points.
@@ -116,7 +112,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
  do for [i=1:nsamp] {
      print sprintf("%8.5g %8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)), invnorm(rand(0)))
  }
-@@ -150,7 +151,7 @@
+@@ -150,7 +151,7 @@ set zzeroaxis lt -1
  set view 68, 28, 1.4, 0.9
  tstring(n) = sprintf("Gaussian 3D cloud of %d random samples\n", n)
  set title tstring(nsamp) offset graph 0.15, graph -0.33
@@ -125,7 +121,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
  if (!oneplot) pause -1 "Hit return to continue"
  
  unset parametric
-@@ -170,7 +171,7 @@
+@@ -170,7 +171,7 @@ scale = (binwidth/(xhigh-xlow))
  set xrange [0:xhigh]
  set yrange [0:0.65]
  bin(x) = (1.0/scale)*floor(x*scale)
@@ -134,9 +130,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
                  title "scaled bin frequency", \
                  maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f."
  #
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/simple.dem gnuplot-4.6.0.demo/demo/simple.dem
---- gnuplot-4.6.0/demo/simple.dem	2011-08-19 23:01:41.000000000 +0200
-+++ gnuplot-4.6.0.demo/demo/simple.dem	2012-03-15 12:05:53.782781367 +0100
+--- demo/simple.dem
++++ demo/simple.dem	2012-03-15 11:05:54.000000000 +0000
 @@ -7,12 +7,11 @@
  # gnuplot> load 'simple.dem'
  #
@@ -151,9 +146,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/simple.dem gnuplot-4
  plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
  pause -1 "Hit return to continue"
  
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplot-4.6.0.demo/demo/stringvar.dem
---- gnuplot-4.6.0/demo/stringvar.dem	2007-03-30 07:18:46.000000000 +0200
-+++ gnuplot-4.6.0.demo/demo/stringvar.dem	2012-03-15 12:05:53.782781367 +0100
+--- demo/stringvar.dem
++++ demo/stringvar.dem	2012-03-15 11:05:54.000000000 +0000
 @@ -1,7 +1,8 @@
  #
  # Miscellaneous neat things you can do using the string variables code
@@ -164,7 +158,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
  print ""
  print "Exercise substring handling"
  print ""
-@@ -24,7 +25,7 @@
+@@ -24,7 +25,7 @@ print "(foo.foo)[2:2]= ",(foo.foo)[2:2]
  print ""
  unset print
  
@@ -173,7 +167,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
  unset xtics
  unset ytics
  set yrange [0:1]
-@@ -33,7 +34,7 @@
+@@ -33,7 +34,7 @@ plot 0
  pause -1 "Hit return to continue"
  
  
@@ -182,7 +176,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
  print "Exercise string handling functions"
  print ""
  print "foo          = ",foo
-@@ -62,7 +63,7 @@
+@@ -62,7 +63,7 @@ if (strlen(foo) != 245) print "sprintf o
  print ""
  
  unset print
@@ -191,10 +185,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
  unset xtics
  unset ytics
  set yrange [0:1]
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4.6.0.demo/demo/vector.dem
---- gnuplot-4.6.0/demo/vector.dem	2009-10-31 06:24:18.000000000 +0100
-+++ gnuplot-4.6.0.demo/demo/vector.dem	2012-03-15 12:05:53.782781367 +0100
-@@ -62,19 +62,21 @@
+--- demo/vector.dem
++++ demo/vector.dem	2012-03-15 11:05:54.000000000 +0000
+@@ -62,19 +62,21 @@ splot vtot(x,y) w l
  print "Now create a file with equipotential lines"
  pause -1 "Hit return to continue"
  
@@ -219,7 +212,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4
  splot vtot(x,y) w l
  unset table
  pause 0
-@@ -84,8 +86,8 @@
+@@ -84,8 +86,8 @@ set xr [xmin:xmax]
  set yr [ymin:ymax]
  set isosam 31,31
  set key under Left reverse
@@ -230,10 +223,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4
  pause -1 "Hit return to continue"
  
  reset
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/show.c gnuplot-4.6.0.demo/src/show.c
---- gnuplot-4.6.0/src/show.c	2012-03-02 21:00:04.000000000 +0100
-+++ gnuplot-4.6.0.demo/src/show.c	2012-03-15 12:05:53.783781376 +0100
-@@ -1074,6 +1074,15 @@
+--- src/show.c
++++ src/show.c	2012-03-15 11:05:54.000000000 +0000
+@@ -1074,6 +1074,15 @@ show_version(FILE *fp)
  	    p 			/* type "help seeking-assistance" */
  	    );
  
@@ -249,10 +241,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/show.c gnuplot-4.6.0.
  
      /* show version long */
      if (almost_equals(c_token, "l$ong")) {
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.6.0.demo/src/variable.c
---- gnuplot-4.6.0/src/variable.c	2011-12-28 23:00:37.000000000 +0100
-+++ gnuplot-4.6.0.demo/src/variable.c	2012-03-15 12:05:53.783781376 +0100
-@@ -37,7 +37,10 @@
+--- src/variable.c
++++ src/variable.c	2012-03-15 11:05:54.000000000 +0000
+@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
  /* The Death of Global Variables - part one. */
  
  #include <string.h>
@@ -264,7 +255,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.
  #include "variable.h"
  
  #include "alloc.h"
-@@ -98,6 +101,17 @@
+@@ -98,6 +101,17 @@ loadpath_handler(int action, char *path)
  	if (!loadpath)
  	{
  	    char *envlib = getenv("GNUPLOT_LIB");
@@ -282,7 +273,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.
  	    if (envlib) {
  		int len = strlen(envlib);
  		loadpath = gp_strdup(envlib);
-@@ -106,6 +120,10 @@
+@@ -106,6 +120,10 @@ loadpath_handler(int action, char *path)
  		/* convert all PATHSEPs to \0 */
  		PATHSEP_TO_NUL(loadpath);
  	    }			/* else: NULL = empty */
diff --git a/gnuplot-4.6.0-fix-format-errors.dif b/gnuplot-4.6.0-fix-format-errors.diff
similarity index 72%
rename from gnuplot-4.6.0-fix-format-errors.dif
rename to gnuplot-4.6.0-fix-format-errors.diff
index 00bcb94..a957c14 100644
--- a/gnuplot-4.6.0-fix-format-errors.dif
+++ b/gnuplot-4.6.0-fix-format-errors.diff
@@ -1,7 +1,6 @@
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.6.0.formaterrors/src/gplt_x11.c
---- gnuplot-4.6.0/src/gplt_x11.c	2011-12-28 23:00:37.000000000 +0100
-+++ gnuplot-4.6.0.formaterrors/src/gplt_x11.c	2012-03-15 12:17:24.311767033 +0100
-@@ -2897,22 +2897,22 @@
+--- src/gplt_x11.c
++++ src/gplt_x11.c	2012-03-15 11:17:24.000000000 +0000
+@@ -2912,22 +2912,22 @@ exec_cmd(plot_struct *plot, char *comman
  
  		    case PseudoColor:
  			fprintf(stderr, ERROR_NOTICE("PseudoColor"));
diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff
index 39b08d1..d142c8e 100644
--- a/gnuplot-4.6.0-fonts.diff
+++ b/gnuplot-4.6.0-fonts.diff
@@ -1,7 +1,6 @@
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.6.0.fonts2/src/gplt_x11.c
---- gnuplot-4.6.0/src/gplt_x11.c	2011-12-28 23:00:37.000000000 +0100
-+++ gnuplot-4.6.0.fonts2/src/gplt_x11.c	2012-03-15 12:10:52.600531888 +0100
-@@ -104,15 +104,16 @@
+--- src/gplt_x11.c
++++ src/gplt_x11.c	2012-03-15 11:10:53.000000000 +0000
+@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id
   * patches by Masahito Yamaga <ma@yama-ga.com>
   */
  
@@ -21,7 +20,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  
  #include <assert.h>
  #include "syscfg.h"
-@@ -122,6 +123,12 @@
+@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id
  #include "gplt_x11.h"
  #include "version.h"
  
@@ -34,7 +33,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  #ifdef EXPORT_SELECTION
  # undef EXPORT_SELECTION
  #endif /* EXPORT SELECTION */
-@@ -482,7 +489,7 @@
+@@ -482,7 +489,7 @@ static double mouse_to_axis __PROTO((int
  static char *FallbackFont = "fixed";
  #ifdef USE_X11_MULTIBYTE
  static char *FallbackFontMB =
@@ -43,7 +42,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  # define FontSetSep ';'
  static int usemultibyte = 0;
  static int multibyte_fonts_usable=1;
-@@ -499,8 +506,8 @@
+@@ -499,8 +506,8 @@ static char *gpFallbackFont __PROTO((voi
  static int gpXGetFontascent __PROTO((XFontStruct *cfont));
  
  enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */
@@ -54,7 +53,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  
  #define Nwidths 10
  static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-@@ -2110,6 +2117,8 @@
+@@ -2116,6 +2123,8 @@ exec_cmd(plot_struct *plot, char *comman
  		/* Save the request default font */
  		c = &(buffer[strlen(buffer)-1]);
  		while (*c <= ' ') *c-- = '\0';
@@ -63,7 +62,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  		strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
  		FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
  		break;
-@@ -5389,7 +5398,7 @@
+@@ -5395,7 +5404,7 @@ XFontStruct *gpXLoadQueryFont (Display *
  	    }
  #else
  	    if (first_time) {
@@ -72,7 +71,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
  		first_time = FALSE;
  	    }
  	    while (n_miss-- > 0)
-@@ -5484,6 +5493,18 @@
+@@ -5490,6 +5499,18 @@ char *fontname;
      }
  
  #ifdef USE_X11_MULTIBYTE
@@ -91,10 +90,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/gplt_x11.c gnuplot-4.
      if (fontname && strncmp(fontname, "mbfont:", 7) == 0) {
  	if (multibyte_fonts_usable) {
  	    usemultibyte = 1;
-diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.6.0.fonts2/src/variable.c
---- gnuplot-4.6.0/src/variable.c	2011-12-28 23:00:37.000000000 +0100
-+++ gnuplot-4.6.0.fonts2/src/variable.c	2012-03-15 12:10:52.600531888 +0100
-@@ -282,6 +282,8 @@
+--- src/variable.c
++++ src/variable.c	2012-03-15 11:10:53.000000000 +0000
+@@ -282,6 +282,8 @@ static const struct path_table fontpath_
      { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
  #endif
      /* Linux paths */
diff --git a/gnuplot-4.5.0.dif b/gnuplot-4.6.0.dif
similarity index 68%
rename from gnuplot-4.5.0.dif
rename to gnuplot-4.6.0.dif
index 518101a..b6474fe 100644
--- a/gnuplot-4.5.0.dif
+++ b/gnuplot-4.6.0.dif
@@ -1,7 +1,6 @@
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/configure.in gnuplot-cvs.dif/configure.in
---- gnuplot-cvs/configure.in	2011-08-17 22:31:26.652066109 +0200
-+++ gnuplot-cvs.dif/configure.in	2011-08-17 22:44:53.104586854 +0200
-@@ -322,7 +322,7 @@
+--- configure.in
++++ configure.in	2011-08-17 20:44:53.000000000 +0000
+@@ -329,7 +329,7 @@ if test "$with_linux_vga" = yes; then
      [AC_DEFINE(LINUXVGA,1,
                 [ Define if this is a Linux system with SuperVGA library. ])
       LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
@@ -10,9 +9,8 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/configure.in gnuplot-cvs.dif/co
      with_linux_vga=no)
  fi
  
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.dif/docs/Makefile.in
---- gnuplot-cvs/docs/Makefile.in	2011-08-17 22:31:27.473061565 +0200
-+++ gnuplot-cvs.dif/docs/Makefile.in	2011-08-17 22:44:53.104586854 +0200
+--- docs/Makefile.in
++++ docs/Makefile.in	2012-04-02 14:22:57.386065105 +0000
 @@ -38,7 +38,7 @@
  #
  
@@ -22,7 +20,21 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.di
  
  # this tells GNU make not to export variables into the environment
  # But other makes dont understand its significance, so it must
-@@ -343,12 +343,16 @@
+@@ -242,10 +242,12 @@ html: htmldocs/gnuplot.html
+ # requires a working latex2html, which is hard to find these days
+ # htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
+ #	mkdir -p htmldocs
++#	ln -sf ../../VERSION htmldocs/
++#	ln -sf ../toc_entr.sty htmldocs/
+ #	latex2html -dir htmldocs -local_icons gnuplot
+ 
+ htmldocs/gnuplot.html: $(srcdir)/gnuplot.dvi
+-	rm -f VERSION; ln -s ../VERSION .
++	ln -sf ../VERSION .
+ 	htlatex gnuplot
+ 	mkdir -p htmldocs
+ 	mv gnuplot.html gnuplot.css gnuplot*.png gnuplot.log htmldocs/
+@@ -342,12 +344,16 @@ doc2hlp: doc2hlp.o termdoc.o
  	$(LINK) doc2hlp.o termdoc.o $(LIBS)
  
  ### gnuplot interactive help format
@@ -40,7 +52,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.di
  doc2gih: doc2gih.o termdoc.o
  	$(LINK) doc2gih.o termdoc.o $(LIBS)
  
-@@ -445,6 +449,7 @@
+@@ -444,6 +450,7 @@ install: install-gih install-info instal
  install-gih: gnuplot.gih
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
  	$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
@@ -48,7 +60,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.di
  
  install-pdf:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
-@@ -470,6 +475,7 @@
+@@ -469,6 +476,7 @@ uninstall: uninstall-gih uninstall-info
  
  uninstall-gih:
  	rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
@@ -56,10 +68,22 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/docs/Makefile.in gnuplot-cvs.di
  
  uninstall-pdf:
  	rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gadgets.h gnuplot-cvs.dif/src/gadgets.h
---- gnuplot-cvs/src/gadgets.h	2011-08-17 22:31:29.955047825 +0200
-+++ gnuplot-cvs.dif/src/gadgets.h	2011-08-17 22:44:53.111586814 +0200
-@@ -414,7 +414,7 @@
+--- docs/gnuplot-fr.doc
++++ docs/gnuplot-fr.doc	2009-05-09 11:32:24.000000000 +0000
+@@ -436,8 +436,8 @@ C
+ #Home      & same as \verb~^A~. \\
+ #Ctrl Home & same as \verb~^E~. \\
+ #Esc       & same as \verb~^U~. \\
+-#Help      & `{\bf help}' plus Entrée. \\
+-#Ctrl Help & `{\bf help }'. \\
++#Help      & `{\bf help}` plus Entrée. \\
++#Ctrl Help & `{\bf help }`. \\
+ %c l .
+ %Touche fléchée@Fonction
+ %_
+--- src/gadgets.h
++++ src/gadgets.h	2011-08-17 20:44:53.000000000 +0000
+@@ -424,7 +424,7 @@ extern TBOOLEAN	clip_lines1;
  extern TBOOLEAN	clip_lines2;
  extern TBOOLEAN	clip_points;
  
@@ -68,10 +92,9 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gadgets.h gnuplot-cvs.dif/s
  extern int samples_1;
  extern int samples_2;
  
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gplt_x11.c gnuplot-cvs.dif/src/gplt_x11.c
---- gnuplot-cvs/src/gplt_x11.c	2011-08-17 22:31:30.011047518 +0200
-+++ gnuplot-cvs.dif/src/gplt_x11.c	2011-08-17 22:44:53.113586802 +0200
-@@ -2237,8 +2237,11 @@
+--- src/gplt_x11.c
++++ src/gplt_x11.c	2011-08-17 20:44:53.000000000 +0000
+@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
  	}
      }
      /*   X11_justify_text(mode) - set text justification mode  */
@@ -85,10 +108,9 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/gplt_x11.c gnuplot-cvs.dif/
  
      else if (*buffer == 'A')
  	sscanf(buffer + 1, "%lf", &plot->angle);
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/plot.c
---- gnuplot-cvs/src/plot.c	2011-08-17 22:31:30.649043986 +0200
-+++ gnuplot-cvs.dif/src/plot.c	2011-08-17 22:44:53.114586796 +0200
-@@ -213,6 +213,7 @@
+--- src/plot.c
++++ src/plot.c	2011-08-17 20:44:53.000000000 +0000
+@@ -214,6 +214,7 @@ static int asked_privi = 0;
  void
  drop_privilege()
  {
@@ -96,7 +118,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/
      if (!asked_privi) {
  	euid = geteuid();
  	egid = getegid();
-@@ -226,11 +227,13 @@
+@@ -227,11 +228,13 @@ drop_privilege()
      if (seteuid(ruid) == -1)
  	(void) fprintf(stderr, "seteuid(%d): %s\n",
  		       (int) ruid, strerror(errno));
@@ -110,7 +132,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/
      if (!asked_privi) {
  	euid = geteuid();
  	egid = getegid();
-@@ -244,6 +247,7 @@
+@@ -245,6 +248,7 @@ take_privilege()
      if (seteuid(euid) == -1)
  	(void) fprintf(stderr, "seteuid(%d): %s\n",
  		       (int) euid, strerror(errno));
@@ -118,7 +140,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/
  }
  
  #endif /* LINUXVGA */
-@@ -269,8 +273,8 @@
+@@ -270,8 +274,8 @@ main(int argc, char **argv)
      int i;
  
  #ifdef LINUXVGA
@@ -128,7 +150,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/
  #endif
  /* make sure that we really have revoked root access, this might happen if
     gnuplot is compiled without vga support but is installed suid by mistake */
-@@ -331,6 +335,22 @@
+@@ -326,6 +330,22 @@ main(int argc, char **argv)
      rl_getc_function = getc_wrapper;
  #endif
  
@@ -151,10 +173,9 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/plot.c gnuplot-cvs.dif/src/
  #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
      /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
       * It is used to parse a 'gnuplot' specific section in '~/.inputrc' 
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/term.h gnuplot-cvs.dif/src/term.h
---- gnuplot-cvs/src/term.h	2011-08-17 22:31:31.431039658 +0200
-+++ gnuplot-cvs.dif/src/term.h	2011-08-17 22:44:53.115586790 +0200
-@@ -277,9 +277,9 @@
+--- src/term.h
++++ src/term.h	2011-08-17 20:44:53.000000000 +0000
+@@ -272,9 +272,9 @@
  #include "emf.trm"
  
  /* Roland DXY800A plotter */
@@ -166,7 +187,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/term.h gnuplot-cvs.dif/src/
  
  /* fig graphics */
  #include "fig.trm"
-@@ -312,7 +312,7 @@
+@@ -307,7 +307,7 @@
  #include "imagen.trm"
  
  /* Kyocera Prescribe printer */
@@ -175,7 +196,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/term.h gnuplot-cvs.dif/src/
  
  /* Frame Maker MIF 3.00 format driver */
  #include "mif.trm"
-@@ -345,7 +345,7 @@
+@@ -340,7 +340,7 @@
  #include "tkcanvas.trm"
  
  /* Vectrix 384 printer, also Tandy colour */
@@ -184,10 +205,9 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/src/term.h gnuplot-cvs.dif/src/
  
  #ifndef NO_BITMAP_SUPPORT
  
-diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/term/linux.trm gnuplot-cvs.dif/term/linux.trm
---- gnuplot-cvs/term/linux.trm	2011-08-17 22:31:33.287029383 +0200
-+++ gnuplot-cvs.dif/term/linux.trm	2011-08-17 22:44:53.116586784 +0200
-@@ -80,7 +80,7 @@
+--- term/linux.trm
++++ term/linux.trm	2011-08-17 20:44:53.000000000 +0000
+@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
  TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
  TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));
  TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
@@ -196,7 +216,7 @@ diff -U 3 -H -d -r -N -x '.svn/*' -- gnuplot-cvs/term/linux.trm gnuplot-cvs.dif/
  TERM_PUBLIC void LINUX_suspend __PROTO((void));
  TERM_PUBLIC void LINUX_resume __PROTO((void));
  
-@@ -293,7 +293,7 @@
+@@ -408,7 +408,7 @@ LINUX_putc(
  }
  
  TERM_PUBLIC void
diff --git a/gnuplot.changes b/gnuplot.changes
index 2e28198..d76f746 100644
--- a/gnuplot.changes
+++ b/gnuplot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  2 14:38:11 UTC 2012 - werner@suse.de
+
+- Refresh patches to see in which C function each change is in
+- Reenable bitmap terminals
+
 -------------------------------------------------------------------
 Thu Mar 15 11:43:23 UTC 2012 - kruber@zib.de
 
diff --git a/gnuplot.spec b/gnuplot.spec
index b52ec48..5b1cda7 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -17,6 +17,7 @@
 
 
 Name:           gnuplot
+BuildRequires:  ImageMagick
 BuildRequires:  automake
 BuildRequires:  cairo-devel
 BuildRequires:  emacs-nox
@@ -29,10 +30,11 @@ BuildRequires:  libqt4-devel >= 4.5
 BuildRequires:  netpbm
 BuildRequires:  pango-devel
 BuildRequires:  readline-devel
-BuildRequires:  texlive-tex4ht
-#BuildRequires:  latex2html
-BuildRequires:  ImageMagick
+%if %suse_version <= 1140
+BuildRequires:  zziplib
+%endif
 BuildRequires:  texlive-latex
+BuildRequires:  texlive-tex4ht
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-devel
 %if %suse_version > 1130
@@ -57,15 +59,15 @@ Release:        0
 Summary:        GNUplot a Function Plotting Utility
 License:        SUSE-Gnuplot and GPL-2.0+
 Group:          Productivity/Graphics/Visualization/Graph
-#Source0:       http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz
+# http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz
 Source0:        gnuplot-%{version}.tar.gz
 Source2:        gnuplot-fr.doc.bz2
 Source3:        README.whynot
-Patch0:         gnuplot-4.5.0.dif
+Patch0:         gnuplot-4.6.0.dif
 Patch1:         gnuplot-4.4.0-x11ovf.dif
 Patch2:         gnuplot-4.6.0-fonts.diff
 Patch4:         gnuplot-4.6.0-demo.diff
-Patch6:         gnuplot-4.6.0-fix-format-errors.dif
+Patch6:         gnuplot-4.6.0-fix-format-errors.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -116,10 +118,10 @@ and can easily be extended to include new devices.
 bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
 test $? -eq 0 || exit 1
 %patch1 -p 0 -b .x11ovf
-%patch2 -p 1 -b .font
-%patch4 -p 1 -b .demo
-%patch6 -p 1 -b .formaterrors
-%patch0 -p 1
+%patch2 -p 0 -b .font
+%patch4 -p 0 -b .demo
+%patch6 -p 0 -b .formaterrors
+%patch0 -p 0 -b .0
 
 %build
     SECSVGA="-DSVGA_IS_SECURE=1"
@@ -148,10 +150,17 @@ test $? -eq 0 || exit 1
 	--with-readline=gnu	\
 	--enable-history-file	\
 	--with-linux-vga	\
-	--with-gif=png		\
+	--with-bitmap-terminals	\
 	--with-freetype=%{_libdir}\
 	--enable-x11-mbfonts	\
+%if 0
 	--enable-h3d-quadtree	\
+	--disable-h3d-gridbox	\
+%else
+	--disable-h3d-quadtree	\
+	--enable-h3d-gridbox	\
+%endif
+	--enable-backwards-compatibility\
 	--with-zlib		\
 	--with-gd		\
 	--enable-thin-splines	\