[oe-commits] org.oe.dev gnuplot: fix configure

[xjqian commit]

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 7a5e2e808638cae9a7bfca995eaac735ecf17606
ViewMTN: http://monotone.openembedded.org/revision/info/7a5e2e808638cae9a7bfca995eaac735ecf17606
Files:
1
packages/gnuplot/gnuplot_4.2.2.bb
packages/gnuplot/gnuplot_4.2.3.bb
conf/distro/include/sane-srcdates.inc
packages/gnuplot/gnuplot.inc
packages/gnuplot/gnuplot_4.0.0.bb
packages/gnuplot/gnuplot_cvs.bb
packages/gnuplot/qtplot_0.2.bb
Diffs:

#
# mt diff -r129bb5affe70955eed05776db0acee92524b6fcb -r7a5e2e808638cae9a7bfca995eaac735ecf17606
#
#
#
# rename "packages/gnuplot/gnuplot_4.2.2.bb"
#     to "packages/gnuplot/gnuplot_4.2.3.bb"
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [24487dafafd112c005611a91cb976bf92efd6493]
#    to [1474e937489b8938c1858d53c427068ce882e743]
# 
# 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_cvs.bb"
#  from [fc07214c5ba39477584bd102d53aa602c87ab77c]
#    to [4f3c30d956c516dca8f8b486c9ea6b6b86383588]
# 
# patch "packages/gnuplot/qtplot_0.2.bb"
#  from [4eef3a5f414fdc6d5d2a0278712d1645cebda39a]
#    to [7d27f8f8f01ee2a765705733292187ae64c0c7e2]
#
============================================================
--- conf/distro/include/sane-srcdates.inc	24487dafafd112c005611a91cb976bf92efd6493
+++ conf/distro/include/sane-srcdates.inc	1474e937489b8938c1858d53c427068ce882e743
@@ -120,6 +120,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_cvs.bb	fc07214c5ba39477584bd102d53aa602c87ab77c
+++ packages/gnuplot/gnuplot_cvs.bb	4f3c30d956c516dca8f8b486c9ea6b6b86383588
@@ -3,6 +3,8 @@ PR = "r0"
 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 \
============================================================
--- 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"