Update gnuplot to 4.4.3

Also install Gnuplot runtime files which are needed for some formats
like Postscript or HTML5/Javascript when the configuration option is
selected.

Disable lua regardless whether lua is available or not.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 44 insertions, 10 deletions

diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series
deleted file mode 100644
index 12cf91bcb..000000000
--- a/patches/gnuplot-4.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-gnuplot-4.2.2-cc-for-build.diff
diff --git a/patches/gnuplot-4.2.6/autogen.sh b/patches/gnuplot-4.4.3/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/gnuplot-4.2.6/autogen.sh
+++ b/patches/gnuplot-4.4.3/autogen.sh
diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff b/patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
index e0f63b936..e0f63b936 100644
--- a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff
+++ b/patches/gnuplot-4.4.3/gnuplot-4.4.3-cc-for-build.diff
diff --git a/patches/gnuplot-4.4.3/series b/patches/gnuplot-4.4.3/series
new file mode 100644
index 000000000..76fe6748b
--- /dev/null
+++ b/patches/gnuplot-4.4.3/series
@@ -0,0 +1 @@
+gnuplot-4.4.3-cc-for-build.diff
diff --git a/rules/gnuplot.in b/rules/gnuplot.in
index 69fcd57ae..cfe2881d1 100644
--- a/rules/gnuplot.in
+++ b/rules/gnuplot.in
@@ -16,11 +16,33 @@ menuconfig GNUPLOT
 	  many printers, (La)TeX, (x)fig, Postscript, and so on.
 
 	  Data files and self-defined functions can be manipulated by internal
- 	  C-like language.  Can perform smoothing, spline-fitting, or nonlinear
- 	  fits. Can work with complex numbers.
+	  C-like language.  Can perform smoothing, spline-fitting, or nonlinear
+	  fits. Can work with complex numbers.
 
 if GNUPLOT
 
+config GNUPLOT_HELP
+	bool
+	prompt "Install interactive help"
+	help
+	  Installs the interactive help files on the target.
+	  Requires about 600 kByte of space.
+
+config GNUPLOT_POSTSCRIPT
+	bool
+	prompt "Install Postscript prolog files"
+	help
+	  Installs the prolog files needed to generate Postscript output. If you
+	  don't need Postscript, you can turn off that setting. Requires about
+	  100 kByte of space.
+
+config GNUPLOT_JS
+	bool
+	prompt "Install JavaScript runtime files"
+	help
+	  Installs some JavaScript files and PNG images which will be needed if
+	  HTML5 output should be generated. Requires about 300 kByte of disk space.
+
 config GNUPLOT_FITERRVARS
 	bool
 	prompt "Support for fitting error variables"
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 4de83b0e4..896087cf0 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
 #
 # Paths and names
 #
-GNUPLOT_VERSION	:= 4.2.6
-GNUPLOT_MD5	:= c10468d74030e8bed0fd6865a45cf1fd
+GNUPLOT_VERSION	:= 4.4.3
+GNUPLOT_MD5	:= 639603752996f4923bc02c895fa03b45
 GNUPLOT		:= gnuplot-$(GNUPLOT_VERSION)
 GNUPLOT_SUFFIX	:= tar.gz
 GNUPLOT_URL	:= $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
@@ -49,7 +49,6 @@ GNUPLOT_ENV	:= $(CROSS_ENV)
 GNUPLOT_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-history-file \
-	--disable-mouse \
 	--disable-x11-mbfonts \
 	--enable-binary-data-file \
 	--disable-with-image \
@@ -76,7 +75,8 @@ GNUPLOT_AUTOCONF = \
 	--without-lisp-files \
 	--without-row-help \
 	--without-tutorial \
-	--without-wx-config
+	--without-wx-config \
+	--without-lua
 
 ifdef PTXCONF_GNUPLOT_FITERRVARS
 GNUPLOT_AUTOCONF += --enable-fiterrvars
@@ -85,9 +85,9 @@ GNUPLOT_AUTOCONF += --disable-fiterrvars
 endif
 
 ifdef PTXCONF_GNUPLOT_X
-GNUPLOT_AUTOCONF += --with-x
+GNUPLOT_AUTOCONF += --with-x --enable-mouse
 else
-GNUPLOT_AUTOCONF += --without-x
+GNUPLOT_AUTOCONF += --without-x --disable-mouse
 endif
 
 ifdef PTXCONF_GNUPLOT_PLOT
@@ -138,8 +138,20 @@ $(STATEDIR)/gnuplot.targetinstall:
 
 	@$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot)
 
+ifdef PTXCONF_GNUPLOT_HELP
+	@$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.4/gnuplot.gih)
+endif
+
+ifdef PTXCONF_GNUPLOT_POSTSCRIPT
+	@$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/PostScript)
+endif
+
+ifdef PTXCONF_GNUPLOT_JS
+	@$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/js)
+endif
+
 ifdef PTXCONF_GNUPLOT_X
-	@$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.2/gnuplot_x11)
+	@$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11)
 endif
 
 	@$(call install_finish, gnuplot)