Convert packages CVSDATE -> SRCDATE and standardise some PV fields

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@268 311d38ba-8fff-0310-9ca6-ca027cbcb966

75 files changed, 91 insertions, 211 deletions

diff --git a/openembedded/packages/alsa/alsa-utils_1.0.10.bb b/openembedded/packages/alsa/alsa-utils_1.0.10.bb
index 916afedd1..94e49ebf2 100644
--- a/openembedded/packages/alsa/alsa-utils_1.0.10.bb
+++ b/openembedded/packages/alsa/alsa-utils_1.0.10.bb
@@ -52,6 +52,4 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
 
-# ALSA can be in kernel
-RRECOMMENDS_alsa-utils += "${ALSA_PACKAGES}"
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/openembedded/packages/apmd/apmd-3.2.2/apmwrapper b/openembedded/packages/apmd/apmd-3.2.2/apmwrapper
deleted file mode 100644
index 3bc9bece3..000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/apmwrapper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if ( cat /proc/cpuinfo|grep -i hardware|grep -i SHARP ) && \
-   [ ".$@" = ".-s" -o ".$@" = ".--suspend" ]; then
-	killall -USR1 apmd || /usr/bin/apm.orig -s
-else
-	/usr/bin/apm.orig "$@"
-fi
-
diff --git a/openembedded/packages/apmd/apmd-3.2.2/devfs.patch b/openembedded/packages/apmd/apmd-3.2.2/devfs.patch
deleted file mode 100644
index b11e01929..000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/devfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apmd-3.2.0.orig/apm.h~devfs
-+++ apmd-3.2.0.orig/apm.h
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- 
- #define APM_PROC   "/proc/apm"
--#define APM_DEVICE "/dev/apm_bios"
-+#define APM_DEVICE "/dev/misc/apm_bios"
- 
- #define APM_DEV  "/proc/devices"
- #define APM_NAME "apm_bios"
diff --git a/openembedded/packages/apmd/apmd-3.2.2/hwclock b/openembedded/packages/apmd/apmd-3.2.2/hwclock
deleted file mode 100644
index a1c1c2294..000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/hwclock
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Preserve the system clock around suspend/resume.
-
-INIT="/etc/init.d/hwclock.sh"
-[ -x "${INIT}" ] || exit 0
-
-case "${1},${2}" in
-(suspend,*)
-    "${INIT}" stop
-    ;;
-(resume,suspend)
-    "${INIT}" start
-    ;;
-esac
-
-exit 0
diff --git a/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid b/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid
deleted file mode 100644
index de37f01a2..000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid
+++ /dev/null
@@ -1,13 +0,0 @@
-apmd\[[0-9]+\]: (Normal|Standby|Critical) Resume
-apmd\[[0-9]+\]: (Now using|Using) (AC|battery|backup) power
-apmd\[[0-9]+\]: (System|User) (Standby|Suspend)
-apmd\[[0-9]+\]: (apmd_)?call_proxy:
-apmd\[[0-9]+\]: Battery: [0-9]+%,
-apmd\[[0-9]+\]: Battery: absent
-apmd\[[0-9]+\]: Capability Change
-apmd\[[0-9]+\]: Exiting
-apmd\[[0-9]+\]: Performing APM status check
-apmd\[[0-9]+\]: Suspending now
-apmd\[[0-9]+\]: Update Time
-apmd\[[0-9]+\]: Version: apmd [0-9.]+, (apm )?driver [0-9.]+, APM BIOS [0-9.]+
-apmd\[[0-9]+\]: apmd [0-9.]+ interfacing with apm driver [0-9.]+ and APM BIOS [0-9.]+
diff --git a/openembedded/packages/apmd/apmd_3.2.2.bb b/openembedded/packages/apmd/apmd_3.2.2.bb
index 0e8b36445..4a23f3959 100644
--- a/openembedded/packages/apmd/apmd_3.2.2.bb
+++ b/openembedded/packages/apmd/apmd_3.2.2.bb
@@ -3,12 +3,12 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r7"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
            file://debian.patch;patch=1 \
            file://workaround.patch;patch=1 \
-           file://apmwrapper \
+           file://zaurus24.patch;patch=1 \
            file://init \
            file://default \
            file://apmd_proxy \
@@ -44,25 +44,8 @@ do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${libdir}
 	install -d ${D}${datadir}/apmd
