gnuplot: fix configure

* remove unnecessary depends (wxwidgets, etc) and configure option
* fix SRC_DATE in 4.3.0+cvs
* bump default to 4.2.3

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 47da016..df0a21a 100644 (file)
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -120,6 +120,7 @@ SRCDATE_dvbtraffic ?= "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"

diff --git a/packages/gnuplot/gnuplot.inc b/packages/gnuplot/gnuplot.inc
index 9f1eebf..bf44252 100644 (file)
--- a/packages/gnuplot/gnuplot.inc
+++ b/packages/gnuplot/gnuplot.inc
@@ -4,18 +4,16 @@ HOMEPAGE = "http://www.gnuplot.info/"
 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/

diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 6e1be52..abf519a 100644 (file)
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -1,6 +1,6 @@
 require gnuplot.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
           file://subdirs.patch;patch=1 \

diff --git a/packages/gnuplot/gnuplot_4.2.2.bb b/packages/gnuplot/gnuplot_4.2.3.bb
similarity index 100%
rename from packages/gnuplot/gnuplot_4.2.2.bb
rename to packages/gnuplot/gnuplot_4.2.3.bb

diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb
index d63d31a..ff3e9b3 100644 (file)
--- a/packages/gnuplot/gnuplot_cvs.bb
+++ b/packages/gnuplot/gnuplot_cvs.bb
@@ -3,6 +3,8 @@ 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 \

diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
index 80b3e4a..cc57260 100644 (file)
--- a/packages/gnuplot/qtplot_0.2.bb
+++ b/packages/gnuplot/qtplot_0.2.bb
@@ -1,14 +1,14 @@
 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"