various packages: bump PR for the rpath fixes to take effect. slightly clean up metadata.

Signed-off-by: Rene Wagner <rw@handhelds.org>

30 files changed, 88 insertions, 77 deletions

diff --git a/org.handhelds.familiar/packages/fontconfig/fontconfig_2.2.95.bb b/org.handhelds.familiar/packages/fontconfig/fontconfig_2.2.95.bb
index dbde86f..252a0b5 100644
--- a/org.handhelds.familiar/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/org.handhelds.familiar/packages/fontconfig/fontconfig_2.2.95.bb
@@ -6,7 +6,7 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
 SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
            file://fc-glyphname.patch;patch=1 \
            file://fc-lang.patch;patch=1"
-PR = "r5"
+PR = "r6"
 
 PACKAGES =+ "fontconfig-utils"
 FILES_fontconfig-utils = "${bindir}/*"
diff --git a/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
index df015cc..97be232 100644
--- a/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 CVSDATE_${PN} = "20050904"
 PV = "2.0.0-cvs-mco1-${CVSDATE}"
 
diff --git a/org.handhelds.familiar/packages/gnome/gconf-dbus_cvs.bb b/org.handhelds.familiar/packages/gnome/gconf-dbus_cvs.bb
index 19b461f..afe26b5 100644
--- a/org.handhelds.familiar/packages/gnome/gconf-dbus_cvs.bb
+++ b/org.handhelds.familiar/packages/gnome/gconf-dbus_cvs.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "0.0cvs${CVSDATE}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \
diff --git a/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index 2e5f18b..51abcfa 100644
--- a/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg"
 
diff --git a/org.handhelds.familiar/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/org.handhelds.familiar/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
index 4a09fb8..365a73e 100644
--- a/org.handhelds.familiar/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
+++ b/org.handhelds.familiar/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
@@ -1,13 +1,13 @@
-SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
 DESCRIPTION = "A lightweight webbrowser for the GPE platform"
 LICENSE = "GPL"
-DEPENDS = "osb-nrcit sqlite libgpewidget"
-RRECOMMENDS =   "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
+PR = "r1"
 
+DEPENDS = "osb-nrcit sqlite libgpewidget"
+RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
-inherit autotools
+inherit gpe autotools
 
 do_install() {
 		install -d ${D}/usr/share/applications
diff --git a/org.handhelds.familiar/packages/gpesyncd/gpesyncd_cvs.bb b/org.handhelds.familiar/packages/gpesyncd/gpesyncd_cvs.bb
index fbc5953..7afbb9e 100644
--- a/org.handhelds.familiar/packages/gpesyncd/gpesyncd_cvs.bb
+++ b/org.handhelds.familiar/packages/gpesyncd/gpesyncd_cvs.bb
@@ -1,15 +1,14 @@
-LICENSE =	"GPL"
-DESCRIPTION =	"Sync daemon for GPE and OpenSync"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+DESCRIPTION = "Sync daemon for GPE and OpenSync"
+LICENSE = "GPL"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 
+PV = "0.0+cvs-${CVSDATE}"
+PR = "r1"
 
-SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/gpesyncd"
+DEPENDS = "libgpevtype sqlite libmimedir glib-2.0"
 
-DEPENDS =	"libgpevtype sqlite libmimedir glib-2.0"
-
-S =		"${WORKDIR}/${PN}"
-PV =		"0.0+cvs-${CVSDATE}"
-PR =		"r0"
+SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpesyncd"
+S = "${WORKDIR}/${PN}"
 
 inherit autotools
 
diff --git a/org.handhelds.familiar/packages/gstreamer/gstreamer_0.8.9.bb b/org.handhelds.familiar/packages/gstreamer/gstreamer_0.8.9.bb
index 02e93b7..ee382b4 100644
--- a/org.handhelds.familiar/packages/gstreamer/gstreamer_0.8.9.bb
+++ b/org.handhelds.familiar/packages/gstreamer/gstreamer_0.8.9.bb
@@ -1,11 +1,10 @@
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound."
+SECTION = "base"
+PRIORITY = "optional"
 LICENSE = "LGPL"
-PR = "r4"
+PR = "r5"
 
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 DEPENDS = "glib-2.0 gettext-native popt"
-SECTION = "base"
-PRIORITY = "optional"
 
 FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
 FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
@@ -21,12 +20,7 @@ EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loa
 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_DIR}/share/man
