gnuplot: update to 4.6.0

SVN-Revision: 31832

diff --git a/utils/gnuplot/Makefile b/utils/gnuplot/Makefile
index ba19912663be8f338f981fc058ffda99f9212281..7fde06e2355370a50da858db375310cba003a5ec 100644 (file)
--- a/utils/gnuplot/Makefile
+++ b/utils/gnuplot/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnuplot
-PKG_VERSION:=4.4.4
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_INSTALL:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/gnuplot
-PKG_MD5SUM:=97a43328e81e57ebed7f135ca0c07e82
+PKG_MD5SUM:=8e6e92b4596ea0eb75e16a57fc79efec
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -49,7 +49,8 @@ CONFIGURE_ARGS += \
        --without-row-help \
        --without-lisp-files \
        --disable-wxwidgets \
-       --without-lua
+       --without-lua \
+       --without-cairo
 
 define Package/gnuplot/install
        $(INSTALL_DIR) $(1)/usr/bin

diff --git a/utils/gnuplot/patches/010-Makefile.in.patch b/utils/gnuplot/patches/010-Makefile.in.patch
index ddf921ab581ef717d22b2f03a4dd1123262cf644..8a83fd606bae6228424dd9488dad499b2531c747 100644 (file)
--- a/utils/gnuplot/patches/010-Makefile.in.patch
+++ b/utils/gnuplot/patches/010-Makefile.in.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -240,7 +240,7 @@ top_build_prefix = @top_build_prefix@
+@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign 1.2h
@@ -8,4 +8,4 @@
 +SUBDIRS = config m4 term src $(LISPDIR) share
  EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
  Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \
- VERSION configure.vms pm3d
+ VERSION configure.vms pm3d win