gnuplot: update 4.2.2, add 4.3.0+cvs

* restructure patch directories
* update angstrom-preferred

10 files changed, 58 insertions, 41 deletions

diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch
index 69c7753973..8c7d1f0d35 100644
--- a/packages/gnuplot/files/subdirs.patch
+++ b/packages/gnuplot/files/subdirs.patch
@@ -1,16 +1,11 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- gnuplot-4.0.0/Makefile.am~nodocs
-+++ gnuplot-4.0.0/Makefile.am
+--- /tmp/Makefile.am	2007-08-23 13:10:15.560659023 +0200
++++ gnuplot-4.2.0/Makefile.am	2007-08-23 13:10:34.961764629 +0200
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in -*-Makefile-*-
  AUTOMAKE_OPTIONS = foreign 1.2h
  
--SUBDIRS = config m4 term src docs lisp man demo tutorial
-+SUBDIRS = config m4 term src man tutorial
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src  $(LISPDIR) man share
  
  EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
  Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch
index 2979b5ec9e..41aa8e7a97 100644
--- a/packages/gnuplot/files/term.patch
+++ b/packages/gnuplot/files/term.patch
@@ -1,14 +1,14 @@
---- gnuplot-4.0.0/src/term.h.old	2005-03-01 15:17:46.424111687 +0000
-+++ gnuplot-4.0.0/src/term.h	2005-03-01 15:18:50.961405665 +0000
-@@ -54,6 +54,7 @@
+--- gnuplot-4.2.0/src/term.h.old	2007-11-16 01:21:09.000000000 -0600
++++ gnuplot-4.2.0/src/term.h	2007-11-16 01:22:45.000000000 -0600
+@@ -70,6 +70,7 @@
   */
  #ifdef SHORT_TERMLIST
  # include "dumb.trm"		/* dumb terminal */
 +# include "qtopia.trm"         /* QTopia terminal */
- # include "post.trm"		/* postscript */
- # include "table.trm"		/* built-in, but used for the documentation */
- # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA))
-@@ -432,6 +433,9 @@
+ 
+ # ifdef GP_ENH_EST
+ #  include "estimate.trm"	/* used for enhanced text processing */
+@@ -436,6 +437,9 @@
  /* TeXDraw drawing package for LaTeX */
  #include "texdraw.trm"
  
diff --git a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty
+++ b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty
diff --git a/packages/gnuplot/files/debian-separate-x11-package.patch b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch
index 7afa0ee00e..7afa0ee00e 100644
--- a/packages/gnuplot/files/debian-separate-x11-package.patch
+++ b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch
diff --git a/packages/gnuplot/files/matrix.patch b/packages/gnuplot/gnuplot-4.0.0/matrix.patch
index 10f56d9f6a..10f56d9f6a 100644
--- a/packages/gnuplot/files/matrix.patch
+++ b/packages/gnuplot/gnuplot-4.0.0/matrix.patch
diff --git a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch
index 8c7d1f0d35..69c7753973 100644
--- a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch
+++ b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch
@@ -1,11 +1,16 @@
---- /tmp/Makefile.am	2007-08-23 13:10:15.560659023 +0200
-+++ gnuplot-4.2.0/Makefile.am	2007-08-23 13:10:34.961764629 +0200
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- gnuplot-4.0.0/Makefile.am~nodocs
++++ gnuplot-4.0.0/Makefile.am
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in -*-Makefile-*-
  AUTOMAKE_OPTIONS = foreign 1.2h
  
--SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
-+SUBDIRS = config m4 term src  $(LISPDIR) man share
+-SUBDIRS = config m4 term src docs lisp man demo tutorial
++SUBDIRS = config m4 term src man tutorial
  
  EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
  Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
diff --git a/packages/gnuplot/gnuplot-4.0.0/term.patch b/packages/gnuplot/gnuplot-4.0.0/term.patch
new file mode 100644
index 0000000000..2979b5ec9e
--- /dev/null
+++ b/packages/gnuplot/gnuplot-4.0.0/term.patch
@@ -0,0 +1,20 @@
+--- gnuplot-4.0.0/src/term.h.old	2005-03-01 15:17:46.424111687 +0000
++++ gnuplot-4.0.0/src/term.h	2005-03-01 15:18:50.961405665 +0000
+@@ -54,6 +54,7 @@
+  */
+ #ifdef SHORT_TERMLIST
+ # include "dumb.trm"		/* dumb terminal */
++# include "qtopia.trm"         /* QTopia terminal */
+ # include "post.trm"		/* postscript */
+ # include "table.trm"		/* built-in, but used for the documentation */
+ # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA))
+@@ -432,6 +433,9 @@
+ /* TeXDraw drawing package for LaTeX */
+ #include "texdraw.trm"
+ 
++/* Qtopia */
++#include "qtopia.trm"
++
+ /* METAFONT */
+ #include "metafont.trm"
+ 
diff --git a/packages/gnuplot/gnuplot-4.2.0/term.patch b/packages/gnuplot/gnuplot-4.2.0/term.patch
deleted file mode 100644
index 41aa8e7a97..0000000000
--- a/packages/gnuplot/gnuplot-4.2.0/term.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnuplot-4.2.0/src/term.h.old	2007-11-16 01:21:09.000000000 -0600
-+++ gnuplot-4.2.0/src/term.h	2007-11-16 01:22:45.000000000 -0600
-@@ -70,6 +70,7 @@
-  */
- #ifdef SHORT_TERMLIST
- # include "dumb.trm"		/* dumb terminal */
-+# include "qtopia.trm"         /* QTopia terminal */
- 
- # ifdef GP_ENH_EST
- #  include "estimate.trm"	/* used for enhanced text processing */
-@@ -436,6 +437,9 @@
- /* TeXDraw drawing package for LaTeX */
- #include "texdraw.trm"
- 
-+/* Qtopia */
-+#include "qtopia.trm"
-+
- /* METAFONT */
- #include "metafont.trm"
- 
diff --git a/packages/gnuplot/gnuplot_4.2.0.bb b/packages/gnuplot/gnuplot_4.2.2.bb
index 1df0c9fa21..478f6e2b0f 100644
--- a/packages/gnuplot/gnuplot_4.2.0.bb
+++ b/packages/gnuplot/gnuplot_4.2.2.bb
@@ -1,6 +1,6 @@
 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 \
diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb
new file mode 100644
index 0000000000..d63d31a492
--- /dev/null
+++ b/packages/gnuplot/gnuplot_cvs.bb
@@ -0,0 +1,17 @@
+require gnuplot.inc
+
+PV = "4.3.0+cvs${SRCDATE}"
+PR = "r0"
+
+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
+}