+	autotools_stage_all
 }
 
 do_install_append() {
diff --git a/org.handhelds.familiar/packages/gtk-webcore/osb-jscore_20050430.bb b/org.handhelds.familiar/packages/gtk-webcore/osb-jscore_20050430.bb
index d7bf8cb..7022227 100644
--- a/org.handhelds.familiar/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/org.handhelds.familiar/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -7,7 +7,7 @@ SECTION = "gpe"
 
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDCVSDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDCVSDATE} \
            file://libm.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/gtk-webcore/osb-nrcit_20050430.bb b/org.handhelds.familiar/packages/gtk-webcore/osb-nrcit_20050430.bb
index 6daa6a2..3ac7b25 100644
--- a/org.handhelds.familiar/packages/gtk-webcore/osb-nrcit_20050430.bb
+++ b/org.handhelds.familiar/packages/gtk-webcore/osb-nrcit_20050430.bb
@@ -7,7 +7,7 @@ SECTION = "gpe"
 
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDCVSDATE}"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "curl librsvg osb-nrcore"
 
diff --git a/org.handhelds.familiar/packages/gtk-webcore/osb-nrcore_20050430.bb b/org.handhelds.familiar/packages/gtk-webcore/osb-nrcore_20050430.bb
index d0a1038..d4642a3 100644
--- a/org.handhelds.familiar/packages/gtk-webcore/osb-nrcore_20050430.bb
+++ b/org.handhelds.familiar/packages/gtk-webcore/osb-nrcore_20050430.bb
@@ -7,7 +7,7 @@ SECTION = "gpe"
 
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDCVSDATE}"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
 
diff --git a/org.handhelds.familiar/packages/libcontactsdb/libcontactsdb_0.3.bb b/org.handhelds.familiar/packages/libcontactsdb/libcontactsdb_0.3.bb
index 93950a3..bced341 100644
--- a/org.handhelds.familiar/packages/libcontactsdb/libcontactsdb_0.3.bb
+++ b/org.handhelds.familiar/packages/libcontactsdb/libcontactsdb_0.3.bb
@@ -4,8 +4,8 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR = "r1"
 
-PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit autotools gpe pkgconfig
diff --git a/org.handhelds.familiar/packages/libeventdb/libeventdb_0.21.bb b/org.handhelds.familiar/packages/libeventdb/libeventdb_0.21.bb
index 2db316c..33b7881 100644
--- a/org.handhelds.familiar/packages/libeventdb/libeventdb_0.21.bb
+++ b/org.handhelds.familiar/packages/libeventdb/libeventdb_0.21.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "Database access library for GPE calendar"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/org.handhelds.familiar/packages/libgpepimc/libgpepimc.inc b/org.handhelds.familiar/packages/libgpepimc/libgpepimc.inc
index 8d0711e..0447d5f 100644
--- a/org.handhelds.familiar/packages/libgpepimc/libgpepimc.inc
+++ b/org.handhelds.familiar/packages/libgpepimc/libgpepimc.inc
@@ -1,5 +1,4 @@
 LICENSE     = "LGPL"
-PR          = "r0"
 DESCRIPTION = "Common code for GPE PIMs"
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
diff --git a/org.handhelds.familiar/packages/libgpepimc/libgpepimc_0.6.bb b/org.handhelds.familiar/packages/libgpepimc/libgpepimc_0.6.bb
index 9fb9d9a..d4556d6 100644
--- a/org.handhelds.familiar/packages/libgpepimc/libgpepimc_0.6.bb
+++ b/org.handhelds.familiar/packages/libgpepimc/libgpepimc_0.6.bb
@@ -1 +1,3 @@
 include libgpepimc.inc
+
+PR = "r1"
diff --git a/org.handhelds.familiar/packages/libgpevtype/libgpevtype_0.15.bb b/org.handhelds.familiar/packages/libgpevtype/libgpevtype_0.15.bb
index a2639f4..01392e3 100644
--- a/org.handhelds.familiar/packages/libgpevtype/libgpevtype_0.15.bb
+++ b/org.handhelds.familiar/packages/libgpevtype/libgpevtype_0.15.bb
@@ -4,12 +4,11 @@ SECTION     = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "libmimedir libeventdb"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>
-PR          = "r0"
+PR          = "r1"
 
+GPE_TARBALL_SUFFIX = "bz2"
 inherit pkgconfig gpe autotools
 
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
 headers = "tag-db.h vcard.h vevent.h vtodo.h"
 
 
diff --git a/org.handhelds.familiar/packages/libmimedir/libmimedir_cvs.bb b/org.handhelds.familiar/packages/libmimedir/libmimedir_cvs.bb
index aac0481..fbbe0f4 100644
--- a/org.handhelds.familiar/packages/libmimedir/libmimedir_cvs.bb
+++ b/org.handhelds.familiar/packages/libmimedir/libmimedir_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-PR = "r4"
+PR = "r5"
 PV = "0.3.1+cvs-${CVSDATE}"
 
 DEFAULT_PREFERENCE = 1
