#
#
# delete "packages/gnuplot/gnuplot-4.2.0"
# 
# rename "packages/gnuplot/files/debian-separate-x11-package.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch"
# 
# rename "packages/gnuplot/files/matrix.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/matrix.patch"
# 
# rename "packages/gnuplot/files/subdirs.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/subdirs.patch"
# 
# rename "packages/gnuplot/files/term.patch"
#     to "packages/gnuplot/gnuplot-4.0.0/term.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
#     to "packages/gnuplot/files/subdirs.patch"
# 
# rename "packages/gnuplot/gnuplot-4.2.0/term.patch"
#     to "packages/gnuplot/files/term.patch"
# 
# rename "packages/gnuplot/gnuplot_4.2.0.bb"
#     to "packages/gnuplot/gnuplot_4.2.3.bb"
# 
# add_dir "packages/gnuplot/gnuplot-4.0.0"
# 
# add_file "packages/gnuplot/gnuplot_cvs.bb"
#  content [4f3c30d956c516dca8f8b486c9ea6b6b86383588]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [6ba28abd1dba3062e30330b29df1c433b12c1a0f]
#    to [b91b7a7f1be5fe7327adabc18f0ef5ed4b4a987a]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
#    to [487bc63721ec9678cd27874fc80eb7680c022c4e]
# 
# patch "packages/gnuplot/gnuplot.inc"
#  from [b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9]
#    to [472ba166bf164babe286aa79617ef3b8992217aa]
# 
# patch "packages/gnuplot/gnuplot_4.0.0.bb"
#  from [87abbc86f29e81b6a1a2491e194323a8218723b7]
#    to [16871008e8222bc295d00cef8e2f21a08409658e]
# 
# patch "packages/gnuplot/gnuplot_4.2.3.bb"
#  from [03f32275753ca6d0330c16d5e953d3076ae0a61c]
#    to [2735c3e3ef088dab319af681d7d090294056717c]
# 
# patch "packages/gnuplot/qtplot_0.2.bb"
#  from [4eef3a5f414fdc6d5d2a0278712d1645cebda39a]
#    to [7d27f8f8f01ee2a765705733292187ae64c0c7e2]
#
============================================================
--- packages/gnuplot/gnuplot_cvs.bb	4f3c30d956c516dca8f8b486c9ea6b6b86383588
+++ packages/gnuplot/gnuplot_cvs.bb	4f3c30d956c516dca8f8b486c9ea6b6b86383588
@@ -0,0 +1,19 @@
+require gnuplot.inc
+
+PV = "4.3.0+cvs${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
+           http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+           file://subdirs.patch;patch=1 \
+           file://term.patch;patch=1 \
+           file://gnuplot.desktop \
+           file://gnuplot.png"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+           ./prepare
+}
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	6ba28abd1dba3062e30330b29df1c433b12c1a0f
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	b91b7a7f1be5fe7327adabc18f0ef5ed4b4a987a
@@ -503,7 +503,7 @@ PREFERRED_VERSION_gnupg ?= "1.4.2.2"
 PREFERRED_VERSION_gnuchess ?= "5.05"
 PREFERRED_VERSION_gnumeric ?= "1.6.3"
 PREFERRED_VERSION_gnupg ?= "1.4.2.2"
-PREFERRED_VERSION_gnuplot ?= "4.2.0"
+PREFERRED_VERSION_gnuplot ?= "4.2.3"
 PREFERRED_VERSION_gnuradio ?= "3.0.4"
 PREFERRED_VERSION_gnutls ?= "1.6.3"
 PREFERRED_VERSION_gob2 ?= "2.0.14"
============================================================
--- conf/distro/include/sane-srcdates.inc	cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3
+++ conf/distro/include/sane-srcdates.inc	487bc63721ec9678cd27874fc80eb7680c022c4e
@@ -118,6 +118,7 @@ SRCDATE_fltk ?= "20060814"
 SRCDATE_dvbtune ?= "20060814"
 SRCDATE_fdclock ?= "20060814"
 SRCDATE_fltk ?= "20060814"
+SRCDATE_gnuplot ?= "20080328"
 SRCDATE_ipatience ?= "20061112" 
 SRCDATE_ipkg-link ?= "20050930"
 SRCDATE_ipkg-link-1 ?= "20050930"
============================================================
--- packages/gnuplot/gnuplot.inc	b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9
+++ packages/gnuplot/gnuplot.inc	472ba166bf164babe286aa79617ef3b8992217aa
@@ -4,18 +4,16 @@ PRIORITY = "optional"
 SECTION = "console/scientific"
 LICENSE = "BSD-4"
 PRIORITY = "optional"
-DEPENDS = "pango cairo virtual/libx11 libpng gd readline"
+DEPENDS = "virtual/libx11 readline"
 
 inherit autotools
 
 acpaths = ""
 
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
-		--without-plot \
-		--with-png=${STAGING_LIBDIR}/.. \
-		--with-gd=${STAGING_LIBDIR}/.. \
 		--without-lisp-files \
-		--without-tutorial"
+		--without-tutorial \
+                --disable-wxwidgets"
 
 do_compile_prepend() {
 	install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
============================================================
--- packages/gnuplot/gnuplot_4.0.0.bb	87abbc86f29e81b6a1a2491e194323a8218723b7
+++ packages/gnuplot/gnuplot_4.0.0.bb	16871008e8222bc295d00cef8e2f21a08409658e
@@ -1,6 +1,6 @@ require gnuplot.inc
 require gnuplot.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
 	   file://subdirs.patch;patch=1 \
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb	03f32275753ca6d0330c16d5e953d3076ae0a61c
+++ packages/gnuplot/gnuplot_4.2.3.bb	2735c3e3ef088dab319af681d7d090294056717c
@@ -1,6 +1,6 @@ require gnuplot.inc
 require gnuplot.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
============================================================
--- packages/gnuplot/qtplot_0.2.bb	4eef3a5f414fdc6d5d2a0278712d1645cebda39a
+++ packages/gnuplot/qtplot_0.2.bb	7d27f8f8f01ee2a765705733292187ae64c0c7e2
@@ -1,14 +1,14 @@ console to enable the Launch Gnuplot men
 DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \
 console to enable the Launch Gnuplot menu option."
+HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html"
 SECTION = "opie/applications"
-PRIORITY   = "optional"
-LICENSE    = "GPL"
-PRIORITY   = "optional"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gnuplot"
+RDEPDENDS_${PN} = "gnuplot"
 
-DEPENDS    = "gnuplot"
-RDEPDENDS  = "gnuplot"
+PR = "r1"
 
-HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html"
 SRC_URI  = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz"
 
 APPTYPE    = "binary"