-#
-# only Zaurus 2.4-embedix kernels need a breadead apm hack
-#
-#
-	case ${MACHINE} in
-		collie | poodle | tosa | c7x0 | akita | spitz | borzoi)
-			if [ "${KERNEL_VERSION}" == "2.6" ]
-			then
-				install -m 4577 ${S}/.libs/apm ${D}${bindir}/apm
-			else
-				install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm.orig
-				install -m 0755 ${WORKDIR}/apmwrapper ${D}${bindir}/apm
-			fi
-			;;
-        *)
-			install -m 4577 ${S}/.libs/apm ${D}${bindir}/apm
-        	;;
-    esac
 
+	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
 	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
 	install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
 	install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
@@ -79,5 +62,3 @@ PACKAGES =+ "libapm libapm-dev apm"
 FILES_libapm = "${libdir}/libapm.so.*"
 FILES_libapm-dev = "${libdir}/libapm.* ${includedir}"
 FILES_apm = "${bindir}/apm*"
-
-
diff --git a/openembedded/packages/binutils/binutils_cvs.bb b/openembedded/packages/binutils/binutils_cvs.bb
index f29579555..e870c8f0b 100644
--- a/openembedded/packages/binutils/binutils_cvs.bb
+++ b/openembedded/packages/binutils/binutils_cvs.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r2"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/openembedded/packages/compositeext/compositeext_cvs.bb b/openembedded/packages/compositeext/compositeext_cvs.bb
index 4b01bcfef..75317fabc 100644
--- a/openembedded/packages/compositeext/compositeext_cvs.bb
+++ b/openembedded/packages/compositeext/compositeext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/contacts/contacts_svn.bb b/openembedded/packages/contacts/contacts_svn.bb
index 2783a48b9..cd4f6a783 100755
--- a/openembedded/packages/contacts/contacts_svn.bb
+++ b/openembedded/packages/contacts/contacts_svn.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
 PR = "r5"
 
-PV = "0.1+svn-${CVSDATE}"
+PV = "0.1+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
diff --git a/openembedded/packages/damageext/damageext_cvs.bb b/openembedded/packages/damageext/damageext_cvs.bb
index 6c68c457c..1489e5355 100644
--- a/openembedded/packages/damageext/damageext_cvs.bb
+++ b/openembedded/packages/damageext/damageext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb
index 4f8e0ce69..22c821b98 100755
--- a/openembedded/packages/dates/dates_svn.bb
+++ b/openembedded/packages/dates/dates_svn.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Dates is a calendar application."
 
 PR = "r4"
 
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/;module=${PN};proto=http"
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index eff020d81..98658a1fa 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
 RDEPENDS = "gconf dbus-1 db libiconv"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Evolution database backend server"
-PV = "1.4.0cvs${CVSDATE}"
+PV = "1.4.0+svn${SRCDATE}"
 PR = "r15"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
diff --git a/openembedded/packages/fixesext/fixesext_cvs.bb b/openembedded/packages/fixesext/fixesext_cvs.bb
index 887ae2a13..c279256fa 100644
--- a/openembedded/packages/fixesext/fixesext_cvs.bb
+++ b/openembedded/packages/fixesext/fixesext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 5ee5583fc..e7adcd0a3 100644
--- a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -6,7 +6,7 @@ PRIORITY = "required"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-CVSDATE = "20050627"
+SRCDATE = "20050627"
 PR = "r1"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
diff --git a/openembedded/packages/glibc/glibc_cvs.bb b/openembedded/packages/glibc/glibc_cvs.bb
index 99dd80b7e..0390b8753 100644
--- a/openembedded/packages/glibc/glibc_cvs.bb
+++ b/openembedded/packages/glibc/glibc_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 PR = "r0"
-PV = "2.3.5+cvs${CVSDATE}"
+PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
 GLIBC_EXTRA_OECONF ?= ""
diff --git a/openembedded/packages/gnome/gconf-dbus_cvs.bb b/openembedded/packages/gnome/gconf-dbus_cvs.bb
index 13241bdc2..f8be0c4ee 100755
--- a/openembedded/packages/gnome/gconf-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gconf-dbus_cvs.bb
@@ -7,7 +7,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "0.0+cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r8"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index bf9b46224..b71d5179c 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -7,7 +7,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "0.0+svn${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
index dc5dfb188..660271d1c 100755
--- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN} = "gnome-vfs"
 RPROVIDES_${PN}-dev = "gnome-vfs-dev"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 