diff --git a/org.handhelds.familiar/packages/libschedule/libschedule_0.15.bb b/org.handhelds.familiar/packages/libschedule/libschedule_0.15.bb
index ef57a74..66b5f4e 100644
--- a/org.handhelds.familiar/packages/libschedule/libschedule_0.15.bb
+++ b/org.handhelds.familiar/packages/libschedule/libschedule_0.15.bb
@@ -1,10 +1,10 @@
-LICENSE = "LGPL"
-PR = "r3"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
+LICENSE = "LGPL"
+PR = "r4"
+
 DEPENDS = "glib-2.0 sqlite"
-GPE_TARBALL_SUFFIX = "gz"
 
 inherit autotools pkgconfig gpe 
 
diff --git a/org.handhelds.familiar/packages/libschedule/libschedule_0.16.bb b/org.handhelds.familiar/packages/libschedule/libschedule_0.16.bb
index ab71dd4..e2c5bd0 100644
--- a/org.handhelds.familiar/packages/libschedule/libschedule_0.16.bb
+++ b/org.handhelds.familiar/packages/libschedule/libschedule_0.16.bb
@@ -1,11 +1,12 @@
-LICENSE = "LGPL"
-PR = "r0"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
+LICENSE = "LGPL"
+PR = "r1"
+
 DEPENDS = "glib-2.0 sqlite"
-GPE_TARBALL_SUFFIX = "bz2"
 
+GPE_TARBALL_SUFFIX = "bz2"
 inherit autotools pkgconfig gpe 
 
 
diff --git a/org.handhelds.familiar/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/org.handhelds.familiar/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 85dee09..7c2bed8 100644
--- a/org.handhelds.familiar/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/org.handhelds.familiar/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "Matchbox input manager"
 LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
+PR = "r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz"
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+FILES_${PN} = "${bindir} \
+               ${datadir}/applications \
+               ${datadir}/pixmaps"
  
diff --git a/org.handhelds.familiar/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/org.handhelds.familiar/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 43d9d0c..fb1a253 100644
--- a/org.handhelds.familiar/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/org.handhelds.familiar/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -13,7 +13,7 @@ FILES_${PN}-control = "${bindir}/rxvtc"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch;patch=1 \
 	   file://signedchar.patch;patch=1"
-PR = "r3"
+PR = "r4"
 
 inherit autotools update-alternatives
 
diff --git a/org.handhelds.familiar/packages/sylpheed/sylpheed_1.9.12.bb b/org.handhelds.familiar/packages/sylpheed/sylpheed_1.9.12.bb
index 00da790..f8c9f03 100644
--- a/org.handhelds.familiar/packages/sylpheed/sylpheed_1.9.12.bb
+++ b/org.handhelds.familiar/packages/sylpheed/sylpheed_1.9.12.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \
 	file://sylpheed-gnutls.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/xauth/xauth_cvs.bb b/org.handhelds.familiar/packages/xauth/xauth_cvs.bb
index ff615a5..74ed8a4 100644
--- a/org.handhelds.familiar/packages/xauth/xauth_cvs.bb
+++ b/org.handhelds.familiar/packages/xauth/xauth_cvs.bb
@@ -1,10 +1,12 @@
-PV = "0.0cvs${CVSDATE}"
-LICENSE = "MIT"
-DEPENDS = "x11 xau xmu xext"
 DESCRIPTION = "X authority file utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r2"
+LICENSE = "MIT"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r3"
+
+DEPENDS = "x11 xau xmu xext"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \
            file://autofoo.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/xhost/xhost_20040413.bb b/org.handhelds.familiar/packages/xhost/xhost_20040413.bb
index 7245e71..0450105 100644
--- a/org.handhelds.familiar/packages/xhost/xhost_20040413.bb
+++ b/org.handhelds.familiar/packages/xhost/xhost_20040413.bb
@@ -1,11 +1,13 @@
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-LICENSE = "MIT"
-PV = "0.0cvs${FIXEDCVSDATE}"
-DEPENDS = "x11 xext xmu"
 DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r2"
+LICENSE = "MIT"
+
+FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.0cvs${FIXEDCVSDATE}"
+PR = "r3"
+
+DEPENDS = "x11 xext xmu"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \
            file://autofoo.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb b/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb
