From f3074ef2d1ee7a22df71d34913d96f1d894bbfc3 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 30 Mar 2008 13:12:17 +0000
Subject: 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

---
 packages/gnuplot/gnuplot.inc      |  8 +++-----
 packages/gnuplot/gnuplot_4.0.0.bb |  2 +-
 packages/gnuplot/gnuplot_4.2.2.bb | 10 ----------
 packages/gnuplot/gnuplot_4.2.3.bb | 10 ++++++++++
 packages/gnuplot/gnuplot_cvs.bb   |  2 ++
 packages/gnuplot/qtplot_0.2.bb    | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 packages/gnuplot/gnuplot_4.2.2.bb
 create mode 100644 packages/gnuplot/gnuplot_4.2.3.bb

(limited to 'packages/gnuplot')

diff --git a/packages/gnuplot/gnuplot.inc b/packages/gnuplot/gnuplot.inc
index 9f1eebf003..bf442527af 100644
--- 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 6e1be52173..abf519ae6e 100644
--- 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.2.bb
deleted file mode 100644
index 478f6e2b0f..0000000000
--- a/packages/gnuplot/gnuplot_4.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gnuplot.inc
-
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
-           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"
diff --git a/packages/gnuplot/gnuplot_4.2.3.bb b/packages/gnuplot/gnuplot_4.2.3.bb
new file mode 100644
index 0000000000..478f6e2b0f
--- /dev/null
+++ b/packages/gnuplot/gnuplot_4.2.3.bb
@@ -0,0 +1,10 @@
+require gnuplot.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
+           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"
diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb
index d63d31a492..ff3e9b3810 100644
--- 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 80b3e4a603..cc57260f49 100644
--- 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"
-- 
cgit v1.2.3