-PV = "2.12.0cvs${CVSDATE}"
+PV = "2.12.0+cvs${SRCDATE}"
 PR = "r5"
 
 SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
diff --git a/openembedded/packages/gnu-config/gnu-config_20050701.bb b/openembedded/packages/gnu-config/gnu-config_20050701.bb
index fd6615edb..4bc4501ec 100644
--- a/openembedded/packages/gnu-config/gnu-config_20050701.bb
+++ b/openembedded/packages/gnu-config/gnu-config_20050701.bb
@@ -5,11 +5,11 @@ DEPENDS = ""
 INHIBIT_DEFAULT_DEPS = "1"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.1cvs${FIXEDCVSDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.1+cvs${FIXEDSRCDATE}"
 PR = "r4"
 
-SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDCVSDATE} \
+SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
 	   file://config-guess-uclibc.patch;patch=1 \
            file://gnu-configize.in"
 S = "${WORKDIR}/config"
diff --git a/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb b/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb
index 8cc963dd2..577156780 100755
--- a/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb
+++ b/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb
@@ -3,7 +3,7 @@ DEPENDS = "gtk+ glib-2.0 libxml2"
 DESCRIPTION = "A GTK+ HTML rendering library."
 LICENSE = "GPL"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
-PV = "2.11.0+cvs-${CVSDATE}"
+PV = "2.11.0+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gtkhtml2 \
 	file://at-import_box-pos.patch;patch=1;pnum=0 \
diff --git a/openembedded/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/openembedded/packages/ipkg-utils/ipkg-link_1.6cvs.bb
index 0560ce8d9..94f749cf6 100644
--- a/openembedded/packages/ipkg-utils/ipkg-link_1.6cvs.bb
+++ b/openembedded/packages/ipkg-utils/ipkg-link_1.6cvs.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "Itsy Package Manager utilities link script"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
-PV_append = "${CVSDATE}"
+PV_append = "${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
diff --git a/openembedded/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/openembedded/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
index c751908b4..059ce8cb5 100644
--- a/openembedded/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/openembedded/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
-PV_append = "${CVSDATE}"
+PV_append = "${SRCDATE}"
 PR = "r9"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
diff --git a/openembedded/packages/libfakekey/libfakekey_svn.bb b/openembedded/packages/libfakekey/libfakekey_svn.bb
index 172fecc8c..7cdd55746 100644
--- a/openembedded/packages/libfakekey/libfakekey_svn.bb
+++ b/openembedded/packages/libfakekey/libfakekey_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "xtst"
 SECTION = "x11/wm"
 PR="r1"
-PV = "0.0+svn${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
diff --git a/openembedded/packages/libmatchbox/libmatchbox_svn.bb b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
index 7f3714f48..90debcd87 100644
--- a/openembedded/packages/libmatchbox/libmatchbox_svn.bb
+++ b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,6 @@
 include libmatchbox.inc
 
-PV = "1.7+cvs-${CVSDATE}"
+PV = "1.7+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
diff --git a/openembedded/packages/libxfixes/libxfixes_cvs.bb b/openembedded/packages/libxfixes/libxfixes_cvs.bb
index 4899229eb..a18ceeb0c 100644
--- a/openembedded/packages/libxfixes/libxfixes_cvs.bb
+++ b/openembedded/packages/libxfixes/libxfixes_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
 DEPENDS = "x11 fixesext"
diff --git a/openembedded/packages/libxft/libxft_cvs.bb b/openembedded/packages/libxft/libxft_cvs.bb
index d25b04e48..3827318cd 100644
--- a/openembedded/packages/libxft/libxft_cvs.bb
+++ b/openembedded/packages/libxft/libxft_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "x11/libs"
 DEPENDS = "x11 xproto libxrender freetype fontconfig"
diff --git a/openembedded/packages/libxml/libxml2_cvs.bb b/openembedded/packages/libxml/libxml2_cvs.bb
index 1b746cce8..29fb53fc0 100644
--- a/openembedded/packages/libxml/libxml2_cvs.bb
+++ b/openembedded/packages/libxml/libxml2_cvs.bb
@@ -10,7 +10,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-PV = "2.6.23+cvs-${CVSDATE}"
+PV = "2.6.23+cvs${SRCDATE}"
 S = "${WORKDIR}/${PN}"
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libxml2"
 