index 786ce5f..312a719 100644
--- a/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb
+++ b/org.handhelds.familiar/packages/xkbd/xkbd_0.8.15.bb
@@ -1,14 +1,16 @@
+DESCRIPTION = "A small, highly configurable virtual on-screen keyboard for X11"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "x11"
+LICENSE = "GPL"
+PR = "r3"
+
+DEPENDS = "xpm xtst libxft"
+
 SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
            file://libtool-lossage.patch;patch=1;pnum=1 \
 	   file://fix-equalsign.patch;patch=1 \
 	   file://fix-circumkey.patch;patch=1 \
 	   file://xkbd.png"
-LICENSE = "GPL"
-PR = "r2"
-
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "x11"
-DEPENDS = "xpm xtst libxft"
 
 inherit autotools
 
diff --git a/org.handhelds.familiar/packages/xmodmap/xmodmap_cvs.bb b/org.handhelds.familiar/packages/xmodmap/xmodmap_cvs.bb
index 890e70d..0108133 100644
--- a/org.handhelds.familiar/packages/xmodmap/xmodmap_cvs.bb
+++ b/org.handhelds.familiar/packages/xmodmap/xmodmap_cvs.bb
@@ -1,9 +1,10 @@
-PV = "0.0cvs${CVSDATE}"
-LICENSE = "MIT"
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r1"
+LICENSE = "MIT"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r2"
 
 DEPENDS = "x11"
 
diff --git a/org.handhelds.familiar/packages/xrandr/xrandr_cvs.bb b/org.handhelds.familiar/packages/xrandr/xrandr_cvs.bb
index 36613de..ec029e5 100644
--- a/org.handhelds.familiar/packages/xrandr/xrandr_cvs.bb
+++ b/org.handhelds.familiar/packages/xrandr/xrandr_cvs.bb
@@ -1,8 +1,11 @@
-PV = "0.0cvs${CVSDATE}"
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr x11 xext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
+LICENSE= "BSD-X"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r1"
+
+DEPENDS = "libxrandr x11 xext"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xrandr"
 S = "${WORKDIR}/xrandr"
diff --git a/org.handhelds.familiar/packages/xrdb/xrdb_cvs.bb b/org.handhelds.familiar/packages/xrdb/xrdb_cvs.bb
index d5c954b..6907a3e 100644
--- a/org.handhelds.familiar/packages/xrdb/xrdb_cvs.bb
+++ b/org.handhelds.familiar/packages/xrdb/xrdb_cvs.bb
@@ -1,10 +1,12 @@
-PV = "0.0cvs${CVSDATE}"
-DEPENDS = "x11 xmu xext"
 DESCRIPTION = "X server resource database utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "xrdb"
-PR = "r2"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r3"
+
+DEPENDS = "x11 xmu xext"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xrdb \
            file://autofoo.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/xset/xset_20040817.bb b/org.handhelds.familiar/packages/xset/xset_20040817.bb
index 65986e3..933c07c 100644
--- a/org.handhelds.familiar/packages/xset/xset_20040817.bb
+++ b/org.handhelds.familiar/packages/xset/xset_20040817.bb
@@ -1,18 +1,18 @@
 DESCRIPTION = "user preference utility for X"
 LICENSE = "MIT"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+SECTION = "x11/base"
+
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.0cvs${FIXEDCVSDATE}"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "x11 xext xextensions xmu"
 
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xset;date=${FIXEDCVSDATE} \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xset"
 
 inherit autotools pkgconfig 
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/org.handhelds.familiar/packages/xstroke/xstroke_0.6.bb b/org.handhelds.familiar/packages/xstroke/xstroke_0.6.bb
index 31542e8..8ea1e53 100644
--- a/org.handhelds.familiar/packages/xstroke/xstroke_0.6.bb
+++ b/org.handhelds.familiar/packages/xstroke/xstroke_0.6.bb
@@ -3,8 +3,9 @@ LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR = "r3"
+
 DEPENDS = "x11 xft xtst xpm"
-PR = "r2"
 
 SRC_URI = "http://www.oesources.org/source/xstroke-0.6.tar.gz \
 	file://auto-disable.patch;patch=1;pnum=0"
diff --git a/org.handhelds.familiar/packages/xtscal/xtscal_0.6.3.bb b/org.handhelds.familiar/packages/xtscal/xtscal_0.6.3.bb
index a2a770f..e71d32c 100644
--- a/org.handhelds.familiar/packages/xtscal/xtscal_0.6.3.bb
+++ b/org.handhelds.familiar/packages/xtscal/xtscal_0.6.3.bb
@@ -2,10 +2,10 @@ LICENSE = "GPL"
 DESCRIPTION = "Touchscreen calibration utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
+PR = "r2"
 
 DEPENDS = "x11 libxft libxrandr xcalibrate"
 
-PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
            file://xtscal-cxk.patch;patch=1"