add updated gnuplot stuff courtesy Philip Frampton

BKrev: 422730585MVRGwh5lsoHCNdVd1_Q_Q

diff --git a/packages/gnuplot/gnuplot-4.0.0/subdirs.patch b/packages/gnuplot/files/matrix.patch
similarity index 100%
rename from packages/gnuplot/gnuplot-4.0.0/subdirs.patch
rename to packages/gnuplot/files/matrix.patch

diff --git a/packages/gnuplot/files/qtopia.trm b/packages/gnuplot/files/qtopia.trm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnuplot/gnuplot-qt_4.0.0.bb b/packages/gnuplot/gnuplot-qt_4.0.0.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnuplot/gnuplot-x11_4.0.0.bb b/packages/gnuplot/gnuplot-x11_4.0.0.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 6f475e3..3c9c4bc 100644 (file)
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -1,16 +1,20 @@
 DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
 (text or binary) and function plotting utility."
-SECTION = "x11/utils"
+SECTION = "console/scientific"
 LICENSE = "BSD-4"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "x11 libpng gd readline"
-PR = "r1"
+MAINTAINER = "Philip Frampton"
+DEPENDS = "libpng gd readline"
+RCONFLICTS = "gnuplot-qt gnuplot-x11"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
+          file://matrix.patch;patch=1 \
           file://subdirs.patch;patch=1 \
+          file://term.patch;patch=1 \
           file://gnuplot.desktop \
-          file://gnuplot.png"
+          file://gnuplot.png \
+          file://qtopia.trm"
 
 inherit autotools 
 acpaths = ""
@@ -19,7 +23,12 @@ EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
                --with-png=${STAGING_LIBDIR}/.. \
                --with-gd=${STAGING_LIBDIR}/.. \
                --without-lisp-files \
-               --without-tutorial"
+               --without-tutorial \
+               --without-x"
+
+do_compile_prepend(){
+       install -m 0644 ${WORKDIR}/qtopia.trm ${S}/term/
+}
 
 do_install_append() {
        install -d ${D}${datadir}/applications/