diff --git a/openembedded/packages/libxrender/libxrender_cvs.bb b/openembedded/packages/libxrender/libxrender_cvs.bb
index c04163a05..ca6f16f1b 100644
--- a/openembedded/packages/libxrender/libxrender_cvs.bb
+++ b/openembedded/packages/libxrender/libxrender_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 SECTION = "libs"
 DEPENDS = "renderext x11"
diff --git a/openembedded/packages/matchbox-common/matchbox-common_svn.bb b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
index 9dbdd13a1..97709bf31 100644
--- a/openembedded/packages/matchbox-common/matchbox-common_svn.bb
+++ b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager common files"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
-PV = "0.9.1+cvs-${CVSDATE}"
+PV = "0.9.1+svn${SRCDATE}"
 S = "${WORKDIR}/matchbox-common"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb
index cdfefce95..ec11e45ad 100644
--- a/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb
+++ b/openembedded/packages/matchbox-config-gtk/matchbox-config-gtk_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox gtk theme configuration application."
 LICENSE = "GPL"
 DEPENDS = "gconf libglade gtk+"
 RDEPENDS = "settings-daemon"
-PV = "0.0+cvs-${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb b/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
index a600103f9..6f2365c01 100644
--- a/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PV = "0.9.1+cvs-${CVSDATE}"
+PV = "0.9.1+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/openembedded/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 97c6e8e7a..394766346 100644
--- a/openembedded/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/openembedded/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
-PV = "0.0+svn-${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 PR="r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
index f0e80d3d2..211cf3caa 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -1,5 +1,5 @@
 include matchbox-panel.inc
-PV = "0.9.2+cvs-${CVSDATE}"
+PV = "0.9.2+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-stroke/matchbox-stroke_svn.bb b/openembedded/packages/matchbox-stroke/matchbox-stroke_svn.bb
index 88353e205..9bbbe8902 100644
--- a/openembedded/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/openembedded/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
-PV = "0.0+svn-${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 PR="r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb b/openembedded/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb
index e554db27c..6247ad4b2 100644
--- a/openembedded/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb
+++ b/openembedded/packages/matchbox-themes-extra/matchbox-themes-extra_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox window manager extra themes"
 LICENSE = "GPL"
 DEPENDS = "matchbox-wm"
 SECTION = "x11/wm"
-PV = "0.3+cvs-${CVSDATE}"
+PV = "0.3+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-themes-extra;proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index 04e774dfa..c9e7ada22 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext libxrender startup-notification expat matchbox-common gconf"
 RDEPENDS = "matchbox-common"
-PV = "0.9.5+cvs-${CVSDATE}"
+PV = "0.9.5+svn${SRCDATE}"
 PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/openembedded/packages/mozilla/minimo_cvs.bb b/openembedded/packages/mozilla/minimo_cvs.bb
index a44ccd8e2..790495127 100644
--- a/openembedded/packages/mozilla/minimo_cvs.bb
+++ b/openembedded/packages/mozilla/minimo_cvs.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/mozilla"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11"
 PRIORITY = "optional"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 FILES_${PN} += "${libdir}/mozilla-minimo"
 PR = "r8"
 LICENSE = "MPL/LGPL/GPL"
diff --git a/openembedded/packages/mozilla/mozilla-cvs.inc b/openembedded/packages/mozilla/mozilla-cvs.inc
index 9f92ae5b1..6e278aaaf 100644
--- a/openembedded/packages/mozilla/mozilla-cvs.inc
+++ b/openembedded/packages/mozilla/mozilla-cvs.inc
@@ -1,12 +1,12 @@
 do_fetch () {
-	export MOZ_CO_DATE="${CVSDATE}"
+	export MOZ_CO_DATE="${SRCDATE}"
 	mkdir -p ${WORKDIR}
 	cd ${WORKDIR}
-	if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then
+	if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${SRCDATE}.tar.gz ]; then
 		cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
 		cd mozilla
 		oe_runmake -f client.mk checkout
 		cd ..
-		tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
+		tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${SRCDATE}.tar.gz mozilla
 	fi
 }
diff --git a/openembedded/packages/mtd/mtd-utils_20050801.bb b/openembedded/packages/mtd/mtd-utils_20050801.bb
index 20ef37356..02f1120d9 100644
--- a/openembedded/packages/mtd/mtd-utils_20050801.bb
+++ b/openembedded/packages/mtd/mtd-utils_20050801.bb
@@ -4,7 +4,7 @@ DEPENDS = "zlib"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
 PR = "r0"
-CVSDATE = "${PV}"
+SRCDATE = "${PV}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \ 
            file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
diff --git a/openembedded/packages/oprofile/oprofile_cvs.bb b/openembedded/packages/oprofile/oprofile_cvs.bb
index 277c1835c..905e78adc 100644
--- a/openembedded/packages/oprofile/oprofile_cvs.bb
+++ b/openembedded/packages/oprofile/oprofile_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.9.1+cvs${SRCDATE}"
 SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
diff --git a/openembedded/packages/randrext/randrext_cvs.bb b/openembedded/packages/randrext/randrext_cvs.bb
index 1b3bbbd35..15b376843 100644
--- a/openembedded/packages/randrext/randrext_cvs.bb
+++ b/openembedded/packages/randrext/randrext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/recordext/recordext_cvs.bb b/openembedded/packages/recordext/recordext_cvs.bb
index b6e6ecf88..1c6bd0b93 100644
--- a/openembedded/packages/recordext/recordext_cvs.bb
+++ b/openembedded/packages/recordext/recordext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/openembedded/packages/renderext/renderext_cvs.bb b/openembedded/packages/renderext/renderext_cvs.bb
index 8fe39420a..85a790a6e 100644
--- a/openembedded/packages/renderext/renderext_cvs.bb
+++ b/openembedded/packages/renderext/renderext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/resourceext/resourceext_cvs.bb b/openembedded/packages/resourceext/resourceext_cvs.bb
index 9f37d6f36..b2cbfd759 100644
--- a/openembedded/packages/resourceext/resourceext_cvs.bb
+++ b/openembedded/packages/resourceext/resourceext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 SECTION = "libs"
 LICENSE = "Xorg"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 0a79a492a..d13614c3a 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
diff --git a/openembedded/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/openembedded/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index c558d4e83..fd93eb8e5 100644
--- a/openembedded/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/openembedded/packages/wpa-supplicant/wpa-supplicant_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r2"
 
 SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \
diff --git a/openembedded/packages/xau/xau_cvs.bb b/openembedded/packages/xau/xau_cvs.bb
index ca4435907..58c47dd62 100644
--- a/openembedded/packages/xau/xau_cvs.bb
+++ b/openembedded/packages/xau/xau_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "MIT"
 PR = "r1"
 SECTION = "x11/libs"
diff --git a/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb
index ff615a500..358da9bd3 100644
--- a/openembedded/packages/xauth/xauth_cvs.bb
+++ b/openembedded/packages/xauth/xauth_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DEPENDS = "x11 xau xmu xext"
 DESCRIPTION = "X authority file utility"
diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index 5436bf26b..f28e0edf4 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
diff --git a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
index 33cda47f3..e24256423 100644
--- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/openembedded/packages/xcomposite/xcomposite_cvs.bb b/openembedded/packages/xcomposite/xcomposite_cvs.bb
index 8782dcb42..e0a7e2b64 100644
--- a/openembedded/packages/xcomposite/xcomposite_cvs.bb
+++ b/openembedded/packages/xcomposite/xcomposite_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
 DEPENDS = "x11 compositeext xextensions libxfixes"
diff --git a/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index ac03be504..ca048155c 100644
--- a/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/openembedded/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -1,9 +1,11 @@
 LICENSE = "GPL"
 DESCRIPTION = "Transparent xcursor theme for handheld systems"
 SECTION = "x11/base"
+PR="r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
-	   file://use-relative-symlinks.patch;patch=1"
+	   file://use-relative-symlinks.patch;patch=1 \
+	   file://fix_watch_cursor.patch;patch=1"
 FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
 
 inherit autotools
diff --git a/openembedded/packages/xdamage/xdamage_1.0.1.bb b/openembedded/packages/xdamage/xdamage_1.0.1.bb
index c8a41893e..5b6c30137 100644
--- a/openembedded/packages/xdamage/xdamage_1.0.1.bb
+++ b/openembedded/packages/xdamage/xdamage_1.0.1.bb
@@ -12,9 +12,5 @@ S = "${WORKDIR}/libXdamage-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xdamage/xdamage_cvs.bb b/openembedded/packages/xdamage/xdamage_cvs.bb
index f66188351..c10852783 100644
--- a/openembedded/packages/xdamage/xdamage_cvs.bb
+++ b/openembedded/packages/xdamage/xdamage_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
 DEPENDS = "x11 damageext libxfixes xproto"
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xdamage"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xdmcp/libxdmcp_0.1.3.bb b/openembedded/packages/xdmcp/libxdmcp_0.1.3.bb
index 60d74e9f0..aa2736cdb 100644
--- a/openembedded/packages/xdmcp/libxdmcp_0.1.3.bb
+++ b/openembedded/packages/xdmcp/libxdmcp_0.1.3.bb
@@ -14,9 +14,5 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
index 6a72d61a7..6b0a4242f 100644
--- a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DEPENDS = "x11 xext xtst"
 DESCRIPTION = "X display information utility"
diff --git a/openembedded/packages/xext/xext_cvs.bb b/openembedded/packages/xext/xext_cvs.bb
index e9f330120..84ecd349b 100644
--- a/openembedded/packages/xext/xext_cvs.bb
+++ b/openembedded/packages/xext/xext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r1"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Extension library"
@@ -10,12 +10,6 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
 
 inherit autotools pkgconfig 
-
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xextensions/xextensions_1.0.1.bb b/openembedded/packages/xextensions/xextensions_1.0.1.bb
index 233d0c33b..134614bd0 100644
--- a/openembedded/packages/xextensions/xextensions_1.0.1.bb
+++ b/openembedded/packages/xextensions/xextensions_1.0.1.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/xextensions-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xfont/xfont_1.4.2.bb b/openembedded/packages/xfont/xfont_1.4.2.bb
index 9f8720749..7ef1d2b17 100644
--- a/openembedded/packages/xfont/xfont_1.4.2.bb
+++ b/openembedded/packages/xfont/xfont_1.4.2.bb
@@ -14,9 +14,5 @@ S = "${WORKDIR}/libXfont-${PV}"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xfont/xfont_cvs.bb b/openembedded/packages/xfont/xfont_cvs.bb
index dac69e2e2..1873d74df 100644
--- a/openembedded/packages/xfont/xfont_cvs.bb
+++ b/openembedded/packages/xfont/xfont_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
@@ -13,9 +13,5 @@ S = "${WORKDIR}/Xfont"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb
index 7245e7164..d25560493 100644
--- a/openembedded/packages/xhost/xhost_20040413.bb
+++ b/openembedded/packages/xhost/xhost_20040413.bb
@@ -1,13 +1,13 @@
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 LICENSE = "MIT"
-PV = "0.0cvs${FIXEDCVSDATE}"
+PV = "0.0+cvs${FIXEDSRCDATE}"
 DEPENDS = "x11 xext xmu"
 DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xhost"
 
diff --git a/openembedded/packages/xmodmap/xmodmap_cvs.bb b/openembedded/packages/xmodmap/xmodmap_cvs.bb
index 890e70d95..6c00f069c 100644
--- a/openembedded/packages/xmodmap/xmodmap_cvs.bb
+++ b/openembedded/packages/xmodmap/xmodmap_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
diff --git a/openembedded/packages/xmu/xmu_cvs.bb b/openembedded/packages/xmu/xmu_cvs.bb
index c7e5f8461..7cf267dbb 100644
--- a/openembedded/packages/xmu/xmu_cvs.bb
+++ b/openembedded/packages/xmu/xmu_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 PRIORITY = "optional"
diff --git a/openembedded/packages/xpm/xpm_cvs.bb b/openembedded/packages/xpm/xpm_cvs.bb
index 342fdfaa9..e23928023 100644
--- a/openembedded/packages/xpm/xpm_cvs.bb
+++ b/openembedded/packages/xpm/xpm_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "X-BSD"
 SECTION = "x11/libs"
 PRIORITY = "optional"
diff --git a/openembedded/packages/xproto/xproto_6.6.2.bb b/openembedded/packages/xproto/xproto_6.6.2.bb
index b98214448..b5cf75105 100644
--- a/openembedded/packages/xproto/xproto_6.6.2.bb
+++ b/openembedded/packages/xproto/xproto_6.6.2.bb
@@ -9,9 +9,5 @@ S = "${WORKDIR}/xproto-${PV}"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xproto/xproto_cvs.bb b/openembedded/packages/xproto/xproto_cvs.bb
index 00bfb15d5..b5ecf2d7e 100644
--- a/openembedded/packages/xproto/xproto_cvs.bb
+++ b/openembedded/packages/xproto/xproto_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "MIT"
 SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
@@ -11,10 +11,5 @@ inherit autotools pkgconfig
 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DATADIR}/man
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xrandr/xrandr_cvs.bb b/openembedded/packages/xrandr/xrandr_cvs.bb
index 36613de98..ea6c71c6a 100644
--- a/openembedded/packages/xrandr/xrandr_cvs.bb
+++ b/openembedded/packages/xrandr/xrandr_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 DEPENDS = "libxrandr x11 xext"
 DESCRIPTION = "X Resize and Rotate extension command."
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 2980e7762..6ebbd2ce4 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
@@ -1,5 +1,5 @@
-PV = "0.0cvs${FIXEDCVSDATE}"
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 DEFAULT_PREFERENCE = "1"
 
 LICENSE = "MIT"
@@ -33,12 +33,12 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
 FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
 	file://kmode.patch;patch=1 \
 	file://disable-apm.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1 "
 
-SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
+SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
         file://kmode.patch;patch=1 \
         file://faster-rotated.patch;patch=1 \
         file://fbdev-not-fix.patch;patch=1 "
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
index 78e77a23a..7c8949a89 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
@@ -1,5 +1,5 @@
-PV = "0.0cvs${FIXEDCVSDATE}"
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
@@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
 FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
 	file://kmode.patch;patch=1 \
 	file://no-serial-probing.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
diff --git a/openembedded/packages/xserver/xserver-kdrive_cvs.bb b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
index dfdbdc451..241f17565 100644
--- a/openembedded/packages/xserver/xserver-kdrive_cvs.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
 LICENSE = "MIT"
diff --git a/openembedded/packages/xserver/xserver-xorg_cvs.bb b/openembedded/packages/xserver/xserver-xorg_cvs.bb
index 3f7f8afe0..9c52864be 100644
--- a/openembedded/packages/xserver/xserver-xorg_cvs.bb
+++ b/openembedded/packages/xserver/xserver-xorg_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "Xorg"
 RPROVIDES = "virtual/xserver"
 PROVIDES = "virtual/xserver"
 PR = "r3"
-PV = "6.8.1+cvs${CVSDATE}"
+PV = "6.8.1+cvs${SRCDATE}"
 
 DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
 
diff --git a/openembedded/packages/xt/xt_0.1.5.bb b/openembedded/packages/xt/xt_0.1.5.bb
index 1d0d79458..52235e2d9 100644
--- a/openembedded/packages/xt/xt_0.1.5.bb
+++ b/openembedded/packages/xt/xt_0.1.5.bb
@@ -24,5 +24,5 @@ do_compile() {
 }
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xtrans/xtrans_0.1.bb b/openembedded/packages/xtrans/xtrans_0.1.bb
index 67bd3a2f3..8fee0d508 100644
--- a/openembedded/packages/xtrans/xtrans_0.1.bb
+++ b/openembedded/packages/xtrans/xtrans_0.1.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXtrans-${PV}"
 inherit autotools  pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xtrans/xtrans_cvs.bb b/openembedded/packages/xtrans/xtrans_cvs.bb
index fbad3f023..86d534668 100644
--- a/openembedded/packages/xtrans/xtrans_cvs.bb
+++ b/openembedded/packages/xtrans/xtrans_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
 SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
@@ -12,9 +12,5 @@ S = "${WORKDIR}/xtrans"
 inherit autotools  pkgconfig
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/xtst/xtst_cvs.bb b/openembedded/packages/xtst/xtst_cvs.bb
index 29119dfe8..fab1ee206 100644
--- a/openembedded/packages/xtst/xtst_cvs.bb
+++ b/openembedded/packages/xtst/xtst_cvs.bb
@@ -1,8 +1,7 @@
 LICENSE = "GPL"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "x11 recordext xext"
 DESCRIPTION = "X Test Extension: client side library"
 PR = "r3"
@@ -13,9 +12,5 @@ S = "${WORKDIR}/Xtst"
 inherit autotools pkgconfig 
 
 do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	autotools_stage_all
 }