Merge branch 'shared/file-pr-revert' into org.openembedded.dev

Conflicts:

	packages/busybox/busybox_1.11.3.bb
	packages/dsplink/codec-engine_2.10.bb
	packages/gdb/gdb_6.3.bb
	packages/gdb/gdb_6.4.bb
	packages/gdb/gdb_6.6.bb
	packages/gdb/gdb_6.8.bb
	packages/glibc/glibc_2.2.5.bb
	packages/glibc/glibc_2.3.2+cvs20040726.bb
	packages/glibc/glibc_2.3.2.bb
	packages/glibc/glibc_2.3.3+cvs20041128.bb
	packages/glibc/glibc_2.3.3+cvs20050221.bb
	packages/glibc/glibc_2.3.3+cvs20050420.bb
	packages/glibc/glibc_2.3.3.bb
	packages/glibc/glibc_2.3.5+cvs20050627.bb
	packages/glibc/glibc_2.3.6.bb
	packages/glibc/glibc_2.4.bb
	packages/glibc/glibc_2.5.bb
	packages/glibc/glibc_2.6.1.bb
	packages/glibc/glibc_2.7.bb
	packages/kexecboot/linux-kexecboot_2.6.26.bb
	packages/libsdl/libsdl-x11_1.2.11.bb
	packages/linux/linux-rp_2.6.26.bb
	packages/mozilla/fennec_hg.bb
	packages/python/python_2.5.2.bb
	packages/tasks/task-xfce-base.bb
	packages/xorg-driver/xf86-video-omapfb_git.bb
	packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb

3289 files changed, 3304 insertions, 3299 deletions

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0601885046..15574f6ced 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -4,6 +4,12 @@
 
 PKGDEST = "${WORKDIR}/install"
 
+def build_package_revision(d):
+	file_pr = bb.data.getVar('PR', d, True)
+	distro_pr = bb.data.getVar('DISTRO_PR', d, True) or ""
+	return "%s%s" % (file_pr, distro_pr)
+
+
 def legitimize_package_name(s):
 	"""
 	Make sure package names are legitimate strings
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index e59d194aeb..64d8d4ed5d 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -131,7 +131,7 @@ python do_package_deb () {
             pass
         if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
             from bb import note
-            note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+            note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), build_package_revision(localdata)))
             bb.utils.unlockfile(lf)
             continue
 
@@ -149,9 +149,9 @@ python do_package_deb () {
         fields = []
         pe = bb.data.getVar('PE', d, 1)
         if pe and int(pe) > 0:
-            fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
+            fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']])
         else:
-            fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+            fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']])
         fields.append(["Description: %s\n", ['DESCRIPTION']])
         fields.append(["Section: %s\n", ['SECTION']])
         fields.append(["Priority: %s\n", ['PRIORITY']])
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index f05b7449cf..438d4a15da 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -178,7 +178,7 @@ python do_package_ipk () {
 			pass
 		if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
 			from bb import note
-			note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+			note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), build_package_revision(localdata)))
 			bb.utils.unlockfile(lf)
 			continue
 
@@ -193,9 +193,9 @@ python do_package_ipk () {
 		fields = []
 		pe = bb.data.getVar('PE', d, 1)
 		if pe and int(pe) > 0:
-			fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
+			fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']])
 		else:
-			fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+			fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']])
 		fields.append(["Description: %s\n", ['DESCRIPTION']])
 		fields.append(["Section: %s\n", ['SECTION']])
 		fields.append(["Priority: %s\n", ['PRIORITY']])
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 6713f8fcad..e10ad90ffc 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -10,7 +10,6 @@ python write_specfile() {
 	out_vartranslate = {
 		"PKG": "Name",
 		"PV": "Version",
-		"PR": "Release",
 		"DESCRIPTION": "%description",
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
@@ -41,7 +40,7 @@ python write_specfile() {
 			pass
 	if not files:
 		from bb import note
-		note("Not creating empty archive for %s-%s-%s" % (bb.data.getVar('PKG',d, 1), bb.data.getVar('PV', d, 1), bb.data.getVar('PR', d, 1)))
+		note("Not creating empty archive for %s-%s-%s" % (bb.data.getVar('PKG',d, 1), bb.data.getVar('PV', d, 1), build_package_revision(d)))
 		return
 
 	# output .spec using this metadata store
@@ -58,6 +57,7 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		fd.write("%s\t: %s\n" % (out_vartranslate[var], bb.data.getVar(var, d)))
+        fd.write("Release\t: %s\n" % build_package_revision(d))
 	fd.write("Summary\t: .\n")
 
 	for var in out_vartranslate.keys():
@@ -79,8 +79,8 @@ python write_specfile() {
 	bb.build.exec_func('BUILDSPEC', d)
 
 	# move the rpm into the pkgoutdir
-	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${PV}-${PR}.${TARGET_ARCH}.rpm', d)
-	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${PV}-${PR}.${TARGET_ARCH}.rpm', d)
+	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
+	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
 	bb.movefile(rpm, outrpm)
 }
 
diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index 876cec6cfe..9ce0c98b8b 100644
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -5,7 +5,7 @@ IMAGE_PKGTYPE ?= "tar"
 python package_tar_fn () {
 	import os
 	from bb import data
-	fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PV', d), bb.data.getVar('PR', d)))
+	fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PV', d), build_package_revision(d)))
 	fn = bb.data.expand(fn, d)
 	bb.data.setVar('PKGFN', fn, d)
 }
@@ -86,7 +86,7 @@ python do_package_tar () {
 		os.chdir(root)
 		from glob import glob
 		if not glob('*'):
-			bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+			bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), build_package_revision(localdata)))
 			continue
 		ret = os.system("tar -czf %s %s" % (tarfn, '.'))
 		if ret != 0:
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 93064b0a30..e118245f29 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -135,8 +135,7 @@ ASSUME_PROVIDED = "\
 ##################################################################
 PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
 PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
-FILE_PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
-PR = "${FILE_PR}${DISTRO_PR}"
+PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
 EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
 EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb
index 5b00fdc03f..ed6ee78186 100644
--- a/packages/aalib/aalib_1.4rc5.bb
+++ b/packages/aalib/aalib_1.4rc5.bb
@@ -2,7 +2,7 @@ DEPENDS = "ncurses"
 DESCRIPTION = "An ASCII art gfx library."
 SECTION = "libs"
 LICENSE="LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb
index 672a807544..41652828bf 100644
--- a/packages/abiword/abiword-plugins_2.4.6.bb
+++ b/packages/abiword/abiword-plugins_2.4.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libwpd librsvg goffice poppler"
 RDEPENDS = "abiword"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index b47577bb21..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index 2ff5db167d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "1"
 
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index 1edd9a6e63..58f712aca9 100644
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -6,7 +6,7 @@ DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfrib
 RDEPENDS    = "enchant "
 RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \
                    glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
 S = "${WORKDIR}/abiword-${PV}/abi"
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index ad5109618b..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
index 70b6c93432..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.6.3.bb b/packages/abiword/abiword_2.6.3.bb
index bb0c80c31e..fe6399226f 100644
--- a/packages/abiword/abiword_2.6.3.bb
+++ b/packages/abiword/abiword_2.6.3.bb
@@ -1,6 +1,6 @@
 require abiword-2.5.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"
 
diff --git a/packages/abiword/abiword_2.6.4.bb b/packages/abiword/abiword_2.6.4.bb
index c07256c33c..0dd2602571 100644
--- a/packages/abiword/abiword_2.6.4.bb
+++ b/packages/abiword/abiword_2.6.4.bb
@@ -1,6 +1,6 @@
 require abiword-2.5.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
 
diff --git a/packages/accelges/accelges_svn.bb b/packages/accelges/accelges_svn.bb
index 60afc69545..73c274a3d7 100644
--- a/packages/accelges/accelges_svn.bb
+++ b/packages/accelges/accelges_svn.bb
@@ -4,7 +4,7 @@ AUTHOR = "Paul V. Borza"
 LICENSE = "GPL"
 DEPENDS = "libnotify"
 PV = "0.2+svn${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://accelges.googlecode.com/svn/;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb
index 72217d51be..2a305eeac4 100644
--- a/packages/acpid/acpid_1.0.2.bb
+++ b/packages/acpid/acpid_1.0.2.bb
@@ -1,3 +1,3 @@
 require acpid.inc
-FILE_PR = "r2"
+PR = "r2"
 
diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb
index 78e35d4274..640acd5203 100644
--- a/packages/acpid/acpid_1.0.3.bb
+++ b/packages/acpid/acpid_1.0.3.bb
@@ -1,4 +1,4 @@
 require acpid.inc
 SRC_URI += "file://gcc40.patch;patch=1"
-FILE_PR = "r2"
+PR = "r2"
 
diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb
index eec084e1fd..f48c262254 100644
--- a/packages/acpid/acpid_1.0.4.bb
+++ b/packages/acpid/acpid_1.0.4.bb
@@ -1,4 +1,4 @@
 require acpid.inc
 SRC_URI += "file://gcc40.patch;patch=1"
-FILE_PR = "r3"
+PR = "r3"
 
diff --git a/packages/acpid/acpid_1.0.6.bb b/packages/acpid/acpid_1.0.6.bb
index 52423b2f7d..e096796fbd 100644
--- a/packages/acpid/acpid_1.0.6.bb
+++ b/packages/acpid/acpid_1.0.6.bb
@@ -1,3 +1,3 @@
 require acpid.inc
 
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb
index ba97192817..9ac6821e0e 100644
--- a/packages/addons/devshell.bb
+++ b/packages/addons/devshell.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools pkgconfig
 
diff --git a/packages/agg/agg-minimal_2.5.bb b/packages/agg/agg-minimal_2.5.bb
index 0f88a8fbc4..7d5979a609 100644
--- a/packages/agg/agg-minimal_2.5.bb
+++ b/packages/agg/agg-minimal_2.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "AGG License"
 DEPENDS = "freetype"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.antigrain.com/agg-${PV}.tar.gz"
 SRC_URI += "http://www.wxsvg.org/files/agg-2.5_cygming.patch;patch=1"
diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb
index 80c5dbe9c8..ba76a7b4c6 100644
--- a/packages/agg/agg_2.5.bb
+++ b/packages/agg/agg_2.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "AGG License"
 DEPENDS = "virtual/libx11 virtual/libsdl freetype"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.antigrain.com/${P}.tar.gz"
 S = "${WORKDIR}/${P}"
diff --git a/packages/aiostress/aiostress_0.0.bb b/packages/aiostress/aiostress_0.0.bb
index 009f1f3070..430e8a50ad 100644
--- a/packages/aiostress/aiostress_0.0.bb
+++ b/packages/aiostress/aiostress_0.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Asynchronous I/O stress util"
 LICENSE = "GPLv2"
 DEPENDS = "libaio"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://mirrors.easynews.com/linux/suse/people/mason/utils/aio-stress.c"
 
diff --git a/packages/aircrack/aircrack-ng_0.9.3.bb b/packages/aircrack/aircrack-ng_0.9.3.bb
index 0fa49b0eea..1452a64bc1 100644
--- a/packages/aircrack/aircrack-ng_0.9.3.bb
+++ b/packages/aircrack/aircrack-ng_0.9.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.aircrack-ng.org/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
 
diff --git a/packages/aircrack/aircrack-ng_1.0-svn.bb b/packages/aircrack/aircrack-ng_1.0-svn.bb
index 06caef326a..0f0f7f532d 100644
--- a/packages/aircrack/aircrack-ng_1.0-svn.bb
+++ b/packages/aircrack/aircrack-ng_1.0-svn.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "openssl zlib sqlite3"
 PV = "0.9.99+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http"
  
 S="${WORKDIR}/1.0-dev"
diff --git a/packages/aircrack/aircrack_2.1.bb b/packages/aircrack/aircrack_2.1.bb
index 6fef03e389..f4e6485351 100644
--- a/packages/aircrack/aircrack_2.1.bb
+++ b/packages/aircrack/aircrack_2.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.cr0.net:8040/code/network/aircrack/"
 LICENSE = "GPLv2"
 DEPENDS = ""
 PV="2.1"
-FILE_PR ="r0"
+PR ="r0"
 
 SRC_URI = "http://www.cr0.net:8040/code/network/aircrack-2.1.tgz \
 file://silent_patch.diff;patch=1;pnum=0"
diff --git a/packages/aircrack/aircrack_2.41.bb b/packages/aircrack/aircrack_2.41.bb
index f23b625d8d..723215e265 100644
--- a/packages/aircrack/aircrack_2.41.bb
+++ b/packages/aircrack/aircrack_2.41.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Aircrack is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.cr0.net:8040/code/network/aircrack/"
 LICENSE = "GPLv2"
 DEPENDS = ""
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://www.wirelessdefence.org/Contents/Files/${P}.tgz \
 		file://oe.patch;patch=1;pnum=1"
diff --git a/packages/aliens/aliens_1.0.0.bb b/packages/aliens/aliens_1.0.0.bb
index 7c685e4583..630654899d 100644
--- a/packages/aliens/aliens_1.0.0.bb
+++ b/packages/aliens/aliens_1.0.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "aliens.sdl"
 APPTYPE = "binary"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.billsgames.com/unix/agenda/aliens/src/aliens_V${PV}.tar.gz"
 S = "${WORKDIR}/aliens_V${PV}"
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index f832ef9cb9..53d898d030 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "(h3600|h3900)"
 DESCRIPTION = "Alsa Drivers"
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 DEPENDS += "fakeroot-native"
 
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 6a038796fe..b9169e608f 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
index edcfcc02a8..860ef11f18 100644
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/alsa/alsa-lib_1.0.14.bb b/packages/alsa/alsa-lib_1.0.14.bb
index 02ec75ece4..ba46342ae7 100644
--- a/packages/alsa/alsa-lib_1.0.14.bb
+++ b/packages/alsa/alsa-lib_1.0.14.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index b88b18fc8a..399352f299 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-FILE_PR = "1"
+PR = "1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb
index fe7455ddd7..9a7751ee6b 100644
--- a/packages/alsa/alsa-oss_1.0.11.bb
+++ b/packages/alsa/alsa-oss_1.0.11.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
 
diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb
index 54fc607331..de840e73fe 100644
--- a/packages/alsa/alsa-oss_1.0.15.bb
+++ b/packages/alsa/alsa-oss_1.0.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa OSS Compatibility Package"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
 	   file://libio.patch;patch=1 \
diff --git a/packages/alsa/alsa-plugins_1.0.15.bb b/packages/alsa/alsa-plugins_1.0.15.bb
index 60fad6fc5f..b17a3265e8 100644
--- a/packages/alsa/alsa-plugins_1.0.15.bb
+++ b/packages/alsa/alsa-plugins_1.0.15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "multimedia/alsa/plugins"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib pulseaudio"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2"
 
diff --git a/packages/alsa/alsa-plugins_1.0.17.bb b/packages/alsa/alsa-plugins_1.0.17.bb
index 60fad6fc5f..b17a3265e8 100644
--- a/packages/alsa/alsa-plugins_1.0.17.bb
+++ b/packages/alsa/alsa-plugins_1.0.17.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "multimedia/alsa/plugins"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib pulseaudio"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2"
 
diff --git a/packages/alsa/alsa-scenario_git.bb b/packages/alsa/alsa-scenario_git.bb
index 43d37ddf0f..02edd31619 100644
--- a/packages/alsa/alsa-scenario_git.bb
+++ b/packages/alsa/alsa-scenario_git.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 PV = "0.1+git${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git"
 S = "${WORKDIR}/git"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index b2bcbdd92c..58c724f79c 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -7,7 +7,7 @@
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 PV = "0.1.0"
-FILE_PR = "r18"
+PR = "r18"
 
 SRC_URI = "\
   file://asound.conf \
diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb
index 82ea73c8ed..d2acfe1995 100644
--- a/packages/alsa/alsa-utils_1.0.11.bb
+++ b/packages/alsa/alsa-utils_1.0.11.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 
diff --git a/packages/alsa/alsa-utils_1.0.13.bb b/packages/alsa/alsa-utils_1.0.13.bb
index 794382ce1d..1e6af1ec09 100644
--- a/packages/alsa/alsa-utils_1.0.13.bb
+++ b/packages/alsa/alsa-utils_1.0.13.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 
diff --git a/packages/alsa/alsa-utils_1.0.14.bb b/packages/alsa/alsa-utils_1.0.14.bb
index 01b2f9c87d..25eeade7cd 100644
--- a/packages/alsa/alsa-utils_1.0.14.bb
+++ b/packages/alsa/alsa-utils_1.0.14.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
 	   file://alsa-utils-automake.patch;patch=1 \
diff --git a/packages/alsa/alsa-utils_1.0.15.bb b/packages/alsa/alsa-utils_1.0.15.bb
index 90665c8900..b271e75439 100644
--- a/packages/alsa/alsa-utils_1.0.15.bb
+++ b/packages/alsa/alsa-utils_1.0.15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://alsa-utils-automake.patch;patch=1 \
diff --git a/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb b/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
index ec351b23b1..3890e68893 100644
--- a/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
+++ b/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 #RDEPENDS_${PN}_append_poodle = " kexec-tools"
 #RDEPENDS_${PN}-conf = "${PN}"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SVN_REV="65"
 #TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 7675425763..3e18111a5b 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -1,6 +1,6 @@
 require altboot.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
 SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR83.bb b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb
index 52189ccb2b..b9056e655a 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR83.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb
@@ -1,6 +1,6 @@
 require altboot.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SVN_REV = "83"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index a591c83f94..85a7fe612f 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -1,7 +1,7 @@
 require altboot.inc
 
 PV = "1.1.1+wip-${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;proto=svn"
 
diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index d3bf1f2338..fc6c9c59ce 100644
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-FILE_PR = "r6"
+PR = "r6"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb
index 5e9c488c71..0a4b1309da 100644
--- a/packages/angstrom/angstrom-gpe-task-apps.bb
+++ b/packages/angstrom/angstrom-gpe-task-apps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index 3d91edaf47..656180d4b3 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r36"
+PR = "r36"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb
index 8fe615c1da..beca89cdbc 100644
--- a/packages/angstrom/angstrom-gpe-task-game.bb
+++ b/packages/angstrom/angstrom-gpe-task-game.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb
index f8cfa6597e..fc0b4109f4 100644
--- a/packages/angstrom/angstrom-gpe-task-pim.bb
+++ b/packages/angstrom/angstrom-gpe-task-pim.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index ff50ec14e8..adc4bb0756 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r33"
+PR = "r33"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb
index f6bc02919f..12cdb96d93 100644
--- a/packages/angstrom/angstrom-led-config.bb
+++ b/packages/angstrom/angstrom-led-config.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for runtime LED configuration" 
 
 #PV = "${DISTRO_VERSION}"
-FILE_PR = "r4"
+PR = "r4"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb
index 450df4ab60..71d0512687 100644
--- a/packages/angstrom/angstrom-ohand-task-pim.bb
+++ b/packages/angstrom/angstrom-ohand-task-pim.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb
index e2c952fdd0..90b700b8c9 100644
--- a/packages/angstrom/angstrom-task-office.bb
+++ b/packages/angstrom/angstrom-task-office.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb
index b5446a7a06..f4a833645a 100644
--- a/packages/angstrom/angstrom-task-printing.bb
+++ b/packages/angstrom/angstrom-task-printing.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r32"
+PR = "r32"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb
index 653b629c92..bf8019da0d 100644
--- a/packages/angstrom/angstrom-task-sectest.bb
+++ b/packages/angstrom/angstrom-task-sectest.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r33"
+PR = "r33"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index ab46c8d67d..c4ea6e2a21 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,5 +1,5 @@
 PV = "${DISTRO_VERSION}"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index c9548464f5..e542e4232a 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r38"
+PR = "r38"
 
 inherit task
 
diff --git a/packages/angstrom/angstrom-zeroconf-audio.bb b/packages/angstrom/angstrom-zeroconf-audio.bb
index b8003903d5..2256b6ac4f 100644
--- a/packages/angstrom/angstrom-zeroconf-audio.bb
+++ b/packages/angstrom/angstrom-zeroconf-audio.bb
@@ -13,7 +13,7 @@ RDEPENDS = " \
   pulseaudio-module-zeroconf-publish \
 "
 
-FILE_PR = "r3"
+PR = "r3"
 
 S = "${WORKDIR}"
 
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
index fd79578e85..eb9f025743 100644
--- a/packages/angstrom/task-angstrom-e.bb
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-FILE_PR = "r0"
+PR = "r0"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/anki/anki_0.4.3.bb b/packages/anki/anki_0.4.3.bb
index aa7f3228fb..f3a62f3323 100644
--- a/packages/anki/anki_0.4.3.bb
+++ b/packages/anki/anki_0.4.3.bb
@@ -1,7 +1,7 @@
 require anki.inc
 
 RDEPENDS += "libanki"
-FILE_PR = "r1"
+PR = "r1"
 
 export PV := "${PV}"
 
diff --git a/packages/anki/libanki_0.4.3.bb b/packages/anki/libanki_0.4.3.bb
index d67d515eff..ac33833790 100644
--- a/packages/anki/libanki_0.4.3.bb
+++ b/packages/anki/libanki_0.4.3.bb
@@ -1,5 +1,5 @@
 require anki.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/anki-${PV}/libanki"
diff --git a/packages/anthy/anthy-native_9100e.bb b/packages/anthy/anthy-native_9100e.bb
index e9ab5734b7..38305ddf84 100644
--- a/packages/anthy/anthy-native_9100e.bb
+++ b/packages/anthy/anthy-native_9100e.bb
@@ -2,7 +2,7 @@ require anthy_${PV}.bb
 
 DEPENDS = ""
 PACKAGES = ""
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/anthy-${PV}"
 
diff --git a/packages/anthy/anthy_9100e.bb b/packages/anthy/anthy_9100e.bb
index 59826c9fbc..3b4b930211 100644
--- a/packages/anthy/anthy_9100e.bb
+++ b/packages/anthy/anthy_9100e.bb
@@ -9,7 +9,7 @@ SECTION_libanthy0 = "libs/inputmethods"
 SECTION_libanthy-dev = "devel/libs"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/29142/anthy-9100e.tar.gz \
            file://not_build_elc.patch;patch=1 \
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 246cc42f5e..c1f1303d56 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -1,7 +1,7 @@
 SECTION = "net"
 DEPENDS = "openssl expat libpcre"
 
-FILE_PR = "r4"
+PR = "r4"
 
 # ------------------------------------------
 # NOTE: This package is currently only meant
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index 0d766644b2..28e1fe6a18 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
 
 inherit cross 
 
-FILE_PR ="r7"
+PR ="r7"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb
index e25665e437..b6ec8f81f9 100644
--- a/packages/apache2/apache2_2.2.3.bb
+++ b/packages/apache2/apache2_2.2.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The apache v2 web server"
 DEPENDS = "apache2-native openssl expat pcre"
 RDEPENDS += "openssl"
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \
 	   file://dftables-makefile-patch;patch=1 \
diff --git a/packages/apex/apex-env_1.5.14.bb b/packages/apex/apex-env_1.5.14.bb
index 404c9a4aa0..e97522e5e9 100644
--- a/packages/apex/apex-env_1.5.14.bb
+++ b/packages/apex/apex-env_1.5.14.bb
@@ -3,7 +3,7 @@ SECTION = "misc"
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	file://find-apex-partition.patch;patch=1 \
diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb
index 82b076f976..a0e44346bb 100644
--- a/packages/apex/apex-env_1.5.8.bb
+++ b/packages/apex/apex-env_1.5.8.bb
@@ -3,7 +3,7 @@ SECTION = "util"
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	file://find-apex-partition.patch;patch=1 \
diff --git a/packages/apex/apex-nslu2-16mb_1.5.14.bb b/packages/apex/apex-nslu2-16mb_1.5.14.bb
index ebca156028..0ccf2eb5da 100644
--- a/packages/apex/apex-nslu2-16mb_1.5.14.bb
+++ b/packages/apex/apex-nslu2-16mb_1.5.14.bb
@@ -3,7 +3,7 @@ SECTION = "misc"
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
diff --git a/packages/apex/apex-nslu2_1.5.14.bb b/packages/apex/apex-nslu2_1.5.14.bb
index a29c0fe9b1..5fae4553a0 100644
--- a/packages/apex/apex-nslu2_1.5.14.bb
+++ b/packages/apex/apex-nslu2_1.5.14.bb
@@ -3,7 +3,7 @@ SECTION = "misc"
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 	   file://defconfig"
diff --git a/packages/apmd/apm-wifi-suspendfix_0.1.bb b/packages/apmd/apm-wifi-suspendfix_0.1.bb
index 9174058eae..ab9959f3f1 100644
--- a/packages/apmd/apm-wifi-suspendfix_0.1.bb
+++ b/packages/apmd/apm-wifi-suspendfix_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Hacky workaround for bug 3664 (some wifi cards don't recover from suspend) until a real fix is found"
 AUTHOR = "Rolf Leggewie"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "file://90-wifi-off"
 
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index c5c7802b79..503f830bd9 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
            file://debian.patch;patch=1 \
diff --git a/packages/application-registry/application-registry_0.1.bb b/packages/application-registry/application-registry_0.1.bb
index 3f5b3de489..1ebfbdd907 100644
--- a/packages/application-registry/application-registry_0.1.bb
+++ b/packages/application-registry/application-registry_0.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 DESCRIPTION = "additional application registry files"
 DEPENDS = "shared-mime-info"
diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb
index 48eb85410d..d5964added 100644
--- a/packages/apr/apr-util_0.9.12.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
            file://gen_uri_delims.patch;patch=1 \
diff --git a/packages/apr/apr-util_1.2.12.bb b/packages/apr/apr-util_1.2.12.bb
index 138d23300e..64f6bcbcf8 100644
--- a/packages/apr/apr-util_1.2.12.bb
+++ b/packages/apr/apr-util_1.2.12.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache License, Version 2.0"
 
-FILE_PR = "r2"
+PR = "r2"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index a288cb3986..5f019d624e 100644
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache License, Version 2.0"
 
-FILE_PR = "r3"
+PR = "r3"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
diff --git a/packages/apr/apr_0.9.12.bb b/packages/apr/apr_0.9.12.bb
index 958f2cc426..43324b3b66 100644
--- a/packages/apr/apr_0.9.12.bb
+++ b/packages/apr/apr_0.9.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library"
 SECTION = "libs"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/apr-${PV}.tar.bz2"
 
diff --git a/packages/apr/apr_1.2.12.bb b/packages/apr/apr_1.2.12.bb
index a76e80ba0f..923e9b380c 100644
--- a/packages/apr/apr_1.2.12.bb
+++ b/packages/apr/apr_1.2.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library"
 SECTION = "libs"
 LICENSE = "Apache License, Version 2.0"
 
-FILE_PR = "r0"
+PR = "r0"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb
index 061c90097f..16365d7998 100644
--- a/packages/apr/apr_1.2.7.bb
+++ b/packages/apr/apr_1.2.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library"
 SECTION = "libs"
 LICENSE = "Apache License, Version 2.0"
 
-FILE_PR = "r2"
+PR = "r2"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb
index 90f717d663..6db567f987 100644
--- a/packages/apt/apt-native_0.6.46.2.bb
+++ b/packages/apt/apt-native_0.6.46.2.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb
index 5c62803f39..7bf69c01af 100644
--- a/packages/apt/apt-native_0.7.2.bb
+++ b/packages/apt/apt-native_0.7.2.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb
index 4e7bde3c46..4b6897fa44 100644
--- a/packages/apt/apt-native_0.7.3.bb
+++ b/packages/apt/apt-native_0.7.3.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/packages/apt/apt_0.5.28.6.bb b/packages/apt/apt_0.5.28.6.bb
index 3131d91253..92f80ef031 100644
--- a/packages/apt/apt_0.5.28.6.bb
+++ b/packages/apt/apt_0.5.28.6.bb
@@ -1,5 +1,5 @@
 require apt.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://autofoo.patch;patch=1"
 
diff --git a/packages/apt/apt_0.6.25.bb b/packages/apt/apt_0.6.25.bb
index b0d97411d4..23c9829f21 100644
--- a/packages/apt/apt_0.6.25.bb
+++ b/packages/apt/apt_0.6.25.bb
@@ -1,5 +1,5 @@
 require apt.inc
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://autofoo.patch;patch=1"
 
diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb
index 3cf2e959c3..6410ec7683 100644
--- a/packages/apt/apt_0.6.46.2.bb
+++ b/packages/apt/apt_0.6.46.2.bb
@@ -1,5 +1,5 @@
 require apt.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/packages/apt/apt_0.7.2.bb b/packages/apt/apt_0.7.2.bb
index 9945000149..7f6bb81f6e 100644
--- a/packages/apt/apt_0.7.2.bb
+++ b/packages/apt/apt_0.7.2.bb
@@ -1,5 +1,5 @@
 require apt.inc
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/packages/apt/apt_0.7.3.bb b/packages/apt/apt_0.7.3.bb
index 9945000149..7f6bb81f6e 100644
--- a/packages/apt/apt_0.7.3.bb
+++ b/packages/apt/apt_0.7.3.bb
@@ -1,5 +1,5 @@
 require apt.inc
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/packages/argtable/argtable_2.7.bb b/packages/argtable/argtable_2.7.bb
index 0984ef8083..ee3e6bd70a 100644
--- a/packages/argtable/argtable_2.7.bb
+++ b/packages/argtable/argtable_2.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://argtable.sourceforge.net/"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libtool-cross"
 
diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb
index 1618f6b210..629c50a3ca 100644
--- a/packages/ark3116/ark3116_0.4.1.bb
+++ b/packages/ark3116/ark3116_0.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://avr.auctionant.de/ark3116_linux_driver/"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 RRECOMMENDS = "kernel-module-usbserial"
 
 SRC_URI = "http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz \
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
index faf644b399..c6761c99b2 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
@@ -3,7 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)"
 
diff --git a/packages/arpwatch/arpwatch_2.1a15.bb b/packages/arpwatch/arpwatch_2.1a15.bb
index af0821b900..758c3c807f 100644
--- a/packages/arpwatch/arpwatch_2.1a15.bb
+++ b/packages/arpwatch/arpwatch_2.1a15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
 SECTION = "network"
 LICENSE = "BSD"
 RRECOMMENDS = "arpwatch-data"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
            file://05debian_fhs.patch;patch=1 \
diff --git a/packages/aspell/aspell6-en_6.0-0.bb b/packages/aspell/aspell6-en_6.0-0.bb
index c2ef8704ea..a8bf72d824 100644
--- a/packages/aspell/aspell6-en_6.0-0.bb
+++ b/packages/aspell/aspell6-en_6.0-0.bb
@@ -1,6 +1,6 @@
 LICENSE = "Copyright file"
 SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-${PV}.tar.bz2"
-FILE_PR ="r1"
+PR ="r1"
 
 require aspell-lang.inc
 
diff --git a/packages/aspell/aspell6-pl_6.0-20061121-0.bb b/packages/aspell/aspell6-pl_6.0-20061121-0.bb
index d4cfdea09e..8b2fb57555 100644
--- a/packages/aspell/aspell6-pl_6.0-20061121-0.bb
+++ b/packages/aspell/aspell6-pl_6.0-20061121-0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2"
-FILE_PR ="r1"
+PR ="r1"
 
 require aspell-lang.inc
 
diff --git a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
index 2b42c5d234..2a0dbbc82f 100644
--- a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
+++ b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION="Supplementary asterisk-sounds"
 HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-addons_1.6.0-beta2.bb b/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
index 616b478f53..06d2dc2dc0 100644
--- a/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
+++ b/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "asterisk openssl curl"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
index 70afa63e36..85fe634f8c 100644
--- a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
index e93ce3297b..74512018e3 100644
--- a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
index 3eb2c3cfc5..0cf23240e7 100644
--- a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
index ad2bd09437..c10bf786a5 100644
--- a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
index bc95d77e68..ad895b45a0 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
index 9ec0a94489..7573043c44 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
index 04991abc1e..bf59d9c4aa 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
index dda37ac3b7..6305d99eb3 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
index 16a15b804b..4bd5e52c3f 100644
--- a/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
index 81700fdfb0..70595800b9 100644
--- a/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
index e88eee7252..0de5cb65e3 100644
--- a/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
index 37dc393790..375f49b38f 100644
--- a/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz"
 
diff --git a/packages/asterisk/asterisk_1.2.24.bb b/packages/asterisk/asterisk_1.2.24.bb
index bfaf0c02cb..497866f422 100644
--- a/packages/asterisk/asterisk_1.2.24.bb
+++ b/packages/asterisk/asterisk_1.2.24.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch;patch=1 \
diff --git a/packages/asterisk/asterisk_1.2.28.bb b/packages/asterisk/asterisk_1.2.28.bb
index 3050bf003e..a79d81b694 100644
--- a/packages/asterisk/asterisk_1.2.28.bb
+++ b/packages/asterisk/asterisk_1.2.28.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch;patch=1 \
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
index 9ac3854e7b..75a08ece60 100644
--- a/packages/asterisk/asterisk_1.4.17.bb
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
diff --git a/packages/asterisk/asterisk_1.4.19.1.bb b/packages/asterisk/asterisk_1.4.19.1.bb
index 23ba1a9679..31c8f541a4 100644
--- a/packages/asterisk/asterisk_1.4.19.1.bb
+++ b/packages/asterisk/asterisk_1.4.19.1.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
diff --git a/packages/asterisk/asterisk_1.6.0-beta8.bb b/packages/asterisk/asterisk_1.6.0-beta8.bb
index 3e8d06ae0b..fa8d894468 100644
--- a/packages/asterisk/asterisk_1.6.0-beta8.bb
+++ b/packages/asterisk/asterisk_1.6.0-beta8.bb
@@ -9,7 +9,7 @@ SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
 PV = "1.5.0+1.6.0beta8"
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/at/at_3.1.8.bb b/packages/at/at_3.1.8.bb
index 047255bce9..7acbfa9664 100644
--- a/packages/at/at_3.1.8.bb
+++ b/packages/at/at_3.1.8.bb
@@ -5,7 +5,7 @@ DEPENDS = "flex"
 RCONFLICTS = "atd"
 RREPLACES = "atd"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/at76c503a/at76c503a-modules_0.17.bb b/packages/at76c503a/at76c503a-modules_0.17.bb
index e2a52e70a3..58b782b483 100644
--- a/packages/at76c503a/at76c503a-modules_0.17.bb
+++ b/packages/at76c503a/at76c503a-modules_0.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for at76 based usb-wifi devices"
 SECTION = "base"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 RDEPENDS = "at76c503-firmware"
 
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 155ed1f367..7422cc610c 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
 	   file://makefile.cc.patch;patch=1"
 S = "${WORKDIR}/at76c503a"
-FILE_PR = "r4"
+PR = "r4"
 PV = "0.0+cvs${SRCDATE}"
 
 inherit module
diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb
index 99859c2d3f..9862fac0dd 100644
--- a/packages/atd/atd_0.70.bb
+++ b/packages/atd/atd_0.70.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLV2"
 RCONFLICTS = "at"
 RREPLACES = "at"
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
 			file://atd-startup.patch;patch=1;pnum=0"
diff --git a/packages/atd/atd_0.80.bb b/packages/atd/atd_0.80.bb
index 778a7ebaf3..f3adbd7cb3 100644
--- a/packages/atd/atd_0.80.bb
+++ b/packages/atd/atd_0.80.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLV2"
 RCONFLICTS = "at"
 RREPLACES = "at"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://projects.linuxtogo.org/frs/download.php/222/${P}.tar.gz"
 
diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index 74ce703a5f..07040562dd 100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \
 	    ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \
diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb
index 9216a84fe9..64a078c43b 100644
--- a/packages/audiofile/audiofile_0.2.6.bb
+++ b/packages/audiofile/audiofile_0.2.6.bb
@@ -5,7 +5,7 @@ Research, Amiga IFF/8SVX, and NIST SPHERE."
 SECTION = "libs"
 LICENSE = "LGPL GPL"
 RPROVIDES_${PN} += "audiofile"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz"
 
diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb
index 835ea6a4dd..dc21c1bfd4 100644
--- a/packages/aufs/aufs_cvs.bb
+++ b/packages/aufs/aufs_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which
 HOMEPAGE = "http://aufs.sourceforge.net/"
 LICENSE = "GPL"
 PV = "cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 RSUGGESTS_${PN} = "${PN}-tools"
 
diff --git a/packages/autoconf/autoconf_2.57.bb b/packages/autoconf/autoconf_2.57.bb
index 76735be669..6c2906a362 100644
--- a/packages/autoconf/autoconf_2.57.bb
+++ b/packages/autoconf/autoconf_2.57.bb
@@ -1,2 +1,2 @@
 require autoconf.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/autoconf/autoconf_2.59.bb b/packages/autoconf/autoconf_2.59.bb
index 99a3011742..f59f8fa5c9 100644
--- a/packages/autoconf/autoconf_2.59.bb
+++ b/packages/autoconf/autoconf_2.59.bb
@@ -2,7 +2,7 @@ require autoconf.inc
 
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-exclude.patch;patch=1 \
diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb
index ed661d58d0..6b92dc8120 100644
--- a/packages/autoconf/autoconf_2.61.bb
+++ b/packages/autoconf/autoconf_2.61.bb
@@ -1,6 +1,6 @@
 require autoconf.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/autofs/autofs_4.1.4.bb b/packages/autofs/autofs_4.1.4.bb
index bcea46b942..d9863ad9dd 100644
--- a/packages/autofs/autofs_4.1.4.bb
+++ b/packages/autofs/autofs_4.1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Kernel based automounter for linux."
 SECTION = "base"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb
index e70764cf85..e4e8f3385b 100644
--- a/packages/automake/automake_1.10.bb
+++ b/packages/automake/automake_1.10.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb
index b672681668..4c00ea0891 100644
--- a/packages/automake/automake_1.7.7.bb
+++ b/packages/automake/automake_1.7.7.bb
@@ -3,7 +3,7 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 DESCRIPTION = "A tool for automatically generating Makefiles."
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb
index 0dc13d32dd..30002191f5 100644
--- a/packages/automake/automake_1.8.2.bb
+++ b/packages/automake/automake_1.8.2.bb
@@ -4,7 +4,7 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 DESCRIPTION = "A tool for automatically generating Makefiles."
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
 
diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb
index 6e4d3d23ad..d10ff553df 100644
--- a/packages/automake/automake_1.8.4.bb
+++ b/packages/automake/automake_1.8.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb
index 1fbf5a55ea..19d5d56979 100644
--- a/packages/automake/automake_1.9.2.bb
+++ b/packages/automake/automake_1.9.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb
index a098217321..52f9b981aa 100644
--- a/packages/automake/automake_1.9.3.bb
+++ b/packages/automake/automake_1.9.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
index 3e55373264..25ca037c04 100644
--- a/packages/avahi/avahi-python_0.6.21.bb
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""
diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb
index 82f33b2ad8..28d4c07807 100644
--- a/packages/avahi/avahi-ui_0.6.21.bb
+++ b/packages/avahi/avahi-ui_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 DEPENDS += "avahi gtk+"
 
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index f58923e862..6bc5a7055d 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r9"
+PR = "r9"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index f58923e862..6bc5a7055d 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r9"
+PR = "r9"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index 4c66a364bc..c6236ad6d1 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index e70b8d4801..43c1b15843 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-FILE_PR = "r9"
+PR = "r9"
 
 PACKAGES =+ "libavahi-gobject"
diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb
index d55abe4ea7..c2250d8781 100644
--- a/packages/avahi/mango-lassi_git.bb
+++ b/packages/avahi/mango-lassi_git.bb
@@ -3,7 +3,7 @@ DEPENDS = "avahi-ui libglade libnotify"
 
 SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93"
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
 
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index 8052e0c222..cee5fc0849 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -4,7 +4,7 @@ DEPENDS = "findutils-native virtual/javac-native kaffeh-native fastjar-native bl
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/avetanabt/avetanaBluetooth-${PV}.tgz"
 
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index 8d82ecc63a..44c91666be 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "20060413+cvs${SRCDATE}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "cvs://anonymous@avetanabt.cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
 
diff --git a/packages/backsaver/backsaver_1.0.bb b/packages/backsaver/backsaver_1.0.bb
index 6c0b07b277..a63f9d7f60 100644
--- a/packages/backsaver/backsaver_1.0.bb
+++ b/packages/backsaver/backsaver_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Lightweight backlight saver daemon"
 SECTION = "base"
 LICENSE="GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "file://Makefile \
     file://backsaver.c"
diff --git a/packages/bacula/bacula-client_1.38.11.bb b/packages/bacula/bacula-client_1.38.11.bb
index 7dc1d793ca..0403d5d076 100644
--- a/packages/bacula/bacula-client_1.38.11.bb
+++ b/packages/bacula/bacula-client_1.38.11.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.bacula.org"
 LICENSE = "GPL"
-FILE_PR ="r1"
+PR ="r1"
 DEPENDS = "gmp openssl zlib readline"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/bacula/bacula-1.38.11.tar.gz \
diff --git a/packages/balsa/balsa_2.0.17.bb b/packages/balsa/balsa_2.0.17.bb
index 75032cb0b1..7418f648e5 100644
--- a/packages/balsa/balsa_2.0.17.bb
+++ b/packages/balsa/balsa_2.0.17.bb
@@ -5,7 +5,7 @@ SECTION = "x11/network"
 LICENSE = "GPL"
 DEPENDS = "libesmtp glib-2.0 libgnome libgnomeui gtk+ gnome-vfs libbonobo aspell libpcre libtool openssl gtkhtml-3.0"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://talinux.fi.tal.org/pub/talinux/sources/balsa-${PV}.tar.bz2 \
 	   file://libmutt-cross.patch;patch=1 \
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 31164e4bc1..a310a25399 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-FILE_PR = "r82"
+PR = "r82"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index a6cdd30b9f..4ea4e7f839 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base system password/group files."
 SECTION = "base"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb
index 915eefb5a4..e23887aefe 100644
--- a/packages/bash/bash_3.0.bb
+++ b/packages/bash/bash_3.0.bb
@@ -1,5 +1,5 @@
 require bash.inc
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI += "\
   file://bash-3.0-fixes.patch;patch=1 \
diff --git a/packages/bash/bash_3.2.bb b/packages/bash/bash_3.2.bb
index d84b7537e5..6a48a4bd60 100644
--- a/packages/bash/bash_3.2.bb
+++ b/packages/bash/bash_3.2.bb
@@ -1,6 +1,6 @@
 require bash.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI += "\
            file://builtins.patch;patch=1 \
diff --git a/packages/batmand/batmand_0.3.bb b/packages/batmand/batmand_0.3.bb
index 38b1531924..c78f94d5e3 100644
--- a/packages/batmand/batmand_0.3.bb
+++ b/packages/batmand/batmand_0.3.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "https://www.open-mesh.net/batman"
 
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "kernel-module-tun"
 
diff --git a/packages/bazaar/bazaar_1.2.bb b/packages/bazaar/bazaar_1.2.bb
index 40e50615b4..e64b442733 100644
--- a/packages/bazaar/bazaar_1.2.bb
+++ b/packages/bazaar/bazaar_1.2.bb
@@ -13,7 +13,7 @@ HOMEPAGE = "http://bazaar.canonical.com/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "devel"
-FILE_PR = "r2"
+PR = "r2"
 RDEPENDS_${PN} += "patch"
 RSUGGESTS_${PN} += "gnupg"
 
diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb
index 516da84709..0629f74faf 100644
--- a/packages/bb/bb_1.2.bb
+++ b/packages/bb/bb_1.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://aa-project.sourceforge.net/bb/"
 SECTION = "console/misc"
 LICENSE = "GPLv2"
 DEPENDS = "aalib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \
            file://fix-compile.patch;patch=1"
diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 26287c5471..f9a45e74df 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -6,7 +6,7 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 acpaths=""
diff --git a/packages/beep/beep_1.2.2.bb b/packages/beep/beep_1.2.2.bb
index f3257facc6..759f74f8a0 100644
--- a/packages/beep/beep_1.2.2.bb
+++ b/packages/beep/beep_1.2.2.bb
@@ -3,7 +3,7 @@
 DESCRIPTION = "A console utility to make a beep noise"
 SECTION = "console/utils"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "install-native"
 
 SRC_URI  = "http://johnath.com/beep/beep-${PV}.tar.gz"
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index bdeb8a0241..3e7502fa67 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -4,7 +4,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-image"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
            file://gcc4.patch;patch=1"
diff --git a/packages/bind/bind_9.3.1.bb b/packages/bind/bind_9.3.1.bb
index 96063e0164..29112ff311 100644
--- a/packages/bind/bind_9.3.1.bb
+++ b/packages/bind/bind_9.3.1.bb
@@ -1,7 +1,7 @@
 DEPENDS = "openssl"
 RPEDENDS = ""
 DESCRIPTION = "ISC Internet Domain Name Server"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
            file://lib_dns_Makefile.in.patch;patch=1 \
diff --git a/packages/bind/bind_9.3.4-P1.bb b/packages/bind/bind_9.3.4-P1.bb
index 54bc9a37f5..59d2599a13 100644
--- a/packages/bind/bind_9.3.4-P1.bb
+++ b/packages/bind/bind_9.3.4-P1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "openssl"
 
diff --git a/packages/bind/bind_9.3.5-P1.bb b/packages/bind/bind_9.3.5-P1.bb
index bba171ca5a..a1dff5ceaf 100644
--- a/packages/bind/bind_9.3.5-P1.bb
+++ b/packages/bind/bind_9.3.5-P1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "openssl"
 
diff --git a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
index d5c7634bdc..f84a61d1f5 100644
--- a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
+++ b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
index ea5465e5f2..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
index ea5465e5f2..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
+++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
index ea5465e5f2..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb
index ea5465e5f2..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_cvs.bb b/packages/binutils/binutils-cross-sdk_cvs.bb
index 355151f75b..6886255c7f 100644
--- a/packages/binutils/binutils-cross-sdk_cvs.bb
+++ b/packages/binutils/binutils-cross-sdk_cvs.bb
@@ -1,4 +1,4 @@
 require binutils_cvs.bb
 require binutils-cross-sdk.inc
-FILE_PR = "r4"
+PR = "r4"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb
index 49f87e256a..eb7208215b 100644
--- a/packages/binutils/binutils_2.14.90.0.6.bb
+++ b/packages/binutils/binutils_2.14.90.0.6.bb
@@ -1,7 +1,7 @@
 SECTION = "devel"
 inherit autotools gettext
 
-FILE_PR = "r5"
+PR = "r5"
 
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb
index 1cef0a39c9..f940c873e5 100644
--- a/packages/binutils/binutils_2.14.90.0.7.bb
+++ b/packages/binutils/binutils_2.14.90.0.7.bb
@@ -4,7 +4,7 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb
index 4765ad4fe7..74a902b5e6 100644
--- a/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/packages/binutils/binutils_2.15.94.0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools gettext
 
diff --git a/packages/binutils/binutils_2.16.1.bb b/packages/binutils/binutils_2.16.1.bb
index 828c86eee9..82353006dc 100644
--- a/packages/binutils/binutils_2.16.1.bb
+++ b/packages/binutils/binutils_2.16.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/"
 SRC_URI = \
diff --git a/packages/binutils/binutils_2.16.91.0.6.bb b/packages/binutils/binutils_2.16.91.0.6.bb
index 863b91553b..b2511492b3 100644
--- a/packages/binutils/binutils_2.16.91.0.6.bb
+++ b/packages/binutils/binutils_2.16.91.0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 # glibc 2.3 has issues with this version
 # of binutils.
diff --git a/packages/binutils/binutils_2.16.91.0.7.bb b/packages/binutils/binutils_2.16.91.0.7.bb
index a008f20aa9..76c128583d 100644
--- a/packages/binutils/binutils_2.16.91.0.7.bb
+++ b/packages/binutils/binutils_2.16.91.0.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools gettext
 
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index 445e00c339..9035b44ada 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/packages/binutils/binutils_2.16.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = \
     "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_2.17.50.0.1.bb b/packages/binutils/binutils_2.17.50.0.1.bb
index a008f20aa9..76c128583d 100644
--- a/packages/binutils/binutils_2.17.50.0.1.bb
+++ b/packages/binutils/binutils_2.17.50.0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools gettext
 
diff --git a/packages/binutils/binutils_2.17.50.0.12.bb b/packages/binutils/binutils_2.17.50.0.12.bb
index 3eda81bd42..d24d24e1bc 100644
--- a/packages/binutils/binutils_2.17.50.0.12.bb
+++ b/packages/binutils/binutils_2.17.50.0.12.bb
@@ -1,5 +1,5 @@
 require binutils.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb
index 1a3c041cf0..1d1c3fb6c8 100644
--- a/packages/binutils/binutils_2.17.50.0.5.bb
+++ b/packages/binutils/binutils_2.17.50.0.5.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb
index 10793e88ba..f659b3b8b3 100644
--- a/packages/binutils/binutils_2.17.50.0.8.bb
+++ b/packages/binutils/binutils_2.17.50.0.8.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb
index 5eee7c7afa..0f0b5d654d 100644
--- a/packages/binutils/binutils_2.17.bb
+++ b/packages/binutils/binutils_2.17.bb
@@ -1,7 +1,7 @@
 require binutils.inc
 require binutils-avr32.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_2.18.50.0.7.bb b/packages/binutils/binutils_2.18.50.0.7.bb
index 50fc5dc29c..d0656f6300 100644
--- a/packages/binutils/binutils_2.18.50.0.7.bb
+++ b/packages/binutils/binutils_2.18.50.0.7.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require binutils.inc
 
diff --git a/packages/binutils/binutils_2.18.bb b/packages/binutils/binutils_2.18.bb
index f5fa638744..9367196240 100644
--- a/packages/binutils/binutils_2.18.bb
+++ b/packages/binutils/binutils_2.18.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require binutils.inc
 
diff --git a/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb
index e6757113a1..2c7c2076c3 100644
--- a/packages/binutils/binutils_csl-arm-20050416.bb
+++ b/packages/binutils/binutils_csl-arm-20050416.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050416"
-FILE_PR = "r3"
+PR = "r3"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_arm-linux = "-1"
diff --git a/packages/binutils/binutils_csl-arm-20050603.bb b/packages/binutils/binutils_csl-arm-20050603.bb
index a37b93664b..13759b47ad 100644
--- a/packages/binutils/binutils_csl-arm-20050603.bb
+++ b/packages/binutils/binutils_csl-arm-20050603.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050603"
-FILE_PR = "r3"
+PR = "r3"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE_arm-linux = "1"
diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb
index 659340c190..288450cf58 100644
--- a/packages/binutils/binutils_cvs.bb
+++ b/packages/binutils/binutils_cvs.bb
@@ -1,6 +1,6 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 
 require binutils.inc
 
diff --git a/packages/bison/bison-native_2.0.bb b/packages/bison/bison-native_2.0.bb
index 610c21835c..760295db6d 100644
--- a/packages/bison/bison-native_2.0.bb
+++ b/packages/bison/bison-native_2.0.bb
@@ -2,7 +2,7 @@ require bison_${PV}.bb
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
 S = "${WORKDIR}/bison-${PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit native autotools
 
diff --git a/packages/bitbake/bitbake_1.6.2.bb b/packages/bitbake/bitbake_1.6.2.bb
index ffb80604e7..6a6fffcfef 100644
--- a/packages/bitbake/bitbake_1.6.2.bb
+++ b/packages/bitbake/bitbake_1.6.2.bb
@@ -1,6 +1,6 @@
 require bitbake.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
 
diff --git a/packages/bitbake/bitbake_1.8.6.bb b/packages/bitbake/bitbake_1.8.6.bb
index 60de9a01f3..a2cd3899a1 100644
--- a/packages/bitbake/bitbake_1.8.6.bb
+++ b/packages/bitbake/bitbake_1.8.6.bb
@@ -1,6 +1,6 @@
 require bitbake.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
 
diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb
index 780a77d1df..247140b6c6 100644
--- a/packages/bitbake/bitbake_svn.bb
+++ b/packages/bitbake/bitbake_svn.bb
@@ -1,7 +1,7 @@
 require bitbake.inc
 
 PV = "1.9.0+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 # Don't use the tip of svn by default
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/bitlbee/bitlbee_1.0.4.bb b/packages/bitlbee/bitlbee_1.0.4.bb
index 24486cd627..41f7b1c97f 100644
--- a/packages/bitlbee/bitlbee_1.0.4.bb
+++ b/packages/bitlbee/bitlbee_1.0.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.bitlbee.org/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 gnutls"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://get.bitlbee.org/src/${P}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index cf243ff4c6..2072ea10e5 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -10,7 +10,7 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
 
 
 S = "${WORKDIR}/h3600_test"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit pkgconfig
 
diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb
index b3d65c6830..50dc5a69c6 100644
--- a/packages/blackbox/blackbox_0.70.1.bb
+++ b/packages/blackbox/blackbox_0.70.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Blackbox Window Manager"
 SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
   file://remove-host-includes.patch;patch=1"
diff --git a/packages/blueprobe/blueprobe_0.15.bb b/packages/blueprobe/blueprobe_0.15.bb
index 144d3042e5..e39407cc16 100644
--- a/packages/blueprobe/blueprobe_0.15.bb
+++ b/packages/blueprobe/blueprobe_0.15.bb
@@ -1,6 +1,6 @@
 require blueprobe.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://hx4700.patch;patch=1 \
 		  file://h6300.patch;patch=1"
diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb
index f85fd5e00d..db190332e7 100644
--- a/packages/blueprobe/blueprobe_0.16.bb
+++ b/packages/blueprobe/blueprobe_0.16.bb
@@ -1,6 +1,6 @@
 require blueprobe.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://hx4700.patch;patch=1 \
 	    file://h6300.patch;patch=1"
diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb
index 8d7d6c393a..b82bedf632 100644
--- a/packages/blueprobe/blueprobe_0.17.bb
+++ b/packages/blueprobe/blueprobe_0.17.bb
@@ -1,6 +1,6 @@
 require blueprobe.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://hx4700.patch;patch=1 \
 	    file://h2200-fixup.patch;patch=1 \
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
index 57fd274971..b76c16b7d9 100644
--- a/packages/blueprobe/blueprobe_0.18.bb
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -1,6 +1,6 @@
 require blueprobe.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "file://h4000.patch;patch=1 \
             file://uclibc-fix.patch;patch=1 \
diff --git a/packages/blueprobe/blueprobe_svn.bb b/packages/blueprobe/blueprobe_svn.bb
index 9e761fa42f..5ef2dfcf8b 100644
--- a/packages/blueprobe/blueprobe_svn.bb
+++ b/packages/blueprobe/blueprobe_svn.bb
@@ -1,5 +1,5 @@
 PV = "0.18+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit pkgconfig gpe autotools
 
diff --git a/packages/bluez/bcm2035-tool_0.0.bb b/packages/bluez/bcm2035-tool_0.0.bb
index 272d76098f..636841de6f 100644
--- a/packages/bluez/bcm2035-tool_0.0.bb
+++ b/packages/bluez/bcm2035-tool_0.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Bluetooth firmware poker for bccm2035 chips (motorola phones and palms)"
 LICENSE = "GPLv2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \
            file://addr-as-arg.patch;patch=1 \
diff --git a/packages/bluez/bluez-cups-backend_3.33.bb b/packages/bluez/bluez-cups-backend_3.33.bb
index da52d10f09..40e099642a 100644
--- a/packages/bluez/bluez-cups-backend_3.33.bb
+++ b/packages/bluez/bluez-cups-backend_3.33.bb
@@ -1,6 +1,6 @@
 require bluez-utils3.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "cups"
 
diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb
index 1fa3ef1078..413d220508 100644
--- a/packages/bluez/bluez-dtl1-workaround_1.0.bb
+++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume.
 SECTION = "console" 
 PRIORITY = "optional" 
 LICENSE = "GPL" 
-FILE_PR = "r1"
+PR = "r1"
  
 SRC_URI = "file://02dtl1_cs.sh"
 
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.33.bb b/packages/bluez/bluez-gstreamer-plugin_3.33.bb
index e1c0091f59..53b7eb86f2 100644
--- a/packages/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/packages/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -1,6 +1,6 @@
 require bluez-utils3.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "gstreamer gst-plugins-base "
 
diff --git a/packages/bluez/bluez-hcidump_1.42.bb b/packages/bluez/bluez-hcidump_1.42.bb
index f5ac1ac2db..877c8db33c 100644
--- a/packages/bluez/bluez-hcidump_1.42.bb
+++ b/packages/bluez/bluez-hcidump_1.42.bb
@@ -3,7 +3,7 @@ SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
diff --git a/packages/bluez/bluez-libs.inc b/packages/bluez/bluez-libs.inc
index 09e01721ba..d740bd80a9 100644
--- a/packages/bluez/bluez-libs.inc
+++ b/packages/bluez/bluez-libs.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
 
diff --git a/packages/bluez/bluez-utils-alsa_3.33.bb b/packages/bluez/bluez-utils-alsa_3.33.bb
index adbd1aac9e..a1e3e85818 100644
--- a/packages/bluez/bluez-utils-alsa_3.33.bb
+++ b/packages/bluez/bluez-utils-alsa_3.33.bb
@@ -1,6 +1,6 @@
 require bluez-utils3.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "alsa-lib"
 
diff --git a/packages/bluez/bluez-utils_3.33.bb b/packages/bluez/bluez-utils_3.33.bb
index 39416ed804..2b7b3a0f9d 100644
--- a/packages/bluez/bluez-utils_3.33.bb
+++ b/packages/bluez/bluez-utils_3.33.bb
@@ -1,6 +1,6 @@
 require bluez-utils3.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/packages/bluez/bluez-utils_3.36.bb b/packages/bluez/bluez-utils_3.36.bb
index a635230fa2..cf6d6328ea 100644
--- a/packages/bluez/bluez-utils_3.36.bb
+++ b/packages/bluez/bluez-utils_3.36.bb
@@ -1,6 +1,6 @@
 require bluez-utils3.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
diff --git a/packages/bluez/bluez4_4.7.bb b/packages/bluez/bluez4_4.7.bb
index d4064d679f..ae579dd0ae 100644
--- a/packages/bluez/bluez4_4.7.bb
+++ b/packages/bluez/bluez4_4.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
 S = "${WORKDIR}/bluez-${PV}"
diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb
index 0b1dfdc422..342dce97bd 100644
--- a/packages/boa/boa_0.94.13.bb
+++ b/packages/boa/boa_0.94.13.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 RDEPENDS = "mime-support"
 RPROVIDES = "httpd"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \
            file://cgi.patch;patch=1;pnum=2 \
diff --git a/packages/bochs/bochs_2.1.bb b/packages/bochs/bochs_2.1.bb
index 827fdbe162..1ae3a23314 100644
--- a/packages/bochs/bochs_2.1.bb
+++ b/packages/bochs/bochs_2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An x86 Emulator based on SDL."
 HOMEPAGE = "http://bochs.sf.net"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 # needs a patch for recent g++
 BROKEN = "1"
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
index a1cd1f60da..72cec9be3c 100644
--- a/packages/bogofilter/bogofilter_0.96.0.bb
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (
 by a statistical analysis of the message's header and content (body). \
 The program is able to learn from the user's classifications and corrections."
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 PRIORITY = "optional"
 
 SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
diff --git a/packages/boost-asio/boost-asio_0.3.7.bb b/packages/boost-asio/boost-asio_0.3.7.bb
index 3525ba46c1..94a29b700c 100644
--- a/packages/boost-asio/boost-asio_0.3.7.bb
+++ b/packages/boost-asio/boost-asio_0.3.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://asio.sf.net/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/asio/boost_asio_0_3_7.tar.bz2"
 
diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc
index 3ccb66f4b6..0ad71ca9d6 100644
--- a/packages/boost/boost-36.inc
+++ b/packages/boost/boost-36.inc
@@ -9,7 +9,7 @@ SECTION = "libs"
 DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-FILE_PR = "r1"
+PR = "r1"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
diff --git a/packages/boost/boost-jam-native.inc b/packages/boost/boost-jam-native.inc
index ab0b1cb06b..843f912f46 100644
--- a/packages/boost/boost-jam-native.inc
+++ b/packages/boost/boost-jam-native.inc
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.boost.org/"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
 S = "${WORKDIR}/boost-jam-${PV}"
diff --git a/packages/boost/boost.inc b/packages/boost/boost.inc
index f55e1c2b88..80635b0f9f 100644
--- a/packages/boost/boost.inc
+++ b/packages/boost/boost.inc
@@ -9,7 +9,7 @@ SECTION = "libs"
 DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-FILE_PR = "r1"
+PR = "r1"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb
index 75a1915bad..520cf43a8d 100644
--- a/packages/boost/boost_1.33.0.bb
+++ b/packages/boost/boost_1.33.0.bb
@@ -1,6 +1,6 @@
 include boost.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 #SRC_URI += "file://unit_test_log10f.patch;patch=1"
diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb
index 951ac30ba8..840be8b784 100644
--- a/packages/boost/boost_1.33.1.bb
+++ b/packages/boost/boost_1.33.1.bb
@@ -1,6 +1,6 @@
 include boost.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 #SRC_URI += "file://unit_test_log10f.patch;patch=1"
diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb
index 0d95faf738..7fb691f360 100644
--- a/packages/boost/boost_1.34.1.bb
+++ b/packages/boost/boost_1.34.1.bb
@@ -10,7 +10,7 @@ LICENSE = "Boost Software License"
 
 DEPENDS = "python boost-jam-native zlib bzip2"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb
index 17fddb06b4..697267dce1 100644
--- a/packages/boost/boost_1.36.0.bb
+++ b/packages/boost/boost_1.36.0.bb
@@ -2,7 +2,7 @@ include boost-36.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
            file://arm-intrinsics.patch;patch=1 \
diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb
index 5992dd6977..98ff0c204d 100644
--- a/packages/bootchart/bootchart_0.9.bb
+++ b/packages/bootchart/bootchart_0.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.bootchart.org/"
-FILE_PR = "r1"
+PR = "r1"
 
 #this only installs the loggers, you will need to run the renderers on your workstation
 #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging
diff --git a/packages/bootsplash/bootsplash_3.0.7.bb b/packages/bootsplash/bootsplash_3.0.7.bb
index 1ed0aa4cc4..da6f75b4d3 100644
--- a/packages/bootsplash/bootsplash_3.0.7.bb
+++ b/packages/bootsplash/bootsplash_3.0.7.bb
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash
 	 file://gcc-issues.patch;patch=1"
 
 DEPENDS="freetype libmng"
-FILE_PR = "r1"
+PR = "r1"
 
 EXTRA_OEMAKE += "-C Utilities \
 		CFLAGS='${CFLAGS} -I${STAGING_INCDIR}/freetype2/ -I${STAGING_INCDIR}' \
diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb
index 0c8257ef12..916e9f7279 100644
--- a/packages/brickout/brickout_2002.06.09.bb
+++ b/packages/brickout/brickout_2002.06.09.bb
@@ -3,7 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-image"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.billsgames.com/unix/agenda/brickout/src/brickout-${PV}.tar.gz \
            file://directories.patch;patch=1"
diff --git a/packages/bridge-utils/bridge-utils_1.0.4.bb b/packages/bridge-utils/bridge-utils_1.0.4.bb
index f5a6edd104..d72a627d21 100644
--- a/packages/bridge-utils/bridge-utils_1.0.4.bb
+++ b/packages/bridge-utils/bridge-utils_1.0.4.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "sysfsutils"
 RRECOMMENDS = "kernel-module-bridge"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz"
 S = "${WORKDIR}/bridge-utils-${PV}"
diff --git a/packages/bridge-utils/bridge-utils_1.2.bb b/packages/bridge-utils/bridge-utils_1.2.bb
index e5e0cd0e30..3f1f25dc3f 100644
--- a/packages/bridge-utils/bridge-utils_1.2.bb
+++ b/packages/bridge-utils/bridge-utils_1.2.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "sysfsutils"
 RRECOMMENDS = "kernel-module-bridge"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz"
 
diff --git a/packages/brutefir/brutefir_1.0i.bb b/packages/brutefir/brutefir_1.0i.bb
index 106fb2f0d4..52e56aca20 100644
--- a/packages/brutefir/brutefir_1.0i.bb
+++ b/packages/brutefir/brutefir_1.0i.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 DEPENDS = "alsa-lib fftw fftwf fftwl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 # The unbreak-makefile disables the SSE2, MMX and jack support, feel free 
 # to add back SSE and MMX after fixing the makefile to not use uname to check for cpu 
diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb
index f1b1373798..66820a7e7d 100644
--- a/packages/bt950-cs/bt950-cs_0.1.bb
+++ b/packages/bt950-cs/bt950-cs_0.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html"
 DEPENDS = "pcmcia-cs"
 RDEPENDS = "pcmcia-cs"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \
 file://makefile.patch;patch=1"
diff --git a/packages/btscanner/btscanner_1.0.bb b/packages/btscanner/btscanner_1.0.bb
index 610a91f0f2..d08e3e1ae8 100644
--- a/packages/btscanner/btscanner_1.0.bb
+++ b/packages/btscanner/btscanner_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \
diff --git a/packages/btscanner/btscanner_2.0.bb b/packages/btscanner/btscanner_2.0.bb
index 34dc2a854b..4063a98b8e 100644
--- a/packages/btscanner/btscanner_2.0.bb
+++ b/packages/btscanner/btscanner_2.0.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses libxml2"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
diff --git a/packages/btsco/btsco-module_0.41.bb b/packages/btsco/btsco-module_0.41.bb
index 2d64c9189b..46f647998b 100644
--- a/packages/btsco/btsco-module_0.41.bb
+++ b/packages/btsco/btsco-module_0.41.bb
@@ -1,3 +1,3 @@
 require btsco-module.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/btsco/btsco_0.41.bb b/packages/btsco/btsco_0.41.bb
index 72b93c4fd5..46c388a83f 100644
--- a/packages/btsco/btsco_0.41.bb
+++ b/packages/btsco/btsco_0.41.bb
@@ -1,3 +1,3 @@
 require btsco.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index ce2b51a24b..790bf518cc 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 7c1f389819..4ef3cfeb66 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-FILE_PR = "r17"
+PR = "r17"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 9fa6bfe7bb..14379a5da6 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 52b0cbbd4a..31a2f1abe7 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 3c02e8ab1f..53304df387 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index 161784fffd..e5c0f2473c 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
index 7e5d012ab1..cbcce6c675 100644
--- a/packages/busybox/slingbox_1.3.1.bb
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-FILE_PR = "r3"
+PR = "r3"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/bvi/bvi_1.3.1.bb b/packages/bvi/bvi_1.3.1.bb
index f951a1077f..b6525aad88 100644
--- a/packages/bvi/bvi_1.3.1.bb
+++ b/packages/bvi/bvi_1.3.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "binary vi (binary file editor)"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
index 293e2ada8d..11b67f4522 100644
--- a/packages/bwmon/bwmon_1.3.bb
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Linux bandwidth monitor"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
            file://makefile.patch;patch=1"
diff --git a/packages/bzip2/bzip2-full-native_1.0.5.bb b/packages/bzip2/bzip2-full-native_1.0.5.bb
index 114617763d..13bebbb3d5 100644
--- a/packages/bzip2/bzip2-full-native_1.0.5.bb
+++ b/packages/bzip2/bzip2-full-native_1.0.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Very high-quality data compression program."
 SECTION = "console/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 LICENSE = "bzip2"
 SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \
diff --git a/packages/bzip2/bzip2_1.0.2.bb b/packages/bzip2/bzip2_1.0.2.bb
index 29f66e1792..1e1cb8e539 100644
--- a/packages/bzip2/bzip2_1.0.2.bb
+++ b/packages/bzip2/bzip2_1.0.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Very high-quality data compression program."
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 LICENSE = "bzip2"
 SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \
diff --git a/packages/c-ares/c-ares_1.5.3.bb b/packages/c-ares/c-ares_1.5.3.bb
index 127f313dde..7375bda980 100644
--- a/packages/c-ares/c-ares_1.5.3.bb
+++ b/packages/c-ares/c-ares_1.5.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz"
 LICENSE = "MIT"
 S = "${WORKDIR}/c-ares-${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/c3110x/cx3110x_1.1.bb b/packages/c3110x/cx3110x_1.1.bb
index 3624bc25b1..15cf51427d 100644
--- a/packages/c3110x/cx3110x_1.1.bb
+++ b/packages/c3110x/cx3110x_1.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "cx3110x wifi support as found in the Nokia 770/800"

 SECTION = "kernel/modules"

 LICENSE = "GPL"

-FILE_PR = "r4"

+PR = "r4"

 

 COMPATIBLE_MACHINE = "(nokia770|nokia800)"

 

diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb
index 0b7acaa4cb..f5a48c40a9 100644
--- a/packages/cacao/cacao-cldc_0.98.bb
+++ b/packages/cacao/cacao-cldc_0.98.bb
@@ -2,7 +2,7 @@
 
 require cacao-cldc.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "\
   http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \
diff --git a/packages/cacao/cacao-initial_0.98.bb b/packages/cacao/cacao-initial_0.98.bb
index 21a9e1f305..08abf41c33 100644
--- a/packages/cacao/cacao-initial_0.98.bb
+++ b/packages/cacao/cacao-initial_0.98.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/java-initial"
 
 DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial jikes-initial"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
         http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \
diff --git a/packages/cacao/cacao-native_0.99.3.bb b/packages/cacao/cacao-native_0.99.3.bb
index 5605bbe653..0e4d9e5935 100644
--- a/packages/cacao/cacao-native_0.99.3.bb
+++ b/packages/cacao/cacao-native_0.99.3.bb
@@ -1,6 +1,6 @@
 require cacao-native.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
 
diff --git a/packages/cacao/cacao_0.99.3.bb b/packages/cacao/cacao_0.99.3.bb
index 854a062f15..b2f5801369 100644
--- a/packages/cacao/cacao_0.99.3.bb
+++ b/packages/cacao/cacao_0.99.3.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
 	   file://cacao-codegen-arm1.patch;patch=1 \
diff --git a/packages/cacao/cacaoh-native_0.99.3.bb b/packages/cacao/cacaoh-native_0.99.3.bb
index 294cd8477e..a7f59baa7b 100644
--- a/packages/cacao/cacaoh-native_0.99.3.bb
+++ b/packages/cacao/cacaoh-native_0.99.3.bb
@@ -1,5 +1,5 @@
 require cacaoh-native.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index 3301c4981e..ada747600e 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -13,6 +13,6 @@ EXTRA_OECONF += " --enable-directfb \
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/cairo-${PV}"
diff --git a/packages/cairo/cairo-directfb_1.6.4.bb b/packages/cairo/cairo-directfb_1.6.4.bb
index 5f421a575c..a8b3f0fc78 100644
--- a/packages/cairo/cairo-directfb_1.6.4.bb
+++ b/packages/cairo/cairo-directfb_1.6.4.bb
@@ -12,6 +12,6 @@ EXTRA_OECONF += " --enable-directfb \
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/cairo-${PV}"
diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
index 634de39e3d..e274387195 100644
--- a/packages/cairo/cairo_1.2.4.bb
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://0001-Add-autoconf-macro-AX_C_FLOAT_WORDS_BIGENDIAN.diff;patch=1 \
diff --git a/packages/cairo/cairo_1.4.10.bb b/packages/cairo/cairo_1.4.10.bb
index 2f2f6658e0..e89c0e6a9c 100644
--- a/packages/cairo/cairo_1.4.10.bb
+++ b/packages/cairo/cairo_1.4.10.bb
@@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 file://stats.patch;patch=1;p=1"
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/cairo/cairo_1.4.14.bb b/packages/cairo/cairo_1.4.14.bb
index 16b99fd0f3..b0f9fe8790 100644
--- a/packages/cairo/cairo_1.4.14.bb
+++ b/packages/cairo/cairo_1.4.14.bb
@@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 file://0001-Fix-for-a-memory-leak-in-pixman.patch;patch=1;p=1"
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/cairo/cairo_1.4.8.bb b/packages/cairo/cairo_1.4.8.bb
index c07b2e3235..845e14fc29 100644
--- a/packages/cairo/cairo_1.4.8.bb
+++ b/packages/cairo/cairo_1.4.8.bb
@@ -2,5 +2,5 @@ require cairo.inc
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb
index 83f8b22f9c..0c262b80ee 100644
--- a/packages/cairo/cairo_1.6.4.bb
+++ b/packages/cairo/cairo_1.6.4.bb
@@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 "
 
-FILE_PR = "r4"
+PR = "r4"
 
diff --git a/packages/cairo/cairomm_1.2.4.bb b/packages/cairo/cairomm_1.2.4.bb
index 672924787c..7796a44016 100644
--- a/packages/cairo/cairomm_1.2.4.bb
+++ b/packages/cairo/cairomm_1.2.4.bb
@@ -2,7 +2,7 @@ require cairo.inc
 
 DEPENDS = "cairo"
 DESCRIPTION = "C++ bindings for Cairo graphics library"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz"
 
diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb
index c75ba47ab6..2c5578aea6 100644
--- a/packages/cairo/libsvg_0.1.4.bb
+++ b/packages/cairo/libsvg_0.1.4.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "expat jpeg zlib libpng"
 DESCRIPTION = "SVG parser library"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 \
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index 0bfa1711f0..95b360c041 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SVG parser library"
 LICENSE = "LGPL"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg"
 S = "${WORKDIR}/libsvg"
-FILE_PR = "r2"
+PR = "r2"
 
 EXTRA_OECONF = "--with-expat"
 
diff --git a/packages/callweaver/callweaver-perl.bb b/packages/callweaver/callweaver-perl.bb
index f34d7dcde7..99e2fb73bf 100644
--- a/packages/callweaver/callweaver-perl.bb
+++ b/packages/callweaver/callweaver-perl.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "install-native"
 RDEPENDS = "perl callweaver-ogi"
-FILE_PR = "r0"
+PR = "r0"
 S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1"
 
 CWRCV = "rc5"
diff --git a/packages/callweaver/callweaver_1.2.0-rc5.bb b/packages/callweaver/callweaver_1.2.0-rc5.bb
index 23e23fb446..f0f572de50 100644
--- a/packages/callweaver/callweaver_1.2.0-rc5.bb
+++ b/packages/callweaver/callweaver_1.2.0-rc5.bb
@@ -11,7 +11,7 @@ DEPENDS = "openssl zlib tiff libcap spandsp (>= 0.0.3+0.0.4pre10) speex readline
            sox-native findutils-native"
 RRECOMMENDS = "logrotate"
 RRECOMMENDS_${PN}-ogi = "perl perl-module-strict callweaver-perl"
-FILE_PR = "r1"
+PR = "r1"
 S = "${WORKDIR}/callweaver-1.2-rc5"
 
 CWRCV = "rc5"
diff --git a/packages/cbrpager/cbrpager_0.9.14.bb b/packages/cbrpager/cbrpager_0.9.14.bb
index 48e66711a3..ccf2658f82 100644
--- a/packages/cbrpager/cbrpager_0.9.14.bb
+++ b/packages/cbrpager/cbrpager_0.9.14.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.jcoppens.com/soft/cbrpager/index.en.php"
 DESCRIPTION = "A no-nonsense, simple to use, small viewer for cbr and cbz (comic book archive) files."
 SECTION = "x11/applications"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "gtk+ libgnomeui"
 RDEPENDS = "unzip"
diff --git a/packages/ccid/ccid_1.3.8.bb b/packages/ccid/ccid_1.3.8.bb
index 033af6c3d5..c2ade3119a 100644
--- a/packages/ccid/ccid_1.3.8.bb
+++ b/packages/ccid/ccid_1.3.8.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Generic USB CCID smart card reader driver"
 HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libusb pcsc-lite"
 RDEPENDS = "pcsc-lite"
diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
index 15447b0ddc..466a116ec2 100644
--- a/packages/ccxstream/ccxstream_1.0.15.bb
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "XStream Server"
 DEPENDS = "readline"
 LICENSE = "GPLv2"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
 	file://ccxstream-termcap.patch;patch=1 \
diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb
index 61488260f7..ce8e4f47ad 100644
--- a/packages/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb
@@ -2,7 +2,7 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-FILE_PR ="r2"
+PR ="r2"
 LICENSE="GPL"
 
 SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \
diff --git a/packages/cdstatus/cdstatus_0.96.05.bb b/packages/cdstatus/cdstatus_0.96.05.bb
index c636de3c31..acff6a5861 100644
--- a/packages/cdstatus/cdstatus_0.96.05.bb
+++ b/packages/cdstatus/cdstatus_0.96.05.bb
@@ -1,6 +1,6 @@
 # cdstatus OE build file
 
-FILE_PR ="r2"
+PR ="r2"
 LICENSE="GPL"
 HOMEPAGE = "http://cdstatus.sourceforge.net/"
 FILES_${PN} += "${datadir}/cdstatus.cfg"
diff --git a/packages/centerim/centerim_4.22.5.bb b/packages/centerim/centerim_4.22.5.bb
index 80692c2b1b..c00dcaaf68 100644
--- a/packages/centerim/centerim_4.22.5.bb
+++ b/packages/centerim/centerim_4.22.5.bb
@@ -1,3 +1,3 @@
 require centerim.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/cetools/cetools_0.3.bb b/packages/cetools/cetools_0.3.bb
index 6064bdda9c..aa97ec5527 100644
--- a/packages/cetools/cetools_0.3.bb
+++ b/packages/cetools/cetools_0.3.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SRC_URI = "http://linuxsh.free.fr/tools/cetools-${PV}.tar.gz \
 	   file://sean-hsieh.patch;patch=1"
 S = "${WORKDIR}/cetools-${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/cfu1/cfu1-modules_2.6.bb b/packages/cfu1/cfu1-modules_2.6.bb
index 7fd905f6bd..b6446c689b 100644
--- a/packages/cfu1/cfu1-modules_2.6.bb
+++ b/packages/cfu1/cfu1-modules_2.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 RDEPENDS = "kernel-module-usbcore"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "file://rex-cfu1.conf \
            file://Makefile \
diff --git a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
index e8e2f9dd14..28cc1bf277 100644
--- a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
+++ b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
@@ -1,5 +1,5 @@
 require changedfiles.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://autofoo.patch;patch=1"
 
diff --git a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
index 7da7606e9b..c24a473beb 100644
--- a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
+++ b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
@@ -1,6 +1,6 @@
 require changedfiles.inc
 
-FILE_PR = "r2"
+PR = "r2"
 B = "${WORKDIR}/changedfiles-${PV}/module"
 
 inherit module
diff --git a/packages/check/check_0.9.2.bb b/packages/check/check_0.9.2.bb
index ba7473fc9b..101f963293 100644
--- a/packages/check/check_0.9.2.bb
+++ b/packages/check/check_0.9.2.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 SECTION = "devel"
 
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz"
 S = "${WORKDIR}/check-${PV}"
diff --git a/packages/cherokee/cherokee_0.4.29.bb b/packages/cherokee/cherokee_0.4.29.bb
index 3e24d20f7e..42eae684e7 100644
--- a/packages/cherokee/cherokee_0.4.29.bb
+++ b/packages/cherokee/cherokee_0.4.29.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \
 	  file://Makefile.in.patch;patch=1 \
 	  file://Makefile.cget.patch;patch=1 \
 	  file://util.patch;patch=1"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
index 80df3f40fe..c0f1396c7d 100644
--- a/packages/cherokee/cherokee_0.5.3.bb
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI_append = "file://configure.patch;patch=1 \
                   file://Makefile.in.patch;patch=1 \
diff --git a/packages/cherokee/cherokee_0.5.5.bb b/packages/cherokee/cherokee_0.5.5.bb
index 01fd4c4b6c..e1fe602282 100644
--- a/packages/cherokee/cherokee_0.5.5.bb
+++ b/packages/cherokee/cherokee_0.5.5.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI_append = "file://configure.in.patch;patch=1 \
                   file://Makefile.am.patch;patch=1"
diff --git a/packages/chillispot/chillispot_0.98.bb b/packages/chillispot/chillispot_0.98.bb
index 14d420206a..98b123e394 100644
--- a/packages/chillispot/chillispot_0.98.bb
+++ b/packages/chillispot/chillispot_0.98.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN access point controller. It is used for authenticating users of a wireless LAN."
 HOMEPAGE = "http://www.chillispot.org/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \
 	file://no-ansi.patch;patch=1 \
diff --git a/packages/chkhinge/chkhinge_20040706.bb b/packages/chkhinge/chkhinge_20040706.bb
index aede2451b5..4159b487ed 100644
--- a/packages/chkhinge/chkhinge_20040706.bb
+++ b/packages/chkhinge/chkhinge_20040706.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 SRC_URI = "${HANDHELDS_CVS};module=apps/chkhinge;date=${PV}"
 LICENSE = "MIT"
 S = "${WORKDIR}/chkhinge"
-FILE_PR = "r1"
+PR = "r1"
 
 FILES_${PN} = "/bin"
 
diff --git a/packages/chumby/chumby-firmware_1.2.bb b/packages/chumby/chumby-firmware_1.2.bb
index 4a50082e17..73e3a4a7a9 100644
--- a/packages/chumby/chumby-firmware_1.2.bb
+++ b/packages/chumby/chumby-firmware_1.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Binary Chumby firmware for kexec"
 PACKAGES = "${PN}-k2 ${PN}-rfs2 ${PN}-bl ${PN}-psp ${PN}-k1 ${PN}-rfs1"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://files.chumby.com/resources/chumby_fw_1_2.zip"
 S = ${WORKDIR}
diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb
index f9d25fcdbf..1317328619 100644
--- a/packages/ckermit/ckermit_211.bb
+++ b/packages/ckermit/ckermit_211.bb
@@ -7,7 +7,7 @@ LICENSE = "Kermit"
 HOMEPAGE = "http://www.columbia.edu/kermit/"
 SECTION = "console/network"
 SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz"
-FILE_PR = "r1"
+PR = "r1"
 
 #
 # From http://www.columbia.edu/kermit/ck80.html#license
diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb
index 7380ac1016..9592adf914 100644
--- a/packages/clamav/clamav_0.90.2.bb
+++ b/packages/clamav/clamav_0.90.2.bb
@@ -1,3 +1,3 @@
 require clamav.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/clamav/clamav_0.90.3.bb b/packages/clamav/clamav_0.90.3.bb
index 310df97223..e721558efe 100644
--- a/packages/clamav/clamav_0.90.3.bb
+++ b/packages/clamav/clamav_0.90.3.bb
@@ -1,3 +1,3 @@
 require clamav.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/clamav/clamav_0.91.1.bb b/packages/clamav/clamav_0.91.1.bb
index 310df97223..e721558efe 100644
--- a/packages/clamav/clamav_0.91.1.bb
+++ b/packages/clamav/clamav_0.91.1.bb
@@ -1,3 +1,3 @@
 require clamav.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/clamsmtp/clamsmtp_1.8.bb b/packages/clamsmtp/clamsmtp_1.8.bb
index cf64f5ecbd..984d203e36 100644
--- a/packages/clamsmtp/clamsmtp_1.8.bb
+++ b/packages/clamsmtp/clamsmtp_1.8.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "BSD"
 DEPENDS = "clamav"
 RDEPENDS_${PN} = "clamav-daemon"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \
            file://update-config.patch;patch=1 \
diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb
index d194d415de..5a471b3808 100644
--- a/packages/classpath/classpath-initial_0.93.bb
+++ b/packages/classpath/classpath-initial_0.93.bb
@@ -5,7 +5,7 @@ require classpath-native.inc
 
 DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
 
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "zip-native fastjar-native jikes-native gettext-native"
 
diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb
index 947865ff77..94f8dec610 100644
--- a/packages/classpath/classpath-minimal_0.96.1.bb
+++ b/packages/classpath/classpath-minimal_0.96.1.bb
@@ -1,6 +1,6 @@
 require classpath.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI += "\
   file://gjar-prefix-patch.diff;patch=1;pnum=0 \
diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 963f4a989d..e03dc85760 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -12,7 +12,7 @@ SRC_URI += "\
   file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
-FILE_PR = "r3"
+PR = "r3"
 
 PROVIDES = "${PN} classpath"
 
diff --git a/packages/classpath/classpath-native_0.96.1.bb b/packages/classpath/classpath-native_0.96.1.bb
index 0633a41ad1..2d7ebad76f 100644
--- a/packages/classpath/classpath-native_0.96.1.bb
+++ b/packages/classpath/classpath-native_0.96.1.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "\
   file://gjar-prefix-patch.diff;patch=1;pnum=0 \
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index b1a5040812..0024136b97 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb
index 392c3d5075..7e5ca458b0 100644
--- a/packages/classpath/classpath_0.95.bb
+++ b/packages/classpath/classpath_0.95.bb
@@ -6,7 +6,7 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   "
 
-FILE_PR = "r5"
+PR = "r5"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb
index 084b040458..b4dd8b53e7 100644
--- a/packages/classpath/classpath_0.96.1.bb
+++ b/packages/classpath/classpath_0.96.1.bb
@@ -6,7 +6,7 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   "
 
-FILE_PR = "r7"
+PR = "r7"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index ac1dea3212..a6327d3710 100644
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -11,7 +11,7 @@ SRC_URI += "\
   file://drawpolyline.patch;patch=1;pnum=0 \
   "
 
-FILE_PR = "r5"
+PR = "r5"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb
index 3160cacd65..6c41497ef4 100644
--- a/packages/clearsilver/clearsilver_0.10.3.bb
+++ b/packages/clearsilver/clearsilver_0.10.3.bb
@@ -3,7 +3,7 @@ SECTION = "net"
 DESCRIPTION = "Clearsilver is a fast, powerful, and language-neutral HTML template system"
 LICENSE = "Neotonic ClearSilver License"
 DEPENDS = "python"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
            file://crosscompile.patch;patch=1"
diff --git a/packages/clish/clish_0.7.1.bb b/packages/clish/clish_0.7.1.bb
index bddc5d05e5..8b7a797cc4 100644
--- a/packages/clish/clish_0.7.1.bb
+++ b/packages/clish/clish_0.7.1.bb
@@ -3,7 +3,7 @@
 DESCRIPTION = "modular framework for implementing a CISCO-like CLI on a *NIX system"
 LICENSE = "GPL"
 SECTION = "console/utils"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clish/clish-0.7.1.tar.gz"
 
diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb
index 93186448db..f241622a50 100644
--- a/packages/clutter/clutter-box2d_svn.bb
+++ b/packages/clutter/clutter-box2d_svn.bb
@@ -1,7 +1,7 @@
 require clutter-box2d.inc
 
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
 
diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb
index 98d46b8e28..cf88871ae0 100644
--- a/packages/clutter/clutter_svn.bb
+++ b/packages/clutter/clutter_svn.bb
@@ -1,7 +1,7 @@
 require clutter.inc
 
 PV = "0.8.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
            file://enable_tests.patch;patch=1;maxrev=2989 \
diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb
index 7dce3570d7..8ce97bbeab 100644
--- a/packages/clutter/moblin-proto_git.bb
+++ b/packages/clutter/moblin-proto_git.bb
@@ -1,7 +1,7 @@
 DEPENDS = "clutter-box2d"
 
 PV = "0.0+git${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
            file://paths.patch;patch=1"
diff --git a/packages/clutter/tidy_svn.bb b/packages/clutter/tidy_svn.bb
index 62a669a2c7..348bba0a8e 100644
--- a/packages/clutter/tidy_svn.bb
+++ b/packages/clutter/tidy_svn.bb
@@ -1,7 +1,7 @@
 require tidy.inc
 
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "6"
+PR = "6"
 
 SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
            file://tidy-enable-tests.patch;patch=1"
diff --git a/packages/cmake/cmake.inc b/packages/cmake/cmake.inc
index 81d1090c64..eb816680cd 100644
--- a/packages/cmake/cmake.inc
+++ b/packages/cmake/cmake.inc
@@ -5,7 +5,7 @@ DESCRIPTION = "A cross-platform, open-source make system"
 HOMEPAGE = "http://www.cmake.org/"
 LICENSE = "Berkeley-style license"
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
diff --git a/packages/cnc/openredalert_r438.bb b/packages/cnc/openredalert_r438.bb
index e8bca98478..098f293b2e 100644
--- a/packages/cnc/openredalert_r438.bb
+++ b/packages/cnc/openredalert_r438.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.g
            file://gcc43-fix.patch;patch=1 \
            file://openredalert-launcher"
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}"
 
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
index 139c308460..884d196681 100644
--- a/packages/conserver/conserver_8.1.14.bb
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require conserver.inc
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index 086f02f70d..3aa11df94b 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require conserver.inc
diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb
index fbe6b0d06f..1a02827021 100644
--- a/packages/console-tools/console-tools_0.3.2.bb
+++ b/packages/console-tools/console-tools_0.3.2.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "Allows you to set-up and manipulate the Linux console."
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://codepage.patch;patch=1 \
diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb
index 76e2dd05f7..74e27a8d70 100644
--- a/packages/coreutils/coreutils_5.0.bb
+++ b/packages/coreutils/coreutils_5.0.bb
@@ -1,6 +1,6 @@
 require coreutils.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \
 	   file://malloc.patch;patch=1 \
diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb
index e020c9053c..e8ae798691 100644
--- a/packages/coreutils/coreutils_5.1.1.bb
+++ b/packages/coreutils/coreutils_5.1.1.bb
@@ -1,5 +1,5 @@
 require coreutils.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2"
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb
index b6354af2ed..da9b214af5 100644
--- a/packages/coreutils/coreutils_5.1.3.bb
+++ b/packages/coreutils/coreutils_5.1.3.bb
@@ -1,6 +1,6 @@
 require coreutils.inc
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://install-cross.patch;patch=1;pnum=0 \
diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb
index 0f9fd9e3a3..42ac2c15af 100644
--- a/packages/coreutils/coreutils_5.3.0.bb
+++ b/packages/coreutils/coreutils_5.3.0.bb
@@ -1,6 +1,6 @@
 require coreutils.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://install-cross.patch;patch=1;pnum=0 \
diff --git a/packages/corsair/corsair_0.2.6.bb b/packages/corsair/corsair_0.2.6.bb
index c230a9dac5..280d10681c 100644
--- a/packages/corsair/corsair_0.2.6.bb
+++ b/packages/corsair/corsair_0.2.6.bb
@@ -5,7 +5,7 @@ AUTHOR = "Joe Rumsey <joe@rumsey.org>"
 HOMEPAGE = "http://corsair.sf.net/"
 RDEPENDS = "opie-pics"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit palmtop
 
diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb
index 07329947ef..c21a59a44a 100644
--- a/packages/cpio/cpio_2.5.bb
+++ b/packages/cpio/cpio_2.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files."
 HOMEPAGE = "http://www.gnu.org/software/cpio/"
 SECTION = "console"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS += " texinfo-native "
 
diff --git a/packages/cramfs/cramfs-native_1.1.bb b/packages/cramfs/cramfs-native_1.1.bb
index d26b1d434b..062a704ea5 100644
--- a/packages/cramfs/cramfs-native_1.1.bb
+++ b/packages/cramfs/cramfs-native_1.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION="Builds cramfs filesystems for embedded systems"
 SECTION = "base"
 LICENSE="GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cramfs/cramfs-1.1.tar.gz \
 	file://makefile.patch;patch=1 \
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
index ea289a1d8e..6e84c46570 100644
--- a/packages/crimsonfields/crimsonfields_0.4.8.bb
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle
 SECTION = "games"
 DEPENDS = "crimsonfields-native virtual/libsdl libsdl-mixer libsdl-ttf"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \
            file://native-tools.patch;patch=1"
diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb
index 1c24dce98e..f7c2ccc6ba 100644
--- a/packages/cron/cron_3.0pl1.bb
+++ b/packages/cron/cron_3.0pl1.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "Vixie cron."
 LICENSE = "cron"
-FILE_PR ="r8"
+PR ="r8"
 DEPENDS += "install-native"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
diff --git a/packages/cryptsetup/cryptsetup_1.0.5.bb b/packages/cryptsetup/cryptsetup_1.0.5.bb
index 8aaa95581a..7c070dc651 100644
--- a/packages/cryptsetup/cryptsetup_1.0.5.bb
+++ b/packages/cryptsetup/cryptsetup_1.0.5.bb
@@ -13,7 +13,7 @@ RRECOMMENDS = "kernel-module-aes \
                kernel-module-cbc \
                kernel-module-sha256 \
               "
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://luks.endorphin.org/source/cryptsetup-${PV}.tar.bz2"
 
diff --git a/packages/ctorrent/ctorrent_1.3.4.bb b/packages/ctorrent/ctorrent_1.3.4.bb
index b3563a8240..1b6d96c204 100644
--- a/packages/ctorrent/ctorrent_1.3.4.bb
+++ b/packages/ctorrent/ctorrent_1.3.4.bb
@@ -1,4 +1,4 @@
 require ctorrent.inc
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://extended_ctorrent.diff;patch=1"
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
index dd352da349..53be0cef76 100644
--- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ctrlproxy is an IRC server with multiserver support."
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 libxml2 popt libpcre openssl"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 
 SRC_URI = "http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz"
diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
index 73589e2554..1bafeb9d9b 100644
--- a/packages/cumulus/cumulus_1.2.1.bb
+++ b/packages/cumulus/cumulus_1.2.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "cumulus"
 APPDESKTOP = "${S}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_downloads/${PV}/cumulus-${PV}.src.tar.bz2"
 S = "${WORKDIR}/cumulus_${PV}/cumulus"
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 371d96677d..133e0e704f 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -6,7 +6,7 @@ APPTYPE = "binary"
 APPNAME = "cumulus"
 APPDESKTOP = "${S}"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz"
 S = "${WORKDIR}/cumulus/cumulus"
diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
index 58459ce2d1..b17d899a3d 100644
--- a/packages/cups/cups_1.1.23.bb
+++ b/packages/cups/cups_1.1.23.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An Internet printing system for Unix."
 SECTION = "console/utils"
 LICENSE = "GPL LGPL"
 DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
            file://strftime_fix.patch;patch=1"
diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb
index e286abd9e7..2361565a91 100644
--- a/packages/cups/cups_1.2.10.bb
+++ b/packages/cups/cups_1.2.10.bb
@@ -1,4 +1,4 @@
 require cups.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
diff --git a/packages/cups/cups_1.2.12.bb b/packages/cups/cups_1.2.12.bb
index e415868348..662f0ec8ff 100644
--- a/packages/cups/cups_1.2.12.bb
+++ b/packages/cups/cups_1.2.12.bb
@@ -1,5 +1,5 @@
 require cups.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb
index 8e12d089cb..24249fa3b1 100644
--- a/packages/cups/cups_1.2.7.bb
+++ b/packages/cups/cups_1.2.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An Internet printing system for Unix."
 SECTION = "console/utils"
 LICENSE = "GPL LGPL"
 DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
 	  "
diff --git a/packages/curl/curl_7.19.0.bb b/packages/curl/curl_7.19.0.bb
index e2b73ee539..a99a68bcb1 100644
--- a/packages/curl/curl_7.19.0.bb
+++ b/packages/curl/curl_7.19.0.bb
@@ -1,5 +1,5 @@
 require curl.inc
 
 SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
-FILE_PR = "r1"
+PR = "r1"
 
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 9f6fd4bccd..e80340f080 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl virtual/db"
 LICENSE = "BSD"
-FILE_PR = "r12"
+PR = "r12"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.5.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.5.bb
index bf1af8171d..6dc81c5e3f 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.5.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.5.bb
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "BSD"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
index 860c43132e..00cad2d6d6 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
@@ -3,7 +3,7 @@ DEPENDS = "virtual/db"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
index ff44739edb..a863d3e5ad 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
@@ -3,7 +3,7 @@ DEPENDS = "virtual/db"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz"
 
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 23626ec148..b179298355 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DEPENDS = "openssl virtual/db"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://berkdb.m4.patch;patch=1 \
diff --git a/packages/dash/dash_0.5.2.bb b/packages/dash/dash_0.5.2.bb
index a2b398d919..ee4e8c1bd6 100644
--- a/packages/dash/dash_0.5.2.bb
+++ b/packages/dash/dash_0.5.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Debian Almquist Shell is a POSIX compliant shell that is much smaller than 'bash'."
 PROVIDES = "virtual/sh"
 LICENSE = "BSD GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}.orig.tar.gz \
 	http://snapshot.debian.net/archive/2005/07/11/debian/pool/main/d/dash/dash_0.5.2-6.diff.gz;patch=1 \
diff --git a/packages/dasher/dasher-gpe_0.0-svn.bb b/packages/dasher/dasher-gpe_0.0-svn.bb
index c7068a2b31..297aa9ac4f 100644
--- a/packages/dasher/dasher-gpe_0.0-svn.bb
+++ b/packages/dasher/dasher-gpe_0.0-svn.bb
@@ -1,6 +1,6 @@
 LICENSE="GPL"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libxsettings-client libglade libxtst gconf gtk+"
 SECTION = "gpe"
 SRC_URI = "svn://svn.gnome.org/svn/dasher;module=trunk \
diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb
index 610466d060..310ccabb32 100644
--- a/packages/davfs2/davfs2_0.2.7.bb
+++ b/packages/davfs2/davfs2_0.2.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "neon-0.24.7"
 RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
            file://no-func-checks.patch;patch=1 \
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index 4404597757..e49c4af424 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5"
 RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
            file://Makefile.in.patch;patch=1 \
diff --git a/packages/db/db3_3.2.9.bb b/packages/db/db3_3.2.9.bb
index 5e2f1553ab..872ceeab87 100644
--- a/packages/db/db3_3.2.9.bb
+++ b/packages/db/db3_3.2.9.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DESCRIPTION = "Berkeley DB v3."
 HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD"
-FILE_PR = "r3"
+PR = "r3"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db"
 
diff --git a/packages/db/db_4.2.52.bb b/packages/db/db_4.2.52.bb
index da6d3627f3..ae9591ddcb 100644
--- a/packages/db/db_4.2.52.bb
+++ b/packages/db/db_4.2.52.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 #major version number
 PVM = "4.2"
diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb
index c7436bfaa7..d5733beb39 100644
--- a/packages/db/db_4.3.29.bb
+++ b/packages/db/db_4.3.29.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 # major version number
 PVM = "4.3"
diff --git a/packages/dbench/dbench_4.0.bb b/packages/dbench/dbench_4.0.bb
index 030aae031c..aade4170ba 100644
--- a/packages/dbench/dbench_4.0.bb
+++ b/packages/dbench/dbench_4.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION_dbench = "Filesystem load benchmark"
 DESCRIPTION_tbench = "TCP load benchmark"
 HOMEPAGE = "http://samba.org/ftp/tridge/dbench/"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb
index 848758c438..c15349f6fd 100644
--- a/packages/dbh/dbh_1.0-18.bb
+++ b/packages/dbh/dbh_1.0-18.bb
@@ -4,7 +4,7 @@ DESCRIPTION ="Disk based hashes is a method to create multidimensional binary tr
 HOMEPAGE = "http://dbh.sourceforge.net"
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1"
diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 1745868ea1..8ed5c44d94 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
 AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
 
-FILE_PR = "r4"
+PR = "r4"
 
 inherit java-library
 
diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb
index 9d603837c5..37c539b20e 100644
--- a/packages/dbus-java/dbus-java_2.4.bb
+++ b/packages/dbus-java/dbus-java_2.4.bb
@@ -9,7 +9,7 @@ DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-n
 RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
 RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
 RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
 
diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb
index 37e4109fca..a3ab37bd9e 100644
--- a/packages/dbus-java/dbus-java_2.5.bb
+++ b/packages/dbus-java/dbus-java_2.5.bb
@@ -9,7 +9,7 @@ DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-n
 RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}"
 RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
 RSUGGESTS_libdbus-java = "libunixsocket-java"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
 
diff --git a/packages/dbus/dbus-glib-native_0.74.bb b/packages/dbus/dbus-glib-native_0.74.bb
index a8e95230ee..e37a64cfea 100644
--- a/packages/dbus/dbus-glib-native_0.74.bb
+++ b/packages/dbus/dbus-glib-native_0.74.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dbus/dbus-glib-native_0.76.bb b/packages/dbus/dbus-glib-native_0.76.bb
index 5f39a2d8a2..d76cc043d4 100644
--- a/packages/dbus/dbus-glib-native_0.76.bb
+++ b/packages/dbus/dbus-glib-native_0.76.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dbus/dbus-glib_0.74.bb b/packages/dbus/dbus-glib_0.74.bb
index 4617d08abd..3c5512feb6 100644
--- a/packages/dbus/dbus-glib_0.74.bb
+++ b/packages/dbus/dbus-glib_0.74.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dbus/dbus-glib_0.76.bb b/packages/dbus/dbus-glib_0.76.bb
index 7bdaa436e6..0a34c738c3 100644
--- a/packages/dbus/dbus-glib_0.76.bb
+++ b/packages/dbus/dbus-glib_0.76.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb
index 890809cf77..b3768ceb1e 100644
--- a/packages/dbus/dbus_1.0.3.bb
+++ b/packages/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-FILE_PR = "r14"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index d9be71ad6b..3f586ed12d 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-FILE_PR = "r7"
+PR = "r7"
diff --git a/packages/dcron/dcron_2.3.3.bb b/packages/dcron/dcron_2.3.3.bb
index fe9d2decff..d965bbecca 100644
--- a/packages/dcron/dcron_2.3.3.bb
+++ b/packages/dcron/dcron_2.3.3.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "Dillon's Cron is a multi-user cron written from scratch, \
 similar to vixie-cron but with major differences."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/dcron-${PV}.tar.gz \
 	   file://compile.patch;patch=1 \
diff --git a/packages/debianutils/debianutils_2.19.bb b/packages/debianutils/debianutils_2.19.bb
index ebc8a324a1..7569797f93 100644
--- a/packages/debianutils/debianutils_2.19.bb
+++ b/packages/debianutils/debianutils_2.19.bb
@@ -2,4 +2,4 @@
 # Released under the MIT license (see packages/COPYING)
 
 require debianutils.inc
-FILE_PR ="r0"
+PR ="r0"
diff --git a/packages/dejagnu/dejagnu-native_1.4.4.bb b/packages/dejagnu/dejagnu-native_1.4.4.bb
index 945aa9701c..07c4cffdc6 100644
--- a/packages/dejagnu/dejagnu-native_1.4.4.bb
+++ b/packages/dejagnu/dejagnu-native_1.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 require dejagnu_${PV}.bb
 S = "${WORKDIR}/dejagnu-${PV}"
diff --git a/packages/dejagnu/dejagnu_1.4.4.bb b/packages/dejagnu/dejagnu_1.4.4.bb
index b7b30f20bd..9d5d7f740a 100644
--- a/packages/dejagnu/dejagnu_1.4.4.bb
+++ b/packages/dejagnu/dejagnu_1.4.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU unit testing framework, written in Expect and Tcl"
 LICENSE = "GPL"
 SECTION = "devel"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-${PV}.tar.gz"
 
diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb
index 09930edf11..a764f1335f 100644
--- a/packages/detect-stylus/detect-stylus_0.10.bb
+++ b/packages/detect-stylus/detect-stylus_0.10.bb
@@ -1,7 +1,7 @@
 inherit gpe pkgconfig
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "virtual/libx11 xrdb xcursor-transparent-theme"
 RDEPENDS = "xrdb xcursor-transparent-theme"
diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb
index 58ab038e46..932f1a6d62 100644
--- a/packages/detect-stylus/detect-stylus_0.13.bb
+++ b/packages/detect-stylus/detect-stylus_0.13.bb
@@ -1,7 +1,7 @@
 inherit gpe pkgconfig
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb"
 SECTION = "gpe"
diff --git a/packages/detect-stylus/detect-stylus_svn.bb b/packages/detect-stylus/detect-stylus_svn.bb
index 498df13327..7f4385473c 100644
--- a/packages/detect-stylus/detect-stylus_svn.bb
+++ b/packages/detect-stylus/detect-stylus_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb"
 RDEPENDS = "xrdb"
 PV = "0.13+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe pkgconfig
 
diff --git a/packages/device-mapper/device-mapper_1.01.04.bb b/packages/device-mapper/device-mapper_1.01.04.bb
index 6603bb7d27..2e1da9feaa 100644
--- a/packages/device-mapper/device-mapper_1.01.04.bb
+++ b/packages/device-mapper/device-mapper_1.01.04.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
 that supports logical volume management. It is required by LVM2 and EVMS. \
 The original LVM (included in stock 2.4 kernels) does not use it."
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/${PN}.${PV}"
 
diff --git a/packages/device-mapper/device-mapper_1.01.05.bb b/packages/device-mapper/device-mapper_1.01.05.bb
index 2aae917de1..bc02e6a71f 100644
--- a/packages/device-mapper/device-mapper_1.01.05.bb
+++ b/packages/device-mapper/device-mapper_1.01.05.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
 that supports logical volume management. It is required by LVM2 and EVMS. \
 The original LVM (included in stock 2.4 kernels) does not use it."
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 S = "${WORKDIR}/${PN}.${PV}"
 
diff --git a/packages/devlabel/devlabel_0.48.01.bb b/packages/devlabel/devlabel_0.48.01.bb
index 871d7f8cbe..d26cc56d05 100644
--- a/packages/devlabel/devlabel_0.48.01.bb
+++ b/packages/devlabel/devlabel_0.48.01.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "tool for user-define static device labels"
 DEPENDS = "e2fsprogs-libs"
 RDEPENDS = "bash util-linux"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://linux.dell.com/devlabel/permalink/devlabel-${PV}.tar.gz"
 
diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb
index 3ffff1743c..5cb95cbac8 100644
--- a/packages/dfu-util/dfu-util_svn.bb
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 AUTHOR = "Harald Welte <laforge@openmoko.org>"
 LICENSE = "GPL"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "libusb usbpath"
 
diff --git a/packages/dhcdbd/dhcdbd_1.14.bb b/packages/dhcdbd/dhcdbd_1.14.bb
index fb7dc3b469..2da37f4466 100644
--- a/packages/dhcdbd/dhcdbd_1.14.bb
+++ b/packages/dhcdbd/dhcdbd_1.14.bb
@@ -4,7 +4,7 @@ SECTION = "net"
 LICENSE = "GPL"
 DEPENDS = "dbus"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://people.redhat.com/jvdias/dhcdbd/dhcdbd-${PV}.tar.gz \
            file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \
diff --git a/packages/dhcp/dhcp_3.0.1.bb b/packages/dhcp/dhcp_3.0.1.bb
index 454500bf8e..7d55dc3a03 100644
--- a/packages/dhcp/dhcp_3.0.1.bb
+++ b/packages/dhcp/dhcp_3.0.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-FILE_PR = "r3"
+PR = "r3"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://fixincludes.patch;patch=1 \
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 442abfcfd0..6b0f9de1bf 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-FILE_PR = "r6"
+PR = "r6"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://fixincludes.patch;patch=1 \
diff --git a/packages/dhcpcd/dhcpcd_1.3.22-pl4.bb b/packages/dhcpcd/dhcpcd_1.3.22-pl4.bb
index ba96131ed4..63c8023302 100644
--- a/packages/dhcpcd/dhcpcd_1.3.22-pl4.bb
+++ b/packages/dhcpcd/dhcpcd_1.3.22-pl4.bb
@@ -5,7 +5,7 @@ RFC1541-compliant DHCP client daemon. It gets an IP address \
 and other information from the DHCP server, automatically \
 configures the network interface, and tries to renew the \
 lease time according to RFC2131 or RFC1541."
-FILE_PR = "r1"
+PR = "r1"
 
 sbindir = "/sbin"
 
diff --git a/packages/dia/dia_0.94+0.95pre3.bb b/packages/dia/dia_0.94+0.95pre3.bb
index 482ccfee10..69b11f131a 100644
--- a/packages/dia/dia_0.94+0.95pre3.bb
+++ b/packages/dia/dia_0.94+0.95pre3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the G
 LICENSE = "GPL"
 SECTION = "x11/graphics"
 DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig
 
diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb
index 2536e38660..b979fa89f6 100644
--- a/packages/diffutils/diffutils_2.8.1.bb
+++ b/packages/diffutils/diffutils_2.8.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
 sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
index f91e1cad0e..925583d6f7 100644
--- a/packages/dillo/dillo_0.8.6.bb
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+-1.2 libpng openssl"
 RCONFLICTS = "dillo2"
-FILE_PR = "r2"
+PR = "r2"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
          file://dillo-i18n.diff;patch=1 \
          file://dillo.desktop \
diff --git a/packages/dircproxy/dircproxy_1.1.0.bb b/packages/dircproxy/dircproxy_1.1.0.bb
index 171739f014..59e4a33498 100644
--- a/packages/dircproxy/dircproxy_1.1.0.bb
+++ b/packages/dircproxy/dircproxy_1.1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "IRC proxy server"
 HOMEPAGE = "http://dircproxy.securiweb.net/"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dircproxy.securiweb.net/pub/1.1/dircproxy-${PV}.tar.gz\
            file://dircproxy.patch;patch=1"
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 49fa351b92..3c98ea8597 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -4,4 +4,4 @@ require directfb.inc
 SRC_URI += "file://fix-includes.patch;patch=1" 
 
 RV = "1.0-0"
-FILE_PR = "r6"
+PR = "r6"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 02bd79bbf1..cd21b81a80 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -1,6 +1,6 @@
 require directfb.inc
 
 RV = "1.1-0"
-FILE_PR = "r6"
+PR = "r6"
 
 LEAD_SONAME = "libdirect-1.1.so"
diff --git a/packages/directfb/directfb_1.1.1.bb b/packages/directfb/directfb_1.1.1.bb
index c70f6aae15..9b5588b627 100644
--- a/packages/directfb/directfb_1.1.1.bb
+++ b/packages/directfb/directfb_1.1.1.bb
@@ -1,7 +1,7 @@
 require directfb.inc
 
 RV = "1.1-0"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "sysfsutils"
 
diff --git a/packages/directfb/directfb_1.2.3.bb b/packages/directfb/directfb_1.2.3.bb
index 59545a1409..85e42a1fa3 100644
--- a/packages/directfb/directfb_1.2.3.bb
+++ b/packages/directfb/directfb_1.2.3.bb
@@ -1,7 +1,7 @@
 require directfb.inc
 
 RV = "1.2-0"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "sysfsutils"
 
diff --git a/packages/directfb/fusionsound_1.1.0+git20070709.bb b/packages/directfb/fusionsound_1.1.0+git20070709.bb
index c05bc64972..dda1de5333 100644
--- a/packages/directfb/fusionsound_1.1.0+git20070709.bb
+++ b/packages/directfb/fusionsound_1.1.0+git20070709.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "FusionSound for DirectFB"
 DEPENDS = "directfb"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \
 	   file://fix-pkgconfig-cflags.patch;patch=1 \
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
index 7dc3421a57..f06fde0fa9 100644
--- a/packages/display-brightness/display-brightness_1.0.0.bb
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "display brightness utility"
 AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
 DEPENDS = ""
 PRIORITY = "optional"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "GPLv2"
 
 SRC_URI = "file://display-brightness.sh"
diff --git a/packages/distcc/distcc_2.18.3.bb b/packages/distcc/distcc_2.18.3.bb
index 68256ebf07..959636fea9 100644
--- a/packages/distcc/distcc_2.18.3.bb
+++ b/packages/distcc/distcc_2.18.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "distcc is a parallel build system that distributes \
 compilation of C/C++/ObjC code across machines on a network."
 SECTION = "devel"
 LICENSE = "GPLv2"
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "avahi gtk+"
 RRECOMMENDS = "avahi-daemon"
diff --git a/packages/djvulibre/djvulibre_3.5.20.bb b/packages/djvulibre/djvulibre_3.5.20.bb
index 7741a1f32f..b8d49e0922 100644
--- a/packages/djvulibre/djvulibre_3.5.20.bb
+++ b/packages/djvulibre/djvulibre_3.5.20.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
 LICENSE = "GPL"
 DEPENDS = "jpeg libpng tiff"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
            file://fix-cross-configure.patch;patch=1"
diff --git a/packages/dmidecode/dmidecode_2.9.bb b/packages/dmidecode/dmidecode_2.9.bb
index bb13500eff..2186120498 100644
--- a/packages/dmidecode/dmidecode_2.9.bb
+++ b/packages/dmidecode/dmidecode_2.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE = "http://www.nongnu.org/dmidecode/"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
 
diff --git a/packages/dnsmasq/dnsmasq_2.15.bb b/packages/dnsmasq/dnsmasq_2.15.bb
index 64ed905c8a..0d71cf8ea7 100644
--- a/packages/dnsmasq/dnsmasq_2.15.bb
+++ b/packages/dnsmasq/dnsmasq_2.15.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r2"
+PR = "r2"
 
 require dnsmasq.inc
diff --git a/packages/docbook-utils/docbook-utils-native_0.6.14.bb b/packages/docbook-utils/docbook-utils-native_0.6.14.bb
index 5378777490..eef3f9e0fb 100644
--- a/packages/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/packages/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -1,7 +1,7 @@
 SECTION = "console/utils"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native"
 
diff --git a/packages/dosbox/dosbox_0.72.bb b/packages/dosbox/dosbox_0.72.bb
index fd3a32c2f9..930a2c31b0 100644
--- a/packages/dosbox/dosbox_0.72.bb
+++ b/packages/dosbox/dosbox_0.72.bb
@@ -1,6 +1,6 @@
 require dosbox.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://gcc-4.3.patch;patch=1"
 
diff --git a/packages/dosfstools/dosfstools-native_2.10.bb b/packages/dosfstools/dosfstools-native_2.10.bb
index 822654a7e6..0aae86beb9 100644
--- a/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/packages/dosfstools/dosfstools-native_2.10.bb
@@ -7,7 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}"
 
 S="${WORKDIR}/dosfstools-${PV}"
 
-FILE_PR ="r4"
+PR ="r4"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
diff --git a/packages/dosfstools/dosfstools_2.10.bb b/packages/dosfstools/dosfstools_2.10.bb
index 6b2fd6aa23..100044b75d 100644
--- a/packages/dosfstools/dosfstools_2.10.bb
+++ b/packages/dosfstools/dosfstools_2.10.bb
@@ -8,7 +8,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	   file://alignment_hack.patch;patch=1 \
diff --git a/packages/dosfstools/dosfstools_2.11.bb b/packages/dosfstools/dosfstools_2.11.bb
index 324e63cf1c..a5f6e034dd 100644
--- a/packages/dosfstools/dosfstools_2.11.bb
+++ b/packages/dosfstools/dosfstools_2.11.bb
@@ -8,7 +8,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	   file://alignment_hack.patch;patch=1 \
diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index 60e9d628de..7087f1f90a 100644
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-FILE_PR = "r3"
+PR = "r3"
 DEPENDS += "zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dpkg/dpkg-native_1.13.25.bb b/packages/dpkg/dpkg-native_1.13.25.bb
index 1d53d25ed5..0d60e0bddb 100644
--- a/packages/dpkg/dpkg-native_1.13.25.bb
+++ b/packages/dpkg/dpkg-native_1.13.25.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS += "zlib-native"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb
index 4a88550663..fb301a6db9 100644
--- a/packages/dpkg/dpkg_1.13.22.bb
+++ b/packages/dpkg/dpkg_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-FILE_PR = "r4"
+PR = "r4"
 DEPENDS += "ncurses zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dpkg/dpkg_1.13.25.bb b/packages/dpkg/dpkg_1.13.25.bb
index 8622e66891..a0bb1dcf47 100644
--- a/packages/dpkg/dpkg_1.13.25.bb
+++ b/packages/dpkg/dpkg_1.13.25.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS += "ncurses zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index d95dd47b07..7e0bddfcdc 100644
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "MIT"
 
 SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver \
diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
index 7d67239708..c947cf0e74 100644
--- a/packages/dropbear/dropbear-early_1.0.bb
+++ b/packages/dropbear/dropbear-early_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
 SECTION = "devel"
 RDEPENDS = "dropbear"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 
diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb
index afd2363014..bf2f2add60 100644
--- a/packages/dropbear/dropbear_0.49.bb
+++ b/packages/dropbear/dropbear_0.49.bb
@@ -1,5 +1,5 @@
 require dropbear.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://scp-argument-fix.patch;patch=1"
diff --git a/packages/dropbear/dropbear_0.51.bb b/packages/dropbear/dropbear_0.51.bb
index 44f32e8ba9..888819c0e5 100644
--- a/packages/dropbear/dropbear_0.51.bb
+++ b/packages/dropbear/dropbear_0.51.bb
@@ -1,4 +1,4 @@
 require dropbear.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://no-host-lookup.patch;patch=1"
\ No newline at end of file
diff --git a/packages/dsniff/dsniff_2.3.bb b/packages/dsniff/dsniff_2.3.bb
index b7cbf814d8..14da908b57 100644
--- a/packages/dsniff/dsniff_2.3.bb
+++ b/packages/dsniff/dsniff_2.3.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 HOMEPAGE = "http://www.monkey.org/~dugsong/dsniff/"
 AUTHOR = "Dug Song <dugsong@monkey.org>"
 LICENSE = "BSD"
-FILE_PR = "r2"
+PR = "r2"
 
 # There is a significant API change beween 1.0.2a of libnet and
 # 1.1.x, dsniff will only work with the older and there is no
diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb
index e4955a9ff7..62a352e43c 100644
--- a/packages/dsplink/dsplink_1.50.bb
+++ b/packages/dsplink/dsplink_1.50.bb
@@ -1,6 +1,6 @@
 require dsplink.inc
 
-FILE_PR = "r10"
+PR = "r10"
 PE = "1"
 PV = "1.50"
 
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index 40f65e5801..3c6d39e6c9 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -4,7 +4,7 @@ require dsplink.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
-FILE_PR = "r10"
+PR = "r10"
 PE = "1"
 PV = "1.51"
 
diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
index 1c9f73cda1..3878829ce5 100644
--- a/packages/dtnrg/dtn_2.5.0.bb
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
 SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz \
            file://configure_fix.patch;patch=1"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools
 
diff --git a/packages/dviviewer/dviviewer_1.0.2.bb b/packages/dviviewer/dviviewer_1.0.2.bb
index 1c9a2816e6..531ba73362 100644
--- a/packages/dviviewer/dviviewer_1.0.2.bb
+++ b/packages/dviviewer/dviviewer_1.0.2.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www013.upp.so-net.ne.jp/hn43o/dviviewer/"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www013.upp.so-net.ne.jp/hn43o/dviviewer/dviviewer-${PV}.tar.gz"
 S = "${WORKDIR}/dviviewer"
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 163e32f405..e16cad051d 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-FILE_PR = "r14"
+PR = "r14"
 
 inherit e update-alternatives
 
diff --git a/packages/e17/edje-editor_svn.bb b/packages/e17/edje-editor_svn.bb
index 8510d4740a..44e0158d6b 100644
--- a/packages/e17/edje-editor_svn.bb
+++ b/packages/e17/edje-editor_svn.bb
@@ -5,7 +5,7 @@ DEPENDS = "etk"
 SRCNAME = "edje_editor"
 
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit e
 
diff --git a/packages/e17/edje-player_svn.bb b/packages/e17/edje-player_svn.bb
index 0eae4b9a00..7cddee41a0 100644
--- a/packages/e17/edje-player_svn.bb
+++ b/packages/e17/edje-player_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 DEPENDS = "etk"
 SRCNAME = "edje_editor"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit e
 
diff --git a/packages/e17/edje-viewer_svn.bb b/packages/e17/edje-viewer_svn.bb
index 9bf4ed2e3f..bf3ab00e10 100644
--- a/packages/e17/edje-viewer_svn.bb
+++ b/packages/e17/edje-viewer_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT BSD"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit e
 
diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb
index 34133dba41..d365d63435 100644
--- a/packages/e17/enna_svn.bb
+++ b/packages/e17/enna_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
 DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
 SECTION = "x11/multimedia"
 PV = "0.2.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit e
 
diff --git a/packages/e17/entrance_0.9.0.010.bb b/packages/e17/entrance_0.9.0.010.bb
index 7756396fa5..a1ffe80023 100644
--- a/packages/e17/entrance_0.9.0.010.bb
+++ b/packages/e17/entrance_0.9.0.010.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 # can also use pam and crypt
 DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
 RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit e
 
diff --git a/packages/e17/exhibit_svn.bb b/packages/e17/exhibit_svn.bb
index f63dd749ed..2035bc193e 100644
--- a/packages/e17/exhibit_svn.bb
+++ b/packages/e17/exhibit_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Exhibit is the ETK picture viewer"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore epsilon edje eet etk efreet"
 PV = "0.1.1+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit e
diff --git a/packages/e17/expedite_svn.bb b/packages/e17/expedite_svn.bb
index 7f07c94ee9..1337487623 100644
--- a/packages/e17/expedite_svn.bb
+++ b/packages/e17/expedite_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "eet evas"
 RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT BSD"
 PV = "0.6.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit e
 
diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb
index 6cc09c7add..4777226df5 100644
--- a/packages/e17/exquisite_svn.bb
+++ b/packages/e17/exquisite_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A psplash replacement for display"
 LICENSE = "MIT BSD"
 DEPENDS = "eet evas ecore embryo edje"
 PV = "0.0.1+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit e
 
diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb
index cb13b85432..2c1521c813 100644
--- a/packages/e17/illume_svn.bb
+++ b/packages/e17/illume_svn.bb
@@ -4,7 +4,7 @@ AUTHOR = "Carsten 'Rasterman' Haitzler"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r13"
+PR = "r13"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=illume;proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
index 142f453ada..dfd83e3c1f 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
@@ -1,6 +1,6 @@
 require e2fsprogs-libs.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
            file://configure.patch;patch=1"
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
index f6ffe8c450..43679919a1 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
@@ -1,6 +1,6 @@
 require e2fsprogs-libs.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
 	   file://mkinstalldirs.patch;patch=1 \
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
index b0caa5c6be..388c519d0c 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
index 955036e7b1..f2c3898dbe 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-FILE_PR = "r1"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF = ""
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 4238fecac3..c92b48856f 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-FILE_PR = "r17"
+PR = "r17"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
diff --git a/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/packages/e2fsprogs/e2fsprogs_1.41.2.bb
index b932ed18c1..1b139d2a9c 100644
--- a/packages/e2fsprogs/e2fsprogs_1.41.2.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
diff --git a/packages/ebtables/ebtables_2.0.6.bb b/packages/ebtables/ebtables_2.0.6.bb
index e6ee2026ea..33ad2b9113 100644
--- a/packages/ebtables/ebtables_2.0.6.bb
+++ b/packages/ebtables/ebtables_2.0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux br
 PRIORITY = "optional"
 LICENSE = "GPL"
 SECTION = "console/network"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
            file://gcc34.patch;patch=1 \
diff --git a/packages/ecj/ecj-bootstrap-native.bb b/packages/ecj/ecj-bootstrap-native.bb
index 4ad933803a..2bda972207 100644
--- a/packages/ecj/ecj-bootstrap-native.bb
+++ b/packages/ecj/ecj-bootstrap-native.bb
@@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in"
 
 S = "${WORKDIR}"
 
-FILE_PR = "r1"
+PR = "r1"
 
 JAR = "ecj-bootstrap.jar"
 
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index 7bd392a885..4e40528747 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svnr${SRCREV}"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
diff --git a/packages/efl1/ecore-native_svn.bb b/packages/efl1/ecore-native_svn.bb
index b1ba5c7931..2fc383b367 100644
--- a/packages/efl1/ecore-native_svn.bb
+++ b/packages/efl1/ecore-native_svn.bb
@@ -1,7 +1,7 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-FILE_PR = "r2"
+PR = "r2"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 1265a6ac62..adb4378e20 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -4,7 +4,7 @@ DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver l
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
 PV = "0.9.9.043+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/ecore_svn.bb b/packages/efl1/ecore_svn.bb
index 8030dc7922..3bc51849d2 100644
--- a/packages/efl1/ecore_svn.bb
+++ b/packages/efl1/ecore_svn.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-FILE_PR = "r5"
+PR = "r5"
 
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl1/edb_svn.bb b/packages/efl1/edb_svn.bb
index 65bae7b5ed..4f8143ae87 100644
--- a/packages/efl1/edb_svn.bb
+++ b/packages/efl1/edb_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edb is the Enlightenment database library"
 LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.043+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/edbus_svn.bb b/packages/efl1/edbus_svn.bb
index f23af9030f..16b19e9619 100644
--- a/packages/efl1/edbus_svn.bb
+++ b/packages/efl1/edbus_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/edje-native_svn.bb b/packages/efl1/edje-native_svn.bb
index c95344230b..d71d38de99 100644
--- a/packages/efl1/edje-native_svn.bb
+++ b/packages/efl1/edje-native_svn.bb
@@ -1,6 +1,6 @@
 require edje_${PV}.bb
 inherit native
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
 
diff --git a/packages/efl1/edje-sdk_svn.bb b/packages/efl1/edje-sdk_svn.bb
index 52cf1d9c61..de307d7064 100644
--- a/packages/efl1/edje-sdk_svn.bb
+++ b/packages/efl1/edje-sdk_svn.bb
@@ -1,7 +1,7 @@
 require edje_svn.bb
 
 inherit sdk
-FILE_PR = "r0"
+PR = "r0"
 
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}"
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb
index 00b913fbb3..17c8f91024 100644
--- a/packages/efl1/edje_svn.bb
+++ b/packages/efl1/edje_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit efl
 
diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb
index 6ffcd98503..e801a543e7 100644
--- a/packages/efl1/eet_svn.bb
+++ b/packages/efl1/eet_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg openssl"
 LICENSE = "MIT BSD"
 PV = "1.0.1+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/eflpp_svn.bb b/packages/efl1/eflpp_svn.bb
index bc63e927fb..4942f5c548 100644
--- a/packages/efl1/eflpp_svn.bb
+++ b/packages/efl1/eflpp_svn.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/"
 LICENSE = "LGPL"
 DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r1" 
+PR = "r1" 
 
 inherit efl
 
diff --git a/packages/efl1/efreet_svn.bb b/packages/efl1/efreet_svn.bb
index 806eb489ae..37e9443d37 100644
--- a/packages/efl1/efreet_svn.bb
+++ b/packages/efl1/efreet_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
 PV = "0.5.0.043+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/embryo_svn.bb b/packages/efl1/embryo_svn.bb
index 6c6ea5effa..956ff77fb3 100644
--- a/packages/efl1/embryo_svn.bb
+++ b/packages/efl1/embryo_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.9.043+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/emotion_svn.bb b/packages/efl1/emotion_svn.bb
index e37b16f6ec..c1d3ff347a 100644
--- a/packages/efl1/emotion_svn.bb
+++ b/packages/efl1/emotion_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/engrave_svn.bb b/packages/efl1/engrave_svn.bb
index 136248209d..3dc5e332a2 100644
--- a/packages/efl1/engrave_svn.bb
+++ b/packages/efl1/engrave_svn.bb
@@ -3,6 +3,6 @@ LICENSE = "MIT"
 # also requires yacc and lex on host
 DEPENDS = "evas ecore"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit efl
diff --git a/packages/efl1/enhance_svn.bb b/packages/efl1/enhance_svn.bb
index 1123feb01e..dd09256655 100644
--- a/packages/efl1/enhance_svn.bb
+++ b/packages/efl1/enhance_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Enhance translates between glade .xml files and ETK"
 LICENSE = "MIT"
 DEPENDS = "exml"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit efl
diff --git a/packages/efl1/epdf_svn.bb b/packages/efl1/epdf_svn.bb
index fdc8e7c43c..7aeb537268 100644
--- a/packages/efl1/epdf_svn.bb
+++ b/packages/efl1/epdf_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "MIT BSD"
 DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/epeg_svn.bb b/packages/efl1/epeg_svn.bb
index a780aecc3d..25ea7fa0b9 100644
--- a/packages/efl1/epeg_svn.bb
+++ b/packages/efl1/epeg_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Epeg is a small library for handling thumbnails."
 LICENSE = "MIT"
 DEPENDS = "jpeg"
 PV = "0.9.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/epsilon_svn.bb b/packages/efl1/epsilon_svn.bb
index 21be8027a6..1da8d11b42 100644
--- a/packages/efl1/epsilon_svn.bb
+++ b/packages/efl1/epsilon_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "libpng evas ecore edje perl-native"
 PV = "0.3.0.012+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/esmart_svn.bb b/packages/efl1/esmart_svn.bb
index 0d4a018b5d..d0983e0765 100644
--- a/packages/efl1/esmart_svn.bb
+++ b/packages/efl1/esmart_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
 PV = "0.9.0.043+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/etk_svn.bb b/packages/efl1/etk_svn.bb
index 5c97ee1bd9..5c47c406d2 100644
--- a/packages/efl1/etk_svn.bb
+++ b/packages/efl1/etk_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
 PV = "0.1.0.042+svnr${SRCREV}"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit efl
 
diff --git a/packages/efl1/evas-native_svn.bb b/packages/efl1/evas-native_svn.bb
index c9881bf95d..3f85757cf9 100644
--- a/packages/efl1/evas-native_svn.bb
+++ b/packages/efl1/evas-native_svn.bb
@@ -1,7 +1,7 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-FILE_PR = "r2"
+PR = "r2"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index fe575d99d2..f1a2660d9a 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
 DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig"
 PV = "0.9.9.043+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 
 inherit efl
diff --git a/packages/efl1/evas_svn.bb b/packages/efl1/evas_svn.bb
index 46b086877d..a94ae1fc35 100644
--- a/packages/efl1/evas_svn.bb
+++ b/packages/efl1/evas_svn.bb
@@ -1,5 +1,5 @@
 require evas.inc
-FILE_PR = "r3"
+PR = "r3"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/evolve_svn.bb b/packages/efl1/evolve_svn.bb
index cfb4ee06a3..e38df93e24 100644
--- a/packages/efl1/evolve_svn.bb
+++ b/packages/efl1/evolve_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language"
 LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
diff --git a/packages/efl1/ewl_svn.bb b/packages/efl1/ewl_svn.bb
index e77384ccf0..336d3edf2f 100644
--- a/packages/efl1/ewl_svn.bb
+++ b/packages/efl1/ewl_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightened Widget Library"
 DEPENDS = "evas ecore edje emotion efreet epsilon"
 LICENSE = "MIT BSD"
 PV = "0.5.2.042+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit efl
 
diff --git a/packages/efl1/exml_svn.bb b/packages/efl1/exml_svn.bb
index 368172474d..363a23d7f1 100644
--- a/packages/efl1/exml_svn.bb
+++ b/packages/efl1/exml_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper."
 LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 PV = "0.1.1+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/imlib2_svn.bb b/packages/efl1/imlib2_svn.bb
index fea9f9b7b5..56cd61d55f 100644
--- a/packages/efl1/imlib2_svn.bb
+++ b/packages/efl1/imlib2_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PROVIDES = "virtual/imlib2"
 PV = "1.4.1.001+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit efl
 
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index 2766e2d45f..e23a13b5a2 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-FILE_PR = "r10"
+PR = "r10"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index 70521bad30..4a406d6516 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -9,7 +9,7 @@ DEPENDS += "qemu-native"
 
 PV = "22.0.50+cvs${SRCDATE}" 
 PE = "1"
-FILE_PR = "r9"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/emul/emul_1.0.5.bb b/packages/emul/emul_1.0.5.bb
index 6cc237aea6..261c604b91 100644
--- a/packages/emul/emul_1.0.5.bb
+++ b/packages/emul/emul_1.0.5.bb
@@ -3,7 +3,7 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libusb ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://download.berlios.de/emul/emul-${PV}.tar.gz"
 
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index a13ecf35a2..548a824523 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
 	file://configure-hack.patch;patch=1 \
diff --git a/packages/enchant/enchant_1.1.3.bb b/packages/enchant/enchant_1.1.3.bb
index e4ab0e44af..7618c5d3ee 100644
--- a/packages/enchant/enchant_1.1.3.bb
+++ b/packages/enchant/enchant_1.1.3.bb
@@ -7,7 +7,7 @@ RDEPENDS    = "aspell"
 
 inherit autotools pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/enchant-${PV}"
 
diff --git a/packages/enchant/enchant_1.2.5.bb b/packages/enchant/enchant_1.2.5.bb
index 67966d8757..be9082d2af 100644
--- a/packages/enchant/enchant_1.2.5.bb
+++ b/packages/enchant/enchant_1.2.5.bb
@@ -7,7 +7,7 @@ RDEPENDS    = "aspell"
 
 inherit autotools pkgconfig
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/enchant-${PV}"
 
diff --git a/packages/enchant/enchant_1.3.0.bb b/packages/enchant/enchant_1.3.0.bb
index 8e371386af..cceceebabf 100644
--- a/packages/enchant/enchant_1.3.0.bb
+++ b/packages/enchant/enchant_1.3.0.bb
@@ -7,7 +7,7 @@ RDEPENDS    = "aspell"
 
 inherit autotools pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/enchant-${PV}"
 
diff --git a/packages/epdfview/epdfview_0.1.6.bb b/packages/epdfview/epdfview_0.1.6.bb
index ef05a68afc..3cf2e5f026 100644
--- a/packages/epdfview/epdfview_0.1.6.bb
+++ b/packages/epdfview/epdfview_0.1.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
            file://poppler8.diff;patch=1 \
diff --git a/packages/esmtp/esmtp_0.5.1.bb b/packages/esmtp/esmtp_0.5.1.bb
index f9fe43563f..47709c1dac 100644
--- a/packages/esmtp/esmtp_0.5.1.bb
+++ b/packages/esmtp/esmtp_0.5.1.bb
@@ -5,7 +5,7 @@ mechanisms) and StartTLS SMTP extensions."
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "libesmtp"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2"
 
diff --git a/packages/esound/esound_0.2.36.bb b/packages/esound/esound_0.2.36.bb
index fa2ac44a07..388b52c7e3 100644
--- a/packages/esound/esound_0.2.36.bb
+++ b/packages/esound/esound_0.2.36.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/base"
 LICENSE = "GPL"
 DEPENDS = "audiofile"
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit gnome binconfig
 
diff --git a/packages/espeak/espeak-data_1.37.bb b/packages/espeak/espeak-data_1.37.bb
index 65b676fad5..4dc9aa9882 100644
--- a/packages/espeak/espeak-data_1.37.bb
+++ b/packages/espeak/espeak-data_1.37.bb
@@ -1,6 +1,6 @@
 require espeak.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit native
 
diff --git a/packages/espeak/espeak_1.37.bb b/packages/espeak/espeak_1.37.bb
index caa5ae62fa..4ea82e14b4 100644
--- a/packages/espeak/espeak_1.37.bb
+++ b/packages/espeak/espeak_1.37.bb
@@ -3,7 +3,7 @@ require espeak.inc
 EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
 RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
 
-FILE_PR = "r0"
+PR = "r0"
 
 CXXFLAGS += "-DUSE_PORTAUDIO"
 
diff --git a/packages/espgs/espgs_8.15.3.bb b/packages/espgs/espgs_8.15.3.bb
index 5319a54cfc..13cfad6d12 100644
--- a/packages/espgs/espgs_8.15.3.bb
+++ b/packages/espgs/espgs_8.15.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.cups.org/espgs/"
 SECTION = "libs"
 DEPENDS = "jpeg zlib libpng tiff fontconfig"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/${PV}/espgs-${PV}-source.tar.bz2"
 
diff --git a/packages/ethtool/ethtool_3.bb b/packages/ethtool/ethtool_3.bb
index 53bea065a4..ae17e10e76 100644
--- a/packages/ethtool/ethtool_3.bb
+++ b/packages/ethtool/ethtool_3.bb
@@ -1,2 +1,2 @@
 require ethtool.inc
-FILE_PR ="r1"
+PR ="r1"
diff --git a/packages/ethtool/ethtool_4.bb b/packages/ethtool/ethtool_4.bb
index 36b25b9d83..7335c3b025 100644
--- a/packages/ethtool/ethtool_4.bb
+++ b/packages/ethtool/ethtool_4.bb
@@ -1,2 +1,2 @@
 require ethtool.inc
-FILE_PR ="r0"
+PR ="r0"
diff --git a/packages/ethtool/ethtool_5.bb b/packages/ethtool/ethtool_5.bb
index 36b25b9d83..7335c3b025 100644
--- a/packages/ethtool/ethtool_5.bb
+++ b/packages/ethtool/ethtool_5.bb
@@ -1,2 +1,2 @@
 require ethtool.inc
-FILE_PR ="r0"
+PR ="r0"
diff --git a/packages/ethtool/ethtool_6.bb b/packages/ethtool/ethtool_6.bb
index 8b07ae7c67..4c9ae5304f 100644
--- a/packages/ethtool/ethtool_6.bb
+++ b/packages/ethtool/ethtool_6.bb
@@ -1,2 +1,2 @@
 require ethtool.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/eventlog/eventlog_0.2.5.bb b/packages/eventlog/eventlog_0.2.5.bb
index 5e679cb1b4..50d7d70e93 100644
--- a/packages/eventlog/eventlog_0.2.5.bb
+++ b/packages/eventlog/eventlog_0.2.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Replacement syslog API"
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.balabit.com/downloads/files/eventlog/0.2/${P}.tar.gz"
 
diff --git a/packages/evince/evince_0.5.2.bb b/packages/evince/evince_0.5.2.bb
index a923443888..54e25eb49c 100644
--- a/packages/evince/evince_0.5.2.bb
+++ b/packages/evince/evince_0.5.2.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
 RDEPENDS = "espgs gconf"
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig
 
diff --git a/packages/evince/evince_0.6.1.bb b/packages/evince/evince_0.6.1.bb
index 7f34da5ee7..d2b7cbe5ea 100644
--- a/packages/evince/evince_0.6.1.bb
+++ b/packages/evince/evince_0.6.1.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
 RDEPENDS = "espgs gconf"
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb
index 073bc45733..815b30e5eb 100644
--- a/packages/evince/evince_0.9.0.bb
+++ b/packages/evince/evince_0.9.0.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb
index c49857bf65..f4fe253d1f 100644
--- a/packages/evince/evince_0.9.2.bb
+++ b/packages/evince/evince_0.9.2.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
diff --git a/packages/evince/evince_2.20.0.bb b/packages/evince/evince_2.20.0.bb
index 4b95cda701..dbfec26f4e 100644
--- a/packages/evince/evince_2.20.0.bb
+++ b/packages/evince/evince_2.20.0.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
diff --git a/packages/evince/evince_2.23.4.bb b/packages/evince/evince_2.23.4.bb
index bd75298324..f5303cabe3 100644
--- a/packages/evince/evince_2.23.4.bb
+++ b/packages/evince/evince_2.23.4.bb
@@ -4,7 +4,7 @@ SECTION = "x11/office"
 DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs gnome-icon-theme"
 RRECOMMENDS = "gnome-vfs-plugin-file"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
diff --git a/packages/exmap-console/exmap-console_0.4.1.bb b/packages/exmap-console/exmap-console_0.4.1.bb
index 7ee3a3d58a..e1ddf7de1f 100644
--- a/packages/exmap-console/exmap-console_0.4.1.bb
+++ b/packages/exmap-console/exmap-console_0.4.1.bb
@@ -1,3 +1,3 @@
 require exmap-console.inc
 
-FILE_PR = "r5"
+PR = "r5"
diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb
index adb1e9d77c..6e86214b1c 100644
--- a/packages/exmap-console/exmap-console_svn.bb
+++ b/packages/exmap-console/exmap-console_svn.bb
@@ -1,7 +1,7 @@
 require exmap-console.inc
 
 PV = "0.4+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
 
diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb
index 1b5c195ab9..576ad76a55 100644
--- a/packages/expat/expat_1.95.6.bb
+++ b/packages/expat/expat_1.95.6.bb
@@ -1,6 +1,6 @@
 require expat.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_stage () {
 	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb
index 5922847c84..7b48305933 100644
--- a/packages/expat/expat_1.95.7.bb
+++ b/packages/expat/expat_1.95.7.bb
@@ -1,5 +1,5 @@
 require expat.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://autotools.patch;patch=1 \
 	    file://expat-XMLCALL.patch;patch=1 \
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
index ba257d70f1..0fd825ee24 100644
--- a/packages/expat/expat_2.0.0.bb
+++ b/packages/expat/expat_2.0.0.bb
@@ -1,5 +1,5 @@
 require expat.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://autotools.patch;patch=1"
 
diff --git a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
index e1c62639d5..fbf5f61a39 100644
--- a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
+++ b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.ez-ipupdate.com/"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz"
 SRC_URI += "file://configure.patch;patch=1"
diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
index e6adebb7fb..b70aca3709 100644
--- a/packages/ezx/ezx-boot-usb-native_0.1.0.bb
+++ b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
@@ -1,5 +1,5 @@
 require ezx-boot-usb-native.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2"
 S = "${WORKDIR}/boot_usb-${PV}"
diff --git a/packages/ezx/ezx-gpiotool_1877.bb b/packages/ezx/ezx-gpiotool_1877.bb
index 5764d87086..81a1ecc2a0 100644
--- a/packages/ezx/ezx-gpiotool_1877.bb
+++ b/packages/ezx/ezx-gpiotool_1877.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.openezx.org"
 AUTHOR = "Harald Welte"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http;rev=${PV}"
 S = "${WORKDIR}/gpiotool"
diff --git a/packages/ezx/ezxd_svn.bb b/packages/ezx/ezxd_svn.bb
index c41465cedf..ab1010c48e 100644
--- a/packages/ezx/ezxd_svn.bb
+++ b/packages/ezx/ezxd_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 AUTHOR = "Daniel Ribeiro"
 
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
            file://ezxd.init \
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index 6e1bdcade4..90255b3fd8 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = ""
-FILE_PR ="r2"
+PR ="r2"
 
 inherit autotools
 
diff --git a/packages/fakechroot/fakechroot-native_2.5.bb b/packages/fakechroot/fakechroot-native_2.5.bb
index 4e43724cba..efd41c7126 100644
--- a/packages/fakechroot/fakechroot-native_2.5.bb
+++ b/packages/fakechroot/fakechroot-native_2.5.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 require fakechroot_${PV}.bb
 inherit native
 
diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb
index f2708a1cfb..ea3806d2f5 100644
--- a/packages/fakeroot/fakeroot_1.7.1.bb
+++ b/packages/fakeroot/fakeroot_1.7.1.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "\
   ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz \
diff --git a/packages/fakeroot/fakeroot_1.9.6.bb b/packages/fakeroot/fakeroot_1.9.6.bb
index 46b8cf2af1..aaf696d79d 100644
--- a/packages/fakeroot/fakeroot_1.9.6.bb
+++ b/packages/fakeroot/fakeroot_1.9.6.bb
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
            file://configure-libtool.patch;patch=1"
diff --git a/packages/fastcgi/fastcgi_2.4.0.bb b/packages/fastcgi/fastcgi_2.4.0.bb
index b9558ef5d5..4c70aa3461 100644
--- a/packages/fastcgi/fastcgi_2.4.0.bb
+++ b/packages/fastcgi/fastcgi_2.4.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "Open Market"
 DESCRIPTION = "Fast CGI backend (web server to CGI handler) library"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \
 file://link-against-math.patch;patch=1"
diff --git a/packages/fastjar/fastjar-native_0.95.bb b/packages/fastjar/fastjar-native_0.95.bb
index cfafd7eae0..3d003306b8 100644
--- a/packages/fastjar/fastjar-native_0.95.bb
+++ b/packages/fastjar/fastjar-native_0.95.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "zlib-native"
 
diff --git a/packages/fbgrab/fbgrab-viewer-native_1.0.bb b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
index f534c7c988..2494918c31 100644
--- a/packages/fbgrab/fbgrab-viewer-native_1.0.bb
+++ b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = "libpng-native"
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r30"
+PR = "r30"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=fbgrab;proto=http"
 S = "${WORKDIR}/fbgrab"
diff --git a/packages/fbgrab/fbgrab_1.0.bb b/packages/fbgrab/fbgrab_1.0.bb
index da3675bf7d..8790fe0a28 100644
--- a/packages/fbgrab/fbgrab_1.0.bb
+++ b/packages/fbgrab/fbgrab_1.0.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "framebuffer screenshot program"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = " zlib libpng "
 
diff --git a/packages/fbida/fbida_2.07.bb b/packages/fbida/fbida_2.07.bb
index 9538133807..188e22729e 100644
--- a/packages/fbida/fbida_2.07.bb
+++ b/packages/fbida/fbida_2.07.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "frame buffer image and doc viewer tools"
 AUTHOR = "Gerd Knorr"
 LICENSE = "GPL2"
 SECTION = "utils"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif"
 RDEPENDS = "ttf-dejavu-sans-mono"
diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb
index ade460820e..b849df0c6f 100644
--- a/packages/fbpanel/fbpanel_4.3.bb
+++ b/packages/fbpanel/fbpanel_4.3.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://fbpanel.sourceforge.net/"
 SRC_URI = "${SOURCEFORGE_MIRROR}/fbpanel/fbpanel-${PV}.tgz \
            file://makefile.common.patch;patch=1 "
 
-FILE_PR = "r1"
+PR = "r1"
 
 LDFLAGS += "-Wl,--export-dynamic"
 
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
index 7144313f4d..a326180997 100644
--- a/packages/fbreader/fbreader_0.7.3d.bb
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat bzip2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \
 	file://fbreader-0.7.3d_buildsys_oe.patch;patch=1"
diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb
index b5f94042b7..de2bf358a4 100644
--- a/packages/fbreader/fbreader_0.7.4q.bb
+++ b/packages/fbreader/fbreader_0.7.4q.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \
 	file://fbreader-0.7.4q_buildsys_oe.patch;patch=1"
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 127a26b590..7d6a2b044c 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -4,7 +4,7 @@ SECTION = "x11/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv"
-FILE_PR = "r5"
+PR = "r5"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
diff --git a/packages/fbset/fbset-init.bb b/packages/fbset/fbset-init.bb
index 4cf22dd06f..f04691d793 100644
--- a/packages/fbset/fbset-init.bb
+++ b/packages/fbset/fbset-init.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Set framebuffer mode during boot"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://fbset.sh file://default-fbset"
 
diff --git a/packages/fbset/fbset-modes.bb b/packages/fbset/fbset-modes.bb
index df9c4269ea..403751c90a 100644
--- a/packages/fbset/fbset-modes.bb
+++ b/packages/fbset/fbset-modes.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
 PV = "0.1.0"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "file://fb.modes"
 
diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb
index 50e8e3f45e..9037350bad 100644
--- a/packages/fbset/fbset_2.1.bb
+++ b/packages/fbset/fbset_2.1.bb
@@ -9,7 +9,7 @@ DESCRIPTION = "The fbset console tool"
 LICENSE = "GPL"
 RRECOMMENDS = "fbset-modes"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \
            file://makefile.patch;patch=1"
diff --git a/packages/fceu/fceu_0.98.13-pre.bb b/packages/fceu/fceu_0.98.13-pre.bb
index 802049e71f..a2645e9d5c 100644
--- a/packages/fceu/fceu_0.98.13-pre.bb
+++ b/packages/fceu/fceu_0.98.13-pre.bb
@@ -4,7 +4,7 @@ SECTION = "games"
 LICENSE = "GPL"
 HOMEPAGE = "http://fceultra.sourceforge.net"
 DEPENDS = "virtual/libsdl"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fceultra/fceu-${PV}.src.tar.bz2 \
 	   file://fceu.patch;pnum=0;patch=1 \
diff --git a/packages/fetchmail/fetchmail_6.2.5.bb b/packages/fetchmail/fetchmail_6.2.5.bb
index d05abff1c9..89df7fe017 100644
--- a/packages/fetchmail/fetchmail_6.2.5.bb
+++ b/packages/fetchmail/fetchmail_6.2.5.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 SECTION = "console/network"
 LICENSE = "GPL"
 DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
diff --git a/packages/fetchmail/fetchmail_6.3.8.bb b/packages/fetchmail/fetchmail_6.3.8.bb
index 8a92a696d2..9b789aae25 100644
--- a/packages/fetchmail/fetchmail_6.3.8.bb
+++ b/packages/fetchmail/fetchmail_6.3.8.bb
@@ -6,7 +6,7 @@ SECTION = "console/network"
 
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
 	   file://CVE-2007-4565.patch;patch=1 \
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 687070402b..3e05040854 100644
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,6 +1,6 @@
 require ffmpeg.inc
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
            file://configure.patch;patch=0 \
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index bec9da190e..aa955b1648 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
 
 PE = "1"
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-FILE_PR = "r34"
+PR = "r34"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
index 1ee591a1ad..2433565bbe 100644
--- a/packages/ffmpeg/ffmpeg_svn.bb
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -6,7 +6,7 @@ SRCREV ?= "12186"
 
 PE = "1"
 PV = "0.4.9+svnr${SRCREV}" 
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index 096e0b568a..00c0804ad3 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-FILE_PR = "r13"
+PR = "r13"
 
 inherit module-base
 
diff --git a/packages/fftw/fftw.inc b/packages/fftw/fftw.inc
index 901b3c0e0c..acd1b27f4b 100644
--- a/packages/fftw/fftw.inc
+++ b/packages/fftw/fftw.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RPROVIDES += "libfftw3"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
 
diff --git a/packages/figment/figment_0.3.5.bb b/packages/figment/figment_0.3.5.bb
index 88c5093341..03d07a1b8a 100644
--- a/packages/figment/figment_0.3.5.bb
+++ b/packages/figment/figment_0.3.5.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
 DESCRIPTION = "gtk2 outliner written by Matthew Allum"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ libxml2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://handhelds.org/~mallum/downloadables/figment/figment-${PV}.tar.gz \
 	file://dotdesktop-name-comment.patch;patch=1"
diff --git a/packages/file/file-native_4.18.bb b/packages/file/file-native_4.18.bb
index 9c6f1bbb17..63554b01fb 100644
--- a/packages/file/file-native_4.18.bb
+++ b/packages/file/file-native_4.18.bb
@@ -3,6 +3,6 @@ inherit native
 
 # avoid dependency loop
 DEPENDS = ""
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/file/file-native_4.21.bb b/packages/file/file-native_4.21.bb
index e256ff63d4..734891d18d 100644
--- a/packages/file/file-native_4.21.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,6 +1,6 @@
 require file_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb
index 83bd6897b3..debe8d73de 100644
--- a/packages/flac/flac_1.1.0.bb
+++ b/packages/flac/flac_1.1.0.bb
@@ -1,3 +1,3 @@
 require flac.inc
 
-FILE_PR = "r6"
+PR = "r6"
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index a671436a4e..69eb07125e 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/packages/flac/flac_1.1.2.bb
@@ -1,6 +1,6 @@
 require flac.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 do_configure_append () {
 	# removes '-read-only-relocs' which is enabled for PowerPC builds.
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index 8106afae8c..1e9354afde 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,6 +1,6 @@
 require flex.inc
 inherit native
-FILE_PR = "r2"
+PR = "r2"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index f072b20109..3062e2d8dc 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
 require flex.inc
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
 
diff --git a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
index 37d923c962..1b7a55f03b 100644
--- a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
+++ b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A Qtopia/Opie Input Method plugin for the Flexis FX100 Keyboard."
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.Vanille.de/mirror/flexis-zaurus-${PV}.tar.bz2"
 S = "${WORKDIR}/flexis-zaurus"
diff --git a/packages/flite/flite-alsa_1.2.bb b/packages/flite/flite-alsa_1.2.bb
index 7d23d7dec0..92db8c34f9 100644
--- a/packages/flite/flite-alsa_1.2.bb
+++ b/packages/flite/flite-alsa_1.2.bb
@@ -1,6 +1,6 @@
 require flite.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 EXTRA_OECONF = "--with-audio=alsa --enable-shared"
 
diff --git a/packages/flite/flite-alsa_1.3.bb b/packages/flite/flite-alsa_1.3.bb
index 0d39092045..438fe38e0e 100644
--- a/packages/flite/flite-alsa_1.3.bb
+++ b/packages/flite/flite-alsa_1.3.bb
@@ -1,6 +1,6 @@
 require flite.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 EXTRA_OECONF = "--with-audio=alsa --enable-shared"
 
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index 8de1c337cd..7169663ce7 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -1,6 +1,6 @@
 require flite.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 EXTRA_OECONF = "--with-audio=oss --enable-shared"
 
diff --git a/packages/flite/flite_1.3.bb b/packages/flite/flite_1.3.bb
index 79f06a5a08..360ccb0c23 100644
--- a/packages/flite/flite_1.3.bb
+++ b/packages/flite/flite_1.3.bb
@@ -1,6 +1,6 @@
 require flite.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 EXTRA_OECONF = "--with-audio=oss --enable-shared"
 
diff --git a/packages/fltk/efltk_2.0.7.bb b/packages/fltk/efltk_2.0.7.bb
index 2b3f188e6e..b048e078b3 100644
--- a/packages/fltk/efltk_2.0.7.bb
+++ b/packages/fltk/efltk_2.0.7.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "zlib jpeg libpng libxext libxft"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz"
 S = "${WORKDIR}/efltk"
diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb
index c64c1ad6c1..ae7c0e1c95 100644
--- a/packages/fltk/fltk_1.1.4.bb
+++ b/packages/fltk/fltk_1.1.4.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "jpeg libpng mesa zlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz"
 
diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb
index a9a446146a..866db129e8 100644
--- a/packages/fltk/fltk_1.1.7.bb
+++ b/packages/fltk/fltk_1.1.7.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "zlib jpeg libpng libxext libxft"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2"
 
diff --git a/packages/fltk/fltk_1.1.9.bb b/packages/fltk/fltk_1.1.9.bb
index a66b66b010..a2c5dcb5ab 100644
--- a/packages/fltk/fltk_1.1.9.bb
+++ b/packages/fltk/fltk_1.1.9.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
 	   file://disable_test.patch;patch=1 \
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb
index cc9187a206..c746da6c8f 100644
--- a/packages/flumotion/flumotion_0.4.1.bb
+++ b/packages/flumotion/flumotion_0.4.1.bb
@@ -9,7 +9,7 @@ RDEPENDS = "python-resource python-pprint python-threading \
             python-lang python-zopeinterface  python-textutils \
             python-gst python-misc"
 RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
            file://python-path.patch;patch=1 \
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 4c027b22b8..d3bfda7595 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 REALPV = "1.0rc"
 
 PV = "0.99+${REALPV}"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1" 
 
 
diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb
index 575d3b229f..4bef6d82e2 100644
--- a/packages/fluxbox/fluxbox_svn.bb
+++ b/packages/fluxbox/fluxbox_svn.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
 
 PV = "0.99+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1" 
 
 SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
diff --git a/packages/fmtools/fmtools_1.0.2.bb b/packages/fmtools/fmtools_1.0.2.bb
index ef4b00787e..a1f9fb0f39 100644
--- a/packages/fmtools/fmtools_1.0.2.bb
+++ b/packages/fmtools/fmtools_1.0.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "fmtools - programs for Video for Linux radio cards"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
            file://makefile.patch;patch=1"
diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb
index abfa0104e9..d1aab24951 100644
--- a/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/packages/fontconfig/fontconfig_2.2.95.bb
@@ -5,7 +5,7 @@ DEPENDS += "fontconfig-native"
 SRC_URI += "file://fc-glyphname.patch;patch=1 \
            file://fc-lang.patch;patch=1 \
 	   file://local.conf"
-FILE_PR = "r8"
+PR = "r8"
 
 do_stage () {
 	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb
index e664c97f21..ec6ef8e037 100644
--- a/packages/fontconfig/fontconfig_2.3.91.bb
+++ b/packages/fontconfig/fontconfig_2.3.91.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://fc-glyphname.patch;patch=1 \
            file://one-j-too-many.patch;patch=1 \
            file://local.conf"
 
-FILE_PR = "r3"
+PR = "r3"
 
 do_stage () {
 	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb
index 162aa75d65..035f8467ed 100644
--- a/packages/fontconfig/fontconfig_2.3.95.bb
+++ b/packages/fontconfig/fontconfig_2.3.95.bb
@@ -2,7 +2,7 @@ require fontconfig.inc
 
 SRC_URI += "file://one-j-too-many.patch;patch=1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 do_stage () {
 	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 97b180e763..c1d861cfb9 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -1,6 +1,6 @@
 require fontconfig.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h \
 	    file://configure_fix.patch;patch=1 "
diff --git a/packages/foonas-init/foonas-init_0.10.bb b/packages/foonas-init/foonas-init_0.10.bb
index 3db9e5e52a..7c51606e7e 100644
--- a/packages/foonas-init/foonas-init_0.10.bb
+++ b/packages/foonas-init/foonas-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://initscripts/fixfstab \
 	   file://initscripts/syslog.buffer \
diff --git a/packages/fortune-mod/fortune-mod_1.99.1.bb b/packages/fortune-mod/fortune-mod_1.99.1.bb
index 6698596c67..a4c3b284c5 100644
--- a/packages/fortune-mod/fortune-mod_1.99.1.bb
+++ b/packages/fortune-mod/fortune-mod_1.99.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "recode-native recode"
 DEBV = "2"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fortune-mod/fortune-mod_${PV}.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/f/fortune-mod/fortune-mod_${PV}-${DEBV}.diff.gz;patch=1"
diff --git a/packages/fpdf/fpdf_1.53.bb b/packages/fpdf/fpdf_1.53.bb
index 8c212fe75f..5f551672fe 100644
--- a/packages/fpdf/fpdf_1.53.bb
+++ b/packages/fpdf/fpdf_1.53.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 DEPENDS = ""
 RDEPENDS = "php"
 LICENSE = "FREEWARE"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.fpdf.org/en/download/fpdf153.tgz \
 	   "
diff --git a/packages/free42/free42-vga_1.4.41.bb b/packages/free42/free42-vga_1.4.41.bb
index 81e8fc7ea9..ff5e07feae 100644
--- a/packages/free42/free42-vga_1.4.41.bb
+++ b/packages/free42/free42-vga_1.4.41.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Free42 RPN Calculator"
 HOMEPAGE = "http://free42.sf.net"
 SECTION = "openmoko/applications"
 DEPENDS = "gtk+"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/free42/free42.tgz \
            http://sense.net/zc/free42/42c_skins.tgz \
diff --git a/packages/freeciv/freeciv_2.0.8.bb b/packages/freeciv/freeciv_2.0.8.bb
index 5ee414bb87..bba9976c63 100644
--- a/packages/freeciv/freeciv_2.0.8.bb
+++ b/packages/freeciv/freeciv_2.0.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Freeciv is a free turn-based multiplayer strategy game, in which
 SECTION = "x11/games"
 LICENSE = "GPL"
 DEPENDS = "gtk+ cairo esound zlib readline"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
diff --git a/packages/freedoom/freedoom_0.3.bb b/packages/freedoom/freedoom_0.3.bb
index 8495c0a0eb..daef13fc8a 100644
--- a/packages/freedoom/freedoom_0.3.bb
+++ b/packages/freedoom/freedoom_0.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 
 SRC_URI = "http://ovh.dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-0.3.zip"
 
-FILE_PR = "r1"
+PR = "r1"
 
 FILES_${PN} = "/usr/share/games/doom/*"
 FILES_${PN}-doc = "/usr/share/doc/freedoom/*"
diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index 6b9f1283b3..cd148bc2d4 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -3,7 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://freedroid.sourceforge.net/"
-FILE_PR = "r2"
+PR = "r2"
 
 APPIMAGE = "${WORKDIR}/freedroid.png"
 
diff --git a/packages/freesmartphone/enter_0.0.2.bb b/packages/freesmartphone/enter_0.0.2.bb
index 9cab27ff3a..2a51af6506 100644
--- a/packages/freesmartphone/enter_0.0.2.bb
+++ b/packages/freesmartphone/enter_0.0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays"
 SECTION = "openmoko/inputmethods"
 DEPENDS = "ecore evas edje"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 2fd8a480fd..1cc9382b04 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.4.2+gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit distutils update-rc.d
 
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
index 0c163dec94..4e6f9e10e8 100644
--- a/packages/freesmartphone/fso-gpsd_git.bb
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "dbus-glib"
 PV = "0.6+${PR}+gitr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master \
diff --git a/packages/freesmartphone/fso-sounds.bb b/packages/freesmartphone/fso-sounds.bb
index 15e32ab158..5ee60e19d6 100644
--- a/packages/freesmartphone/fso-sounds.bb
+++ b/packages/freesmartphone/fso-sounds.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of notification sounds"
 LICENSE = "PD"
 SECTION = "multimedia"
 PV = "0.0.1+gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \
diff --git a/packages/freesmartphone/gsm0710muxd_git.bb b/packages/freesmartphone/gsm0710muxd_git.bb
index e9632de347..0c146079d0 100644
--- a/packages/freesmartphone/gsm0710muxd_git.bb
+++ b/packages/freesmartphone/gsm0710muxd_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib"
 RDEPENDS = "dbus dbus-glib"
 LICENSE = "GPL"
 PV = "0.9.1+${PR}-gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/gsmd2_git.bb b/packages/freesmartphone/gsmd2_git.bb
index 7590e3ffe1..0432927d16 100644
--- a/packages/freesmartphone/gsmd2_git.bb
+++ b/packages/freesmartphone/gsmd2_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib"
 RDEPENDS = "gsm0710muxd"
 LICENSE = "GPL"
 PV = "0.1.0+${PR}-gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
index b94d13cec5..1e6306f624 100644
--- a/packages/freesmartphone/illume-theme-freesmartphone_git.bb
+++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 DEPENDS = "edje-native eet-native"
 PV = "0.0+${PR}-gitr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/illume"
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index e048315b3a..404bb05ae1 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PV = "0.9.2+gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index d32b2ee95a..be17e05ea5 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PV = "2.9.1+gitr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/pyneod_git.bb b/packages/freesmartphone/pyneod_git.bb
index dbf6eef664..7cdfaace22 100644
--- a/packages/freesmartphone/pyneod_git.bb
+++ b/packages/freesmartphone/pyneod_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python"
 LICENSE = "GPL"
 PV = "0.0.0+gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit update-rc.d
 
diff --git a/packages/freesmartphone/pyneog_git.bb b/packages/freesmartphone/pyneog_git.bb
index 33c2326d55..c7d0235d03 100644
--- a/packages/freesmartphone/pyneog_git.bb
+++ b/packages/freesmartphone/pyneog_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "M. Dietrich"
 SECTION = "python/ui"
 LICENSE = "GPL"
 PV = "0.0.0+gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/pyneog"
diff --git a/packages/freesmartphone/task-pyneo.bb b/packages/freesmartphone/task-pyneo.bb
index 1aa5256671..751fd4c889 100644
--- a/packages/freesmartphone/task-pyneo.bb
+++ b/packages/freesmartphone/task-pyneo.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Task for a FIC Neo SmartPhone environment"
 LICENSE = "MIT"
 SECTION = "devel/python"
-FILE_PR = "r2"
+PR = "r2"
 
 ALLOW_EMPTY = "1"
 
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index c95a536807..3fd0c7a4a5 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
 PV = "0.0.1+gitr${SRCREV}"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb
index 8a7f66247e..15e1ff0862 100644
--- a/packages/freetype/freetype_2.1.10.bb
+++ b/packages/freetype/freetype_2.1.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Freetype font rendering library"
 HOMEPAGE = "http://www.freetype.org"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 3bc155bef6..145b2fa8a0 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
diff --git a/packages/freetype/freetype_2.2.1.bb b/packages/freetype/freetype_2.2.1.bb
index c896603e29..3e5fafc403 100644
--- a/packages/freetype/freetype_2.2.1.bb
+++ b/packages/freetype/freetype_2.2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/freetype/freetype_2.3.0.bb b/packages/freetype/freetype_2.3.0.bb
index a2fdee6a71..3c574486c1 100644
--- a/packages/freetype/freetype_2.3.0.bb
+++ b/packages/freetype/freetype_2.3.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/freetype/freetype_2.3.1.bb b/packages/freetype/freetype_2.3.1.bb
index ced018a5b2..79633a3d7f 100644
--- a/packages/freetype/freetype_2.3.1.bb
+++ b/packages/freetype/freetype_2.3.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://fix-x86_64-build.patch;patch=1"
diff --git a/packages/freetype/freetype_2.3.4.bb b/packages/freetype/freetype_2.3.4.bb
index 0911748ea8..c1febe8a90 100644
--- a/packages/freetype/freetype_2.3.4.bb
+++ b/packages/freetype/freetype_2.3.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://fix-x86_64-build.patch;patch=1 \
diff --git a/packages/freetype/freetype_2.3.5.bb b/packages/freetype/freetype_2.3.5.bb
index a625c02b83..80fb2b9ae4 100644
--- a/packages/freetype/freetype_2.3.5.bb
+++ b/packages/freetype/freetype_2.3.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://fix-x86_64-build.patch;patch=1 \
diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb
index 782d19b820..eca74c0ce2 100644
--- a/packages/freetype/freetype_2.3.6.bb
+++ b/packages/freetype/freetype_2.3.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb
index 7cad61c46a..fa11fecb97 100644
--- a/packages/freeze/freeze.bb
+++ b/packages/freeze/freeze.bb
@@ -16,7 +16,7 @@ DESCRIPTION = "Freeze the bitbake files in the build"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 PATCH_DEPENDS = ""
diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb
index 7d53cb8564..f2232c304f 100644
--- a/packages/freeze/unfreeze.bb
+++ b/packages/freeze/unfreeze.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Unfreeze the bitbake files in the build"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 PATCH_DEPENDS = ""
diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb
index a2a79fb50c..fa0de0bbc3 100644
--- a/packages/frodo/frodo_4.1b.bb
+++ b/packages/frodo/frodo_4.1b.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A C64 emulator based on SDL."
 SECTION = "opie/applications"
 DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://frodo.cebix.net/downloads/FrodoV4_1b.Src.tar.gz \
            file://frodo-qte.diff;patch=1 \
diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 432d658e2d..8f8812a6d4 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
 SRCDATE = "20040801"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
            file://configure.patch;patch=1 \
diff --git a/packages/froot/froot_0.7.1.bb b/packages/froot/froot_0.7.1.bb
index de1d59168e..1faf5a5788 100644
--- a/packages/froot/froot_0.7.1.bb
+++ b/packages/froot/froot_0.7.1.bb
@@ -4,7 +4,7 @@ APPNAME = "froot"
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.cs.unc.edu/~scheuerm/froot/froot-${PV}.tar.gz"
 S = "${WORKDIR}/froot-${PV}"
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
index 303fcbdb19..027a990200 100644
--- a/packages/fstests/fstests.bb
+++ b/packages/fstests/fstests.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "gtk+"
 
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
index 493d5afc08..74a3743b1e 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
 HOMEPAGE = "http://sourceforge.net/projects/puppy"
 SECTION = "net"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \
 	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \
diff --git a/packages/fuse/curlftpfs_0.9.2.bb b/packages/fuse/curlftpfs_0.9.2.bb
index 8a9e39c737..f8703a9527 100644
--- a/packages/fuse/curlftpfs_0.9.2.bb
+++ b/packages/fuse/curlftpfs_0.9.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 fuse curl"
 RDEPENDS += " libcurl "
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/curlftpfs/${P}.tar.gz"
 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index 8c9474e07c..f707888c94 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -1,6 +1,6 @@
 require fuse.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://preserve_CC_with_2_4_kernel.patch;patch=1"
 
diff --git a/packages/fuse/fuse-module_2.6.5.bb b/packages/fuse/fuse-module_2.6.5.bb
index bae5942e08..6d516185be 100644
--- a/packages/fuse/fuse-module_2.6.5.bb
+++ b/packages/fuse/fuse-module_2.6.5.bb
@@ -1,7 +1,7 @@
 require fuse.inc
 
 RRECOMMENDS = "fuse"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/fuse-${PV}"
 FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
diff --git a/packages/fuse/fuse-module_2.7.1.bb b/packages/fuse/fuse-module_2.7.1.bb
index cfdf08dd3c..48cc33a338 100644
--- a/packages/fuse/fuse-module_2.7.1.bb
+++ b/packages/fuse/fuse-module_2.7.1.bb
@@ -1,7 +1,7 @@
 require fuse.inc
 
 RRECOMMENDS = "fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/fuse-${PV}"
 FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
diff --git a/packages/fuse/fuse-module_2.7.2.bb b/packages/fuse/fuse-module_2.7.2.bb
index cfdf08dd3c..48cc33a338 100644
--- a/packages/fuse/fuse-module_2.7.2.bb
+++ b/packages/fuse/fuse-module_2.7.2.bb
@@ -1,7 +1,7 @@
 require fuse.inc
 
 RRECOMMENDS = "fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/fuse-${PV}"
 FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
diff --git a/packages/fuse/fuse_2.6.5.bb b/packages/fuse/fuse_2.6.5.bb
index b003f9fd85..a1795e7f0c 100644
--- a/packages/fuse/fuse_2.6.5.bb
+++ b/packages/fuse/fuse_2.6.5.bb
@@ -1,6 +1,6 @@
 require fuse.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
 
diff --git a/packages/fuse/fuse_2.7.1.bb b/packages/fuse/fuse_2.7.1.bb
index b003f9fd85..a1795e7f0c 100644
--- a/packages/fuse/fuse_2.7.1.bb
+++ b/packages/fuse/fuse_2.7.1.bb
@@ -1,6 +1,6 @@
 require fuse.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
 
diff --git a/packages/fuse/fuse_2.7.2.bb b/packages/fuse/fuse_2.7.2.bb
index b003f9fd85..a1795e7f0c 100644
--- a/packages/fuse/fuse_2.7.2.bb
+++ b/packages/fuse/fuse_2.7.2.bb
@@ -1,6 +1,6 @@
 require fuse.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
 
diff --git a/packages/fuse/sshfs-fuse_1.8.bb b/packages/fuse/sshfs-fuse_1.8.bb
index e4dc2623bb..0ca2e132bc 100644
--- a/packages/fuse/sshfs-fuse_1.8.bb
+++ b/packages/fuse/sshfs-fuse_1.8.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
 S = "${WORKDIR}/${P}"
diff --git a/packages/fush/fush_0.9.0.bb b/packages/fush/fush_0.9.0.bb
index 06816ceacd..8f5024381c 100644
--- a/packages/fush/fush_0.9.0.bb
+++ b/packages/fush/fush_0.9.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "readline"
 PRIORITY = "optional"
 SECTION = "base/shell"
-FILE_PR = "r3"
+PR = "r3"
 
 RV = "${@bb.data.getVar('PV', d, 1).replace('.', '-')}"
 SRC_URI = "${SOURCEFORGE_MIRROR}/foosh/fush-${RV}.tar.gz \
diff --git a/packages/fxload/fxload_0.0.20020411.bb b/packages/fxload/fxload_0.0.20020411.bb
index 31f0376f12..2bebded964 100644
--- a/packages/fxload/fxload_0.0.20020411.bb
+++ b/packages/fxload/fxload_0.0.20020411.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
 SECTION = "admin"
 LICENSE = "GPL"
 DEPENDS = "linux-libc-headers"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz \
            file://usbheader.patch;patch=1"
diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb
index 35ef51002d..116d2efe84 100644
--- a/packages/g15daemon/g15daemon_1.2.6a.bb
+++ b/packages/g15daemon/g15daemon_1.2.6a.bb
@@ -11,7 +11,7 @@ PRIORITY = "optional"
 DEPENDS = "libdaemon libg15"
 RDEPENDS = "libg15"
 RRECOMMENDS = "kernel-module-uinput"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2"
 
diff --git a/packages/gail/gail_1.6.6.bb b/packages/gail/gail_1.6.6.bb
index c332bac03f..fe64b96da4 100644
--- a/packages/gail/gail_1.6.6.bb
+++ b/packages/gail/gail_1.6.6.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
 DEPENDS = "gtk+ libgnomecanvas"
 
diff --git a/packages/gail/gail_1.8.5.bb b/packages/gail/gail_1.8.5.bb
index 59c96b8ca7..4bbd827da1 100644
--- a/packages/gail/gail_1.8.5.bb
+++ b/packages/gail/gail_1.8.5.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
 DEPENDS = "gtk+ libgnomecanvas"
 
diff --git a/packages/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb
index a1f5136d09..243e42da4e 100644
--- a/packages/galago/galago-daemon_0.3.4.bb
+++ b/packages/galago/galago-daemon_0.3.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Galago is a desktop presence framework, designed to transmit pres
 HOMEPAGE = "http://www.galago-project.org/"
 LICENSE = "GPL"
 DEPENDS = "gettext libgalago dbus glib-2.0"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
            file://no-check.patch;patch=1"
diff --git a/packages/galago/libgalago_0.3.3.bb b/packages/galago/libgalago_0.3.3.bb
index 760a018eaa..64064728b8 100644
--- a/packages/galago/libgalago_0.3.3.bb
+++ b/packages/galago/libgalago_0.3.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION =	"Galago is a desktop presence framework, designed to transmit pres
 HOMEPAGE =	"http://www.galago-project.org/"
 LICENSE =	"LGPL"
 DEPENDS = 	"gettext dbus glib-2.0"
-FILE_PR =		"r1"
+PR =		"r1"
 
 
 SRC_URI =	"http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
diff --git a/packages/galculator/galculator_1.2.3.bb b/packages/galculator/galculator_1.2.3.bb
index 0d95091d82..3348b9ece4 100644
--- a/packages/galculator/galculator_1.2.3.bb
+++ b/packages/galculator/galculator_1.2.3.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 
 inherit autotools pkgconfig gconf
 
diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb
index 515ec1f9af..14c7c0f4e0 100644
--- a/packages/gallery/gallery_1.5.5.bb
+++ b/packages/gallery/gallery_1.5.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Gallery v1 web image gallery"
 SECTION = "apps"
 LICENSE = "GPL"
 RDEPENDS = "apache2 modphp imagemagick jhead"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://{SOURCEFORGE_MIRROR}/sourceforge/gallery/gallery-${PV}-pl1.tar.gz"
 
diff --git a/packages/gammu/gammu_1.20.0.bb b/packages/gammu/gammu_1.20.0.bb
index e42f7f113d..6cc864498a 100644
--- a/packages/gammu/gammu_1.20.0.bb
+++ b/packages/gammu/gammu_1.20.0.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 DEPENDS = "bluez-libs cmake-native"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gammu.org/"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
 
diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb
index ca9f81a68a..5af890eec8 100644
--- a/packages/gawk/gawk_3.1.4.bb
+++ b/packages/gawk/gawk_3.1.4.bb
@@ -4,7 +4,7 @@ SECTION = "interpreters"
 LICENSE = "GPL"
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
 
diff --git a/packages/gcalctool/gcalctool_5.7.32.bb b/packages/gcalctool/gcalctool_5.7.32.bb
index 726eccdc30..084b5e4c82 100644
--- a/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/packages/gcalctool/gcalctool_5.7.32.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "gtk+"
 DESCRIPTION = "gcalctool is a powerful calculator"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
         file://makefile-fix.diff;patch=1"
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index c755bc0206..e8051dde22 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 require gcc-cross-initial_csl-arm-2005q3.bb
 require gcc-cross-kernel.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
 
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 796ea7efaf..02d860b1f7 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index d51f9fc7b6..c76b5b3c07 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 9895ba58f8..b00c86617d 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 97ca15c06c..ee769e034e 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 2a3eff93b5..6b6097fb00 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 96401593c7..c632169f23 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index bbb7227a31..ee4ce855af 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.3.bb b/packages/gcc/gcc-cross-sdk_4.2.3.bb
index 9361acae3f..8057608e0d 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.4.bb b/packages/gcc/gcc-cross-sdk_4.2.4.bb
index 2d36cb3dc1..482e9a63f6 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 7d0fe973e4..93a33894ab 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r11"
+PR = "r11"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb
index 1763852293..7e3a459ea8 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
index 2d5f40c68e..fc5c2e5deb 100644
--- a/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index d8396c24b6..38488642fd 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 3de4e41583..1f5e5f7876 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR ="r8"
+PR ="r8"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 64cb8d0e4c..271509b32e 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r16"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 4a71ef2985..515b41628c 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r11"
+PR = "r11"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 6627c66169..dd3fbbc000 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r7"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 0278217299..bb4c6f0366 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r13"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 7284d1a729..33042da5a2 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r7"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 02b545c45c..da797597d7 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r22"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index e52614051d..b3c6437467 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r18"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 29e32784d6..5986fad253 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r18"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 00a46404f6..fe25ae2857 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r12"
+PR = "r12"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.3.bb b/packages/gcc/gcc-cross_4.2.3.bb
index c6c2a8e1dd..4149179d8e 100644
--- a/packages/gcc/gcc-cross_4.2.3.bb
+++ b/packages/gcc/gcc-cross_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.4.bb b/packages/gcc/gcc-cross_4.2.4.bb
index 06c50be78d..cac2550f0e 100644
--- a/packages/gcc/gcc-cross_4.2.4.bb
+++ b/packages/gcc/gcc-cross_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb
index 96857dc745..bfc8561a4c 100644
--- a/packages/gcc/gcc-cross_4.3.1.bb
+++ b/packages/gcc/gcc-cross_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r15"
+PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb
index 301bee33d0..18d5abd32e 100644
--- a/packages/gcc/gcc-cross_4.3.2.bb
+++ b/packages/gcc/gcc-cross_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 require gcc-configure-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index f946396826..858459c026 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
index 70f0d5e822..a8c662e462 100644
--- a/packages/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 047b42e2cd..6ae42784cb 100644
--- a/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 9f966b0ef5..69127daea6 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q3.bb b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
index d2fc9b43d5..d2a1102776 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require gcc-csl-arm-2008q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb
index e1087fa081..5f39f1bbb3 100644
--- a/packages/gcc/gcc-native_3.4.4.bb
+++ b/packages/gcc/gcc-native_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc-native_3.4.6.bb b/packages/gcc/gcc-native_3.4.6.bb
index 0e144774af..c3f8106d3a 100644
--- a/packages/gcc/gcc-native_3.4.6.bb
+++ b/packages/gcc/gcc-native_3.4.6.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r9"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index edadd2c7fe..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index edadd2c7fe..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 4f3737b0c0..10d868893b 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r16"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 4267e680e0..5bc3761068 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 4267e680e0..5bc3761068 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 84dfa34f51..6ba5972fc1 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r22"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 5566d8a739..dd88ccdc27 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r14"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 8c088863cf..a8c8b71648 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r13"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 59357731f7..582fff49ac 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.3.bb b/packages/gcc/gcc_4.2.3.bb
index f9ceb3ccb7..a2ae0c0e92 100644
--- a/packages/gcc/gcc_4.2.3.bb
+++ b/packages/gcc/gcc_4.2.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r8"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.4.bb b/packages/gcc/gcc_4.2.4.bb
index d491c952d6..033f33f8d3 100644
--- a/packages/gcc/gcc_4.2.4.bb
+++ b/packages/gcc/gcc_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb
index eddbbf18f1..4634820ff2 100644
--- a/packages/gcc/gcc_4.3.1.bb
+++ b/packages/gcc/gcc_4.3.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r10"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.3.2.bb b/packages/gcc/gcc_4.3.2.bb
index ea5336f690..e2c6e48a85 100644
--- a/packages/gcc/gcc_4.3.2.bb
+++ b/packages/gcc/gcc_4.3.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 9906f98782..1bbab50930 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r6"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2006q1.bb b/packages/gcc/gcc_csl-arm-2006q1.bb
index fc9c15a039..2df12ef9ef 100644
--- a/packages/gcc/gcc_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb
index b4f2a95dba..cc7540af15 100644
--- a/packages/gcc/gcc_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2008q1.bb b/packages/gcc/gcc_csl-arm-2008q1.bb
index 3dc4b8ff55..4999c6a53e 100644
--- a/packages/gcc/gcc_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gd/gd_2.0.22.bb b/packages/gd/gd_2.0.22.bb
index 3e9422427d..a54809bf3b 100644
--- a/packages/gd/gd_2.0.22.bb
+++ b/packages/gd/gd_2.0.22.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
 DEPENDS = "libpng jpeg zlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
 S = "${WORKDIR}/gd-${PV}"
diff --git a/packages/gd/gd_2.0.33.bb b/packages/gd/gd_2.0.33.bb
index e187b8c7e8..7c1f7c3d19 100644
--- a/packages/gd/gd_2.0.33.bb
+++ b/packages/gd/gd_2.0.33.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
 DEPENDS = "libpng jpeg zlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
 S = "${WORKDIR}/gd-${PV}"
diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb
index f33d9c2ab5..feaa6ed991 100644
--- a/packages/gdado/gdado_2.2.bb
+++ b/packages/gdado/gdado_2.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gdado.sf.net"
 SECTION = "x11/games"
 LICENSE = "GPLv2"
 DEPENDS = "libgnomeui gtk+"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz"
 
 inherit autotools
diff --git a/packages/gdb/gdb-cross-sdk_6.6.bb b/packages/gdb/gdb-cross-sdk_6.6.bb
index 7e5f7d20ae..656119cf93 100644
--- a/packages/gdb/gdb-cross-sdk_6.6.bb
+++ b/packages/gdb/gdb-cross-sdk_6.6.bb
@@ -4,7 +4,7 @@ inherit sdk
 
 DEPENDS = "ncurses-sdk"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
 
diff --git a/packages/gdb/gdb-cross-sdk_6.8.bb b/packages/gdb/gdb-cross-sdk_6.8.bb
index 65e5bda26d..be5c4807d8 100644
--- a/packages/gdb/gdb-cross-sdk_6.8.bb
+++ b/packages/gdb/gdb-cross-sdk_6.8.bb
@@ -4,7 +4,7 @@ DEPENDS = "ncurses-sdk"
 
 inherit sdk
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_configure_prepend() {
 	for i in $(find ${S} -name "warning*m4") ; do 
diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb
index c05e3b54e7..5b27e09959 100644
--- a/packages/gdb/gdb-cross_6.3.bb
+++ b/packages/gdb/gdb-cross_6.3.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 
 inherit cross
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://sim-install-makefile.patch;patch=1 \
 	file://sim-install-makefile-common.patch;patch=1"
diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb
index 290e4ceb21..e4946b0fe1 100644
--- a/packages/gdb/gdb-cross_6.4.bb
+++ b/packages/gdb/gdb-cross_6.4.bb
@@ -2,4 +2,4 @@ require gdb-cross.inc
 
 inherit cross
 
-FILE_PR = "r1"
\ No newline at end of file
+PR = "r1"
\ No newline at end of file
diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb
index f43e47ab83..570dd52859 100644
--- a/packages/gdb/gdb-cross_6.6.bb
+++ b/packages/gdb/gdb-cross_6.6.bb
@@ -1,7 +1,7 @@
 require gdb-cross.inc
 inherit cross
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
 
diff --git a/packages/gdb/gdb-cross_6.8.bb b/packages/gdb/gdb-cross_6.8.bb
index 251c6fe68e..f63f144d66 100644
--- a/packages/gdb/gdb-cross_6.8.bb
+++ b/packages/gdb/gdb-cross_6.8.bb
@@ -1,4 +1,4 @@
 require gdb-cross.inc
 inherit cross
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index 5513d348d0..988cfb4c44 100644
--- a/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
index 134c38426d..be40f3f12b 100644
--- a/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb
index db1a89b706..e4502a648e 100644
--- a/packages/gdb/gdb_6.6.bb
+++ b/packages/gdb/gdb_6.6.bb
@@ -1,5 +1,5 @@
 require gdb.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
diff --git a/packages/gdb/gdb_6.7.1.bb b/packages/gdb/gdb_6.7.1.bb
index 167c415dde..fedf2bf1f1 100644
--- a/packages/gdb/gdb_6.7.1.bb
+++ b/packages/gdb/gdb_6.7.1.bb
@@ -1,6 +1,6 @@
 require gdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE_avr32 = "99"
 SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
diff --git a/packages/gdb/gdb_6.8.bb b/packages/gdb/gdb_6.8.bb
index 134c38426d..be40f3f12b 100644
--- a/packages/gdb/gdb_6.8.bb
+++ b/packages/gdb/gdb_6.8.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gdbm/gdbm-native_1.8.3.bb b/packages/gdbm/gdbm-native_1.8.3.bb
index e558d02605..adfc0459c2 100644
--- a/packages/gdbm/gdbm-native_1.8.3.bb
+++ b/packages/gdbm/gdbm-native_1.8.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1"
diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb
index 90b6dddcf4..f3beb47b41 100644
--- a/packages/gdbm/gdbm_1.8.3.bb
+++ b/packages/gdbm/gdbm_1.8.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
diff --git a/packages/geany/geany_0.14.bb b/packages/geany/geany_0.14.bb
index c2b7d0bb25..525f4cfa0a 100644
--- a/packages/geany/geany_0.14.bb
+++ b/packages/geany/geany_0.14.bb
@@ -4,7 +4,7 @@ SECTION = "editors"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2"
 
diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-gnetlist_20050820.bb
index 3eec7c3ef2..a0f7d60fb6 100644
--- a/packages/geda/geda-gnetlist_20050820.bb
+++ b/packages/geda/geda-gnetlist_20050820.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-FILE_PR = "r0"
+PR = "r0"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-gschem_20050820.bb
index 8d0e6545a2..6ca5e4f77a 100644
--- a/packages/geda/geda-gschem_20050820.bb
+++ b/packages/geda/geda-gschem_20050820.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-FILE_PR = "r1"
+PR = "r1"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-gsymcheck_20050820.bb
index 3eec7c3ef2..a0f7d60fb6 100644
--- a/packages/geda/geda-gsymcheck_20050820.bb
+++ b/packages/geda/geda-gsymcheck_20050820.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-FILE_PR = "r0"
+PR = "r0"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb
index 3eec7c3ef2..a0f7d60fb6 100644
--- a/packages/geda/geda-symbols_20050820.bb
+++ b/packages/geda/geda-symbols_20050820.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-FILE_PR = "r0"
+PR = "r0"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_20050820.bb
index 0a546938a8..d5b71b3cf7 100644
--- a/packages/geda/geda-utils_20050820.bb
+++ b/packages/geda/geda-utils_20050820.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gEDA/gaf's Utilities"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libgeda"
 
diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb
index e535627dd0..0ca490a664 100644
--- a/packages/geda/geda_20050820.bb
+++ b/packages/geda/geda_20050820.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
-FILE_PR ="r2"
+PR ="r2"
 
 DEPENDS = "libgeda gtk+"
 RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols"
diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb
index a1645e572d..e27e6f65ae 100644
--- a/packages/geda/libgeda_20050820.bb
+++ b/packages/geda/libgeda_20050820.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "zlib gtk+ guile libpng"
 
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index 3b59d21dd1..688d3eb901 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Classic arcade puzzle game - SDL edition."
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.newbreedsoftware.com/gemdropx/"
-FILE_PR = "r4"
+PR = "r4"
 
 APPIMAGE = "${WORKDIR}/gemdropx.png"
 
diff --git a/packages/genext2fs/genext2fs_1.3+cvs.bb b/packages/genext2fs/genext2fs_1.3+cvs.bb
index a8f34660d8..82af2041ab 100644
--- a/packages/genext2fs/genext2fs_1.3+cvs.bb
+++ b/packages/genext2fs/genext2fs_1.3+cvs.bb
@@ -1,7 +1,7 @@
 require genext2fs.inc
 
 PV_append = "${SRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 FILESPATH = "${FILE_DIRNAME}/genext2fs-1.3+cvs:${FILE_DIRNAME}/genext2fs:${FILE_DIRNAME}/files"
 SRC_URI = "cvs://anonymous:@genext2fs.cvs.sourceforge.net/cvsroot/genext2fs;module=genext2fs"
 S = "${WORKDIR}/genext2fs"
diff --git a/packages/genext2fs/genext2fs_1.3.bb b/packages/genext2fs/genext2fs_1.3.bb
index 01ec947626..e57f78ae50 100644
--- a/packages/genext2fs/genext2fs_1.3.bb
+++ b/packages/genext2fs/genext2fs_1.3.bb
@@ -1,6 +1,6 @@
 require genext2fs.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/genext2fs/genext2fs_${PV}.orig.tar.gz \
 	   file://misc.patch;patch=1"
diff --git a/packages/genlist/genlist.bb b/packages/genlist/genlist.bb
index c1d5d30d73..6c8695228b 100644
--- a/packages/genlist/genlist.bb
+++ b/packages/genlist/genlist.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "IP Address List Generator"
 SECTION = "utils"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://genlist.c \
 	   file://Makefile"
diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb
index f614c1b425..b4a0cbda3a 100644
--- a/packages/geoclue/geoclue_git.bb
+++ b/packages/geoclue/geoclue_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://live.gnome.org/GeoClue"
 DEPENDS = "libgpsmgr libgpsbt  gtk+ gpsd libxml2 gconf-dbus libsoup dbus-glib"
 
 PV = "0.0+git${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 inherit autotools pkgconfig
diff --git a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
index f5f9cf178f..a8bf901b6f 100644
--- a/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
+++ b/packages/geode-drivers/geode-accessbus5536_2.6.11.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Linux Access Bus driver for the AMD Geode 5535/5536"
 HOMEPAGE = "http://www.amd.com/embedded"
 
-FILE_PR = "r0"
+PR = "r0"
 AMD_DRIVER_VERSION = "01.00.0401"
 AMD_DRIVER_LABEL = "AccessBus_Linux_5536_${AMD_DRIVER_VERSION}"
 
diff --git a/packages/geode-drivers/geode-aeslx_2.6.11.bb b/packages/geode-drivers/geode-aeslx_2.6.11.bb
index ab344a8cd8..fdcbdbf20b 100644
--- a/packages/geode-drivers/geode-aeslx_2.6.11.bb
+++ b/packages/geode-drivers/geode-aeslx_2.6.11.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Linux AES Driver for the AMD Geode LX processor"
 HOMEPAGE = "http://www.amd.com/embedded"
 
-FILE_PR = "r0"
+PR = "r0"
 AMD_DRIVER_VERSION = "02.01.0100"
 AMD_DRIVER_LABEL = "AES_Linux_LX_${AMD_DRIVER_VERSION}"
 
diff --git a/packages/geode-drivers/geode-alsa5536_2.6.11.bb b/packages/geode-drivers/geode-alsa5536_2.6.11.bb
index 01872b0a51..ff2fcd8df0 100644
--- a/packages/geode-drivers/geode-alsa5536_2.6.11.bb
+++ b/packages/geode-drivers/geode-alsa5536_2.6.11.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Linux 2.6.11 ALSA Audio Driver for the AMD Geode 5535/5536 companion chip"
 HOMEPAGE = "http://www.amd.com/embedded"
 
-FILE_PR = "r0"
+PR = "r0"
 AMD_DRIVER_VERSION = "1.00.0500"
 AMD_DRIVER_LABEL = "Audio_LinuxALSA_5536_${AMD_DRIVER_VERSION}"
 
diff --git a/packages/geos/geos_2.2.3+3.0.0rc4.bb b/packages/geos/geos_2.2.3+3.0.0rc4.bb
index 890168b30a..90bcc4b384 100644
--- a/packages/geos/geos_2.2.3+3.0.0rc4.bb
+++ b/packages/geos/geos_2.2.3+3.0.0rc4.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2""
 
 DEPENDS = "boost"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://geos.refractions.net/geos-3.0.0rc4.tar.bz2"
 
diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb
index c07302bc2b..c73a19d78d 100644
--- a/packages/gettext/gettext-native_0.17.bb
+++ b/packages/gettext/gettext-native_0.17.bb
@@ -1,5 +1,5 @@
 require gettext_${PV}.bb
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = ""
 PROVIDES = ""
diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb
index babb7c2c8e..9c020f34c7 100644
--- a/packages/gettext/gettext_0.14.1.bb
+++ b/packages/gettext/gettext_0.14.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r9"
+PR = "r9"
 DEPENDS = "virtual/libiconv"
 PROVIDES = "virtual/libintl"
 
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index fe48080085..55ffb7d995 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
diff --git a/packages/gftp/gftp_2.0.18.bb b/packages/gftp/gftp_2.0.18.bb
index 8e73ff765c..f5705b1357 100644
--- a/packages/gftp/gftp_2.0.18.bb
+++ b/packages/gftp/gftp_2.0.18.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Free multithreaded file transfer client (FTP/HTTP/SSH)."
 HOMEPAGE="http://www.gftp.org/"
 SECTION = "x11/network"
 LICENSE="GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \
 	 file://configure.patch;patch=1"
diff --git a/packages/ggz/ggz-client-libs_0.0.14.1.bb b/packages/ggz/ggz-client-libs_0.0.14.1.bb
index b33045184c..6b956ba2df 100644
--- a/packages/ggz/ggz-client-libs_0.0.14.1.bb
+++ b/packages/ggz/ggz-client-libs_0.0.14.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = " Client libraries for GamingZone"
 LICENSE = "LGPLv2"
 DEPENDS = "libggz" 
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz \
            file://ggz-unbreak-m4.patch;patch=1 \
diff --git a/packages/giblib/giblib_1.2.3.bb b/packages/giblib/giblib_1.2.3.bb
index e36fdcd30a..999b6d2d1c 100644
--- a/packages/giblib/giblib_1.2.3.bb
+++ b/packages/giblib/giblib_1.2.3.bb
@@ -1,5 +1,5 @@
 require giblib.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://pkgconfig.patch;patch=1"
diff --git a/packages/giblib/giblib_1.2.4.bb b/packages/giblib/giblib_1.2.4.bb
index 7a939c4985..a86c2fb0e2 100644
--- a/packages/giblib/giblib_1.2.4.bb
+++ b/packages/giblib/giblib_1.2.4.bb
@@ -1,3 +1,3 @@
 require giblib.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb
index 2daf8fb079..14a15b8fc8 100644
--- a/packages/gift/gift_0.11.5.bb
+++ b/packages/gift/gift_0.11.5.bb
@@ -4,7 +4,7 @@ DEPENDS = "libvorbis libogg libtool"
 DESCRIPTION = "giFT is a framework for bridging multiple \
 backend peer-to-peer protocols and the user interface \
 associated with them."
-FILE_PR ="r1"
+PR ="r1"
 FILES_gift_append = " ${datadir}/giFT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2"
diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb
index d70e988b9d..a98cb0a057 100644
--- a/packages/gimp/babl_svn.bb
+++ b/packages/gimp/babl_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 
 SRCREV = "349"
 PV = "0.0.23+svn${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index 8c5c91ae9f..3719e2d5e5 100644
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -1,4 +1,4 @@
 require gimp.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb
index da6671363b..b06687c06d 100644
--- a/packages/gimp/gimp_2.3.10.bb
+++ b/packages/gimp/gimp_2.3.10.bb
@@ -1,3 +1,3 @@
 require gimp.inc
-FILE_PR = "r3"
+PR = "r3"
 
diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb
index c45555b35a..7e72e74695 100644
--- a/packages/gimp/gimp_2.3.7.bb
+++ b/packages/gimp/gimp_2.3.7.bb
@@ -1,2 +1,2 @@
 require gimp.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index c45555b35a..7e72e74695 100644
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -1,2 +1,2 @@
 require gimp.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/git/git-native_1.5.3.bb b/packages/git/git-native_1.5.3.bb
index f4d1cf8020..1ef8eafc19 100644
--- a/packages/git/git-native_1.5.3.bb
+++ b/packages/git/git-native_1.5.3.bb
@@ -1,4 +1,4 @@
 require git.inc
 inherit native
 DEPENDS = "openssl-native curl-native zlib-native expat-native"
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/git/git_1.5.2.3.bb b/packages/git/git_1.5.2.3.bb
index 37b4eac467..ad25a43732 100644
--- a/packages/git/git_1.5.2.3.bb
+++ b/packages/git/git_1.5.2.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The git revision control system used by the Linux kernel developers"
 SECTION = "console/utils"
 LICENSE = "GPL"
-FILE_PR ="r4"
+PR ="r4"
 
 inherit autotools
 
diff --git a/packages/git/git_1.5.3.bb b/packages/git/git_1.5.3.bb
index 5b5897bd5e..f250bd5166 100644
--- a/packages/git/git_1.5.3.bb
+++ b/packages/git/git_1.5.3.bb
@@ -1,5 +1,5 @@
 require git.inc
 DEPENDS = "openssl curl zlib expat"
 RDEPENDS = "perl perl-module-file-path cpio findutils sed"
-FILE_PR = "r2"
+PR = "r2"
 
diff --git a/packages/gizmod/gizmod_2.3.bb b/packages/gizmod/gizmod_2.3.bb
index 704a08e874..bc70aa0414 100644
--- a/packages/gizmod/gizmod_2.3.bb
+++ b/packages/gizmod/gizmod_2.3.bb
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \
            file://fix-python-configure.patch;patch=1 \
            file://disable-bmp.patch;patch=1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/gizmod/gizmod_3.4.bb b/packages/gizmod/gizmod_3.4.bb
index bc3a597278..3e41c949f0 100644
--- a/packages/gizmod/gizmod_3.4.bb
+++ b/packages/gizmod/gizmod_3.4.bb
@@ -9,7 +9,7 @@ SRC_URI = "\
 	file://${PV}-build-fix.patch;patch=1 \
 	"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit cmake
 
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index 9ca90aa3a4..3208a06f00 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -6,7 +6,7 @@ RDEPENDS = "ppp gconf-dbus gpe-su"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-FILE_PR = "r3gpe1"
+PR = "r3gpe1"
 
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
            file://gkdial-pgpe.patch;patch=1 \
diff --git a/packages/glib-1.2/glib-1.2-native_1.2.10.bb b/packages/glib-1.2/glib-1.2-native_1.2.10.bb
index cc93a24ec8..74e562d47c 100644
--- a/packages/glib-1.2/glib-1.2-native_1.2.10.bb
+++ b/packages/glib-1.2/glib-1.2-native_1.2.10.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "LGPL"
 DESCRIPTION = "GLib 1.2 is a deprecated libray to \
 provide support for old glib 1.2 based applications"
diff --git a/packages/glib-1.2/glib-1.2_1.2.10.bb b/packages/glib-1.2/glib-1.2_1.2.10.bb
index cb22dae5ed..77cbee2a14 100644
--- a/packages/glib-1.2/glib-1.2_1.2.10.bb
+++ b/packages/glib-1.2/glib-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-1.2-native"
-FILE_PR = "r2"
+PR = "r2"
 
 LEAD_SONAME = "libglib-1.2.*"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.12.4.bb b/packages/glib-2.0/glib-2.0-native_2.12.4.bb
index 2d2176c6fd..bfc19486fc 100644
--- a/packages/glib-2.0/glib-2.0-native_2.12.4.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.12.4.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS += "gtk-doc-native"
-FILE_PR ="r1"
+PR ="r1"
 
 EXTRA_OECONF = "--disable-debug"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.16.1.bb b/packages/glib-2.0/glib-2.0-native_2.16.1.bb
index 055d83596e..4a610c4a74 100644
--- a/packages/glib-2.0/glib-2.0-native_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.16.1.bb
@@ -2,7 +2,7 @@ require glib-2.0_${PV}.bb
 
 FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
 DEPENDS = "gtk-doc-native"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit native
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.18.0.bb b/packages/glib-2.0/glib-2.0-native_2.18.0.bb
index 24237e7f03..5684c5df49 100644
--- a/packages/glib-2.0/glib-2.0-native_2.18.0.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.18.0.bb
@@ -1,7 +1,7 @@
 require glib-2.0_${PV}.bb
 
 FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit native
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.2.3.bb b/packages/glib-2.0/glib-2.0-native_2.2.3.bb
index 77a126b0fb..fe5ddff97d 100644
--- a/packages/glib-2.0/glib-2.0-native_2.2.3.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.2.3.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
 S = "${WORKDIR}/glib-${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools  native
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.4.6.bb b/packages/glib-2.0/glib-2.0-native_2.4.6.bb
index a4f3d70bf4..507ffedd09 100644
--- a/packages/glib-2.0/glib-2.0-native_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.4.6.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtk-doc-native"
-FILE_PR = "r6"
+PR = "r6"
 
 EXTRA_OECONF = "--disable-debug"
 
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 5e7a5b9deb..0e47fec346 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtk-doc-native"
-FILE_PR = "r4"
+PR = "r4"
 
 export PERL_PATH="/usr/bin/env perl"
 EXTRA_OECONF = "--disable-debug"
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.6.bb b/packages/glib-2.0/glib-2.0-native_2.6.6.bb
index 5e7a5b9deb..0e47fec346 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.6.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.6.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtk-doc-native"
-FILE_PR = "r4"
+PR = "r4"
 
 export PERL_PATH="/usr/bin/env perl"
 EXTRA_OECONF = "--disable-debug"
diff --git a/packages/glib-2.0/glib-2.0_2.12.12.bb b/packages/glib-2.0/glib-2.0_2.12.12.bb
index 59a33452b7..2e5259073a 100644
--- a/packages/glib-2.0/glib-2.0_2.12.12.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.12.13.bb b/packages/glib-2.0/glib-2.0_2.12.13.bb
index 59a33452b7..2e5259073a 100644
--- a/packages/glib-2.0/glib-2.0_2.12.13.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.13.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index 4ce51b6865..db388d7277 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.16.3.bb b/packages/glib-2.0/glib-2.0_2.16.3.bb
index 932042bfec..f70539f18e 100644
--- a/packages/glib-2.0/glib-2.0_2.16.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.3.bb
@@ -3,7 +3,7 @@ require glib.inc
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.16.4.bb b/packages/glib-2.0/glib-2.0_2.16.4.bb
index 932042bfec..f70539f18e 100644
--- a/packages/glib-2.0/glib-2.0_2.16.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.4.bb
@@ -3,7 +3,7 @@ require glib.inc
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.16.5.bb b/packages/glib-2.0/glib-2.0_2.16.5.bb
index 932042bfec..f70539f18e 100644
--- a/packages/glib-2.0/glib-2.0_2.16.5.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.5.bb
@@ -3,7 +3,7 @@ require glib.inc
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.18.0.bb b/packages/glib-2.0/glib-2.0_2.18.0.bb
index 8688cfec18..3ac0487018 100644
--- a/packages/glib-2.0/glib-2.0_2.18.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.18.0.bb
@@ -3,7 +3,7 @@ require glib.inc
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.18.1.bb b/packages/glib-2.0/glib-2.0_2.18.1.bb
index 8688cfec18..3ac0487018 100644
--- a/packages/glib-2.0/glib-2.0_2.18.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.18.1.bb
@@ -3,7 +3,7 @@ require glib.inc
 # This version requires a newer libtool that isn't default yet 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib-2.0_2.2.3.bb b/packages/glib-2.0/glib-2.0_2.2.3.bb
index 42ffbf74c3..cf9722f2aa 100644
--- a/packages/glib-2.0/glib-2.0_2.2.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.2.3.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch;patch=1"
 
 S = "${WORKDIR}/glib-${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools  pkgconfig gettext
 
diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb
index 97e8013fac..5b47bc5d3c 100644
--- a/packages/glib-2.0/glib-2.0_2.4.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.6.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-FILE_PR = "r4"
+PR = "r4"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
diff --git a/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb
index 651c4b74bc..682df4dbbb 100644
--- a/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-FILE_PR = "r1"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
diff --git a/packages/glib-2.0/glib-2.0_2.6.6.bb b/packages/glib-2.0/glib-2.0_2.6.6.bb
index 651c4b74bc..682df4dbbb 100644
--- a/packages/glib-2.0/glib-2.0_2.6.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.6.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-FILE_PR = "r1"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
diff --git a/packages/glib-2.0/glib-2.0_2.8.6.bb b/packages/glib-2.0/glib-2.0_2.8.6.bb
index 0049ec11b2..f28b370f89 100644
--- a/packages/glib-2.0/glib-2.0_2.8.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.6.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-FILE_PR = "r1"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 498eb281ea..278b7cbc62 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -10,7 +10,7 @@ DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils "
 
-FILE_PR = "r3"
+PR = "r3"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index e870f89abb..c7d308b6a2 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r19"
+PR = "r19"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 774333f1e7..f0521d41ab 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r30"
+PR = "r30"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 6630161900..891d9da388 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-FILE_PR = "r19"
+PR = "r19"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index e5feae6514..560347d770 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r15"
+PR = "r15"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index fee5e5ab44..e0becb8c3f 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r15"
+PR = "r15"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 137e8f4756..1ae351889c 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r13"
+PR = "r13"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 9c97477ed8..03711f7ae3 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-FILE_PR = "r16"
+PR = "r16"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 3f767537b6..c9d0b66daf 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-FILE_PR = "r22"
+PR = "r22"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb
index c55216c04f..8442a15e69 100644
--- a/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
 
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 3f32f0cb88..8ee10003df 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-FILE_PR = "r20"
+PR = "r20"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index d769bd7dee..6e2295904b 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-FILE_PR = "r18"
+PR = "r18"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 0254811564..c563a1f389 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-FILE_PR = "r13"
+PR = "r13"
 
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index c2e97af764..3349ce5eef 100644
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-FILE_PR = "r8"
+PR = "r8"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 51fe5023ca..186c7d6be7 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-FILE_PR = "r11"
+PR = "r11"
 PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
diff --git a/packages/glibmm/glibmm.inc b/packages/glibmm/glibmm.inc
index 28dc2fdebf..c33d3151ae 100644
--- a/packages/glibmm/glibmm.inc
+++ b/packages/glibmm/glibmm.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libsigc++-2.0"
-FILE_PR = "r0"
+PR = "r0"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2"
diff --git a/packages/gmp/gmp_4.1.4.bb b/packages/gmp/gmp_4.1.4.bb
index 2018325904..0b32f552e7 100644
--- a/packages/gmp/gmp_4.1.4.bb
+++ b/packages/gmp/gmp_4.1.4.bb
@@ -1,5 +1,5 @@
 require gmp.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://sh4-asmfix.patch;patch=1"
\ No newline at end of file
diff --git a/packages/gmp/gmp_4.2.1.bb b/packages/gmp/gmp_4.2.1.bb
index 86f8c27d3e..452553beda 100644
--- a/packages/gmp/gmp_4.2.1.bb
+++ b/packages/gmp/gmp_4.2.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
                    file://x86-fat.diff;patch=1;pnum=0 "
diff --git a/packages/gmp/gmp_4.2.2.bb b/packages/gmp/gmp_4.2.2.bb
index 58ff30e508..295237f0f3 100644
--- a/packages/gmp/gmp_4.2.2.bb
+++ b/packages/gmp/gmp_4.2.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI_append += "file://02_noexec-stack.diff;patch=1 \
 		   file://03_gnu89-inline.diff;patch=1 \
diff --git a/packages/gmp/gmp_4.2.4.bb b/packages/gmp/gmp_4.2.4.bb
index f447087c5e..b37c266c4f 100644
--- a/packages/gmp/gmp_4.2.4.bb
+++ b/packages/gmp/gmp_4.2.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
 		  "
diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb
index a84409f00f..1c6065e74e 100644
--- a/packages/gnash/gnash-minimal_0.8.2.bb
+++ b/packages/gnash/gnash-minimal_0.8.2.bb
@@ -1,3 +1,3 @@
 require gnash-minimal.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index f68eb9179a..237097b94a 100644
--- a/packages/gnash/gnash-minimal_0.8.3.bb
+++ b/packages/gnash/gnash-minimal_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash-minimal.inc
 
-FILE_PR = "r8"
+PR = "r8"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index 858057d6ef..80564ebe7e 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,7 +1,7 @@
 require gnash-minimal.inc
 
 
-FILE_PR = "r2"
+PR = "r2"
 
 PV = "0.8.3+cvs${SRCDATE}"
 
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 4d85484c3b..60162ed1bd 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
 DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
           "
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index 5782145fc8..87ea15878f 100644
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
index 0fc0d6b1fc..c01152cfb8 100644
--- a/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools pkgconfig gconf
 
diff --git a/packages/gnome-mplayer/gnome-mplayer_cvs.bb b/packages/gnome-mplayer/gnome-mplayer_cvs.bb
index f19656237b..fb7ad0d0ea 100644
--- a/packages/gnome-mplayer/gnome-mplayer_cvs.bb
+++ b/packages/gnome-mplayer/gnome-mplayer_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit autotools pkgconfig gconf
 
diff --git a/packages/gnome/epiphany_2.21.92.bb b/packages/gnome/epiphany_2.21.92.bb
index 8b92a8caa6..c13d8ea050 100644
--- a/packages/gnome/epiphany_2.21.92.bb
+++ b/packages/gnome/epiphany_2.21.92.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
-FILE_PR ="r1"
+PR ="r1"
 
 inherit gnome
 
diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb
index 5939ac5be4..0324cb7a65 100644
--- a/packages/gnome/epiphany_2.22.1.bb
+++ b/packages/gnome/epiphany_2.22.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME default webbrowser"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/epiphany_svn.bb b/packages/gnome/epiphany_svn.bb
index 472ee4591b..97fd82b653 100644
--- a/packages/gnome/epiphany_svn.bb
+++ b/packages/gnome/epiphany_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notif
 RDEPENDS = "gnome-vfs-plugin-http"
 
 PV = "2.20.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gail_1.20.0.bb b/packages/gnome/gail_1.20.0.bb
index 6e21eb7c65..58168a04d5 100644
--- a/packages/gnome/gail_1.20.0.bb
+++ b/packages/gnome/gail_1.20.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
 DEPENDS = "gtk+"
 
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 35e9fb3812..074b3015c2 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -6,7 +6,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 PV = "2.16.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index 9af413135c..9b9db4abb4 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
 LICENSE = "LGPL"
 DEPENDS = "orbit2 glib-2.0  libxml2"
 ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/GConf-${PV}"
 
diff --git a/packages/gnome/gio-standalone_0.1.2.bb b/packages/gnome/gio-standalone_0.1.2.bb
index f89c5acf72..6e360b8237 100644
--- a/packages/gnome/gio-standalone_0.1.2.bb
+++ b/packages/gnome/gio-standalone_0.1.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gio is a platform independent file and I/O abstraction library"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-common_2.18.0.bb b/packages/gnome/gnome-common_2.18.0.bb
index baf7c047a3..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.18.0.bb
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Common macros for building GNOME applications"
 inherit gnome
 
diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb
index baf7c047a3..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.20.0.bb
+++ b/packages/gnome/gnome-common_2.20.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Common macros for building GNOME applications"
 inherit gnome
 
diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb
index a04ff4b092..3b00d917cb 100644
--- a/packages/gnome/gnome-cups-manager_0.31.bb
+++ b/packages/gnome/gnome-cups-manager_0.31.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango libgnomecups"
 
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index 775f89e473..2bf249ddb6 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -1,5 +1,5 @@
 require gnome-desktop.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index a949d84a97..fb45b134ae 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r2"
+PR = "r2"
 inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils"
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 4613db3212..7b9a5932e1 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index fca7cdf302..53b70245ca 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -1,6 +1,6 @@
 require gnome-desktop.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc
index 6f5572f6ab..ff62257aa8 100644
--- a/packages/gnome/gnome-doc-utils.inc
+++ b/packages/gnome/gnome-doc-utils.inc
@@ -1,7 +1,7 @@
 LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt libxslt-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index 5c43bb1898..cfb4788076 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
index 9c4f81704d..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 9c4f81704d..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,3 +1,3 @@
 require gnome-doc-utils.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb
index 01d62a8a87..c8e1c19da3 100644
--- a/packages/gnome/gnome-games_2.23.6.bb
+++ b/packages/gnome/gnome-games_2.23.6.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome distutils-base gconf
 
diff --git a/packages/gnome/gnome-games_2.24.0.bb b/packages/gnome/gnome-games_2.24.0.bb
index c6a003be6c..d4e58da4e7 100644
--- a/packages/gnome/gnome-games_2.24.0.bb
+++ b/packages/gnome/gnome-games_2.24.0.bb
@@ -3,7 +3,7 @@ DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui l
 
 inherit gnome distutils-base gconf
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
            "
diff --git a/packages/gnome/gnome-games_2.6.1.bb b/packages/gnome/gnome-games_2.6.1.bb
index fade8a0cb8..d1ac41b08a 100644
--- a/packages/gnome/gnome-games_2.6.1.bb
+++ b/packages/gnome/gnome-games_2.6.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb
index 20c9b809d0..c601d2a5d0 100644
--- a/packages/gnome/gnome-icon-theme_1.3.3.bb
+++ b/packages/gnome/gnome-icon-theme_1.3.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11/gnome"
 SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2"
 DEPENDS = "glib-2.0 intltool-native"
-FILE_PR ="r1"
+PR ="r1"
 
 FILES_${PN} += "${datadir}/*"
 
diff --git a/packages/gnome/gnome-keyring_2.20.0.bb b/packages/gnome/gnome-keyring_2.20.0.bb
index 950caeae24..2f72c5dfb1 100644
--- a/packages/gnome/gnome-keyring_2.20.0.bb
+++ b/packages/gnome/gnome-keyring_2.20.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools gnome pkgconfig
 
diff --git a/packages/gnome/gnome-menus_2.16.1.bb b/packages/gnome/gnome-menus_2.16.1.bb
index 4bd0fc33cc..1307c026f2 100644
--- a/packages/gnome/gnome-menus_2.16.1.bb
+++ b/packages/gnome/gnome-menus_2.16.1.bb
@@ -1,7 +1,7 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-mime-data_2.4.1.bb b/packages/gnome/gnome-mime-data_2.4.1.bb
index 222c39934f..1a49ed8e72 100644
--- a/packages/gnome/gnome-mime-data_2.4.1.bb
+++ b/packages/gnome/gnome-mime-data_2.4.1.bb
@@ -2,4 +2,4 @@ LICENSE = "GPL"
 inherit gnome
 
 DEPENDS += "intltool-native"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb
index eb087659c1..c6bd2cefa0 100644
--- a/packages/gnome/gnome-mime-data_2.4.2.bb
+++ b/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -4,4 +4,4 @@ inherit gnome
 DEPENDS += "libxml-parser-perl-native shared-mime-info intltool-native"
 RDEPENDS = "shared-mime-info"
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 435859394c..0192d863c5 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-power-manager_2.18.3.bb b/packages/gnome/gnome-power-manager_2.18.3.bb
index 8382a1ddf0..3963da3912 100644
--- a/packages/gnome/gnome-power-manager_2.18.3.bb
+++ b/packages/gnome/gnome-power-manager_2.18.3.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPLv2"
 DEPENDS = "libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " 
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-python-desktop_2.23.0.bb b/packages/gnome/gnome-python-desktop_2.23.0.bb
index 5ee9d875cd..45209b2923 100644
--- a/packages/gnome/gnome-python-desktop_2.23.0.bb
+++ b/packages/gnome/gnome-python-desktop_2.23.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome distutils-base
 
diff --git a/packages/gnome/gnome-vfs-extras_0.99.13.bb b/packages/gnome/gnome-vfs-extras_0.99.13.bb
index a9cf297b27..d348def996 100644
--- a/packages/gnome/gnome-vfs-extras_0.99.13.bb
+++ b/packages/gnome/gnome-vfs-extras_0.99.13.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs-obexftp_0.4.bb b/packages/gnome/gnome-vfs-obexftp_0.4.bb
index 9c61e317f8..3035e8f020 100644
--- a/packages/gnome/gnome-vfs-obexftp_0.4.bb
+++ b/packages/gnome/gnome-vfs-obexftp_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "obex plugin for gnome-vfs"
 LICENSE = "GPLv2"
 DEPENDS = "openobex gnome-vfs bluez-utils"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.12.0.bb b/packages/gnome/gnome-vfs_2.12.0.bb
index 6d226d453e..1c11f9841f 100644
--- a/packages/gnome/gnome-vfs_2.12.0.bb
+++ b/packages/gnome/gnome-vfs_2.12.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb
index dd2da7f712..b1f634c0e9 100644
--- a/packages/gnome/gnome-vfs_2.16.3.bb
+++ b/packages/gnome/gnome-vfs_2.16.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
index 5477b8c5cb..8a3e460119 100644
--- a/packages/gnome/gnome-vfs_2.18.1.bb
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.20.0.bb b/packages/gnome/gnome-vfs_2.20.0.bb
index bcb7a07317..5631a9c960 100644
--- a/packages/gnome/gnome-vfs_2.20.0.bb
+++ b/packages/gnome/gnome-vfs_2.20.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.22.0.bb b/packages/gnome/gnome-vfs_2.22.0.bb
index bcb7a07317..5631a9c960 100644
--- a/packages/gnome/gnome-vfs_2.22.0.bb
+++ b/packages/gnome/gnome-vfs_2.22.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb
index c1ecfaa346..c967c746d1 100644
--- a/packages/gnome/gnome-vfs_2.6.0.bb
+++ b/packages/gnome/gnome-vfs_2.6.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb
index c84a0b1784..e9a903f598 100644
--- a/packages/gnome/gnome-vfs_2.6.2.bb
+++ b/packages/gnome/gnome-vfs_2.6.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit gnome
 
diff --git a/packages/gnome/goffice_0.6.2.bb b/packages/gnome/goffice_0.6.2.bb
index 9963fd92b1..9a36af5425 100644
--- a/packages/gnome/goffice_0.6.2.bb
+++ b/packages/gnome/goffice_0.6.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Office Library"
 LICENSE="GPLv2"
-FILE_PR ="r1"
+PR ="r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gnome/goffice_0.6.3.bb b/packages/gnome/goffice_0.6.3.bb
index 55803c606f..86f9f4e943 100644
--- a/packages/gnome/goffice_0.6.3.bb
+++ b/packages/gnome/goffice_0.6.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Office Library"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
 
diff --git a/packages/gnome/gvfs_0.0.2.bb b/packages/gnome/gvfs_0.0.2.bb
index 9081d1f307..8c791ad680 100644
--- a/packages/gnome/gvfs_0.0.2.bb
+++ b/packages/gnome/gvfs_0.0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gio-standalone fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/gvfs_1.0.1.bb b/packages/gnome/gvfs_1.0.1.bb
index f22c808596..8e27d6d148 100644
--- a/packages/gnome/gvfs_1.0.1.bb
+++ b/packages/gnome/gvfs_1.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libart-lgpl_2.3.16.bb b/packages/gnome/libart-lgpl_2.3.16.bb
index d858914db5..3605a384cd 100644
--- a/packages/gnome/libart-lgpl_2.3.16.bb
+++ b/packages/gnome/libart-lgpl_2.3.16.bb
@@ -1,3 +1,3 @@
 require libart-lgpl.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libart-lgpl_2.3.19.bb b/packages/gnome/libart-lgpl_2.3.19.bb
index d858914db5..3605a384cd 100644
--- a/packages/gnome/libart-lgpl_2.3.19.bb
+++ b/packages/gnome/libart-lgpl_2.3.19.bb
@@ -1,3 +1,3 @@
 require libart-lgpl.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb
index 41e4c08376..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.10.0.bb
+++ b/packages/gnome/libbonobo_2.10.0.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonobo_2.22.0.bb b/packages/gnome/libbonobo_2.22.0.bb
index 3ca454713f..feecaf590a 100644
--- a/packages/gnome/libbonobo_2.22.0.bb
+++ b/packages/gnome/libbonobo_2.22.0.bb
@@ -1,6 +1,6 @@
 require libbonobo.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://configure-gthread.patch;patch=1"
 
diff --git a/packages/gnome/libbonobo_2.6.0.bb b/packages/gnome/libbonobo_2.6.0.bb
index 41b12a7b88..c071f38afe 100644
--- a/packages/gnome/libbonobo_2.6.0.bb
+++ b/packages/gnome/libbonobo_2.6.0.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb
index 41e4c08376..c48e7d0753 100644
--- a/packages/gnome/libbonobo_2.6.2.bb
+++ b/packages/gnome/libbonobo_2.6.2.bb
@@ -1,3 +1,3 @@
 require libbonobo.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb
index 8aba96c4a2..3a41ef731d 100644
--- a/packages/gnome/libbonoboui_2.10.0.bb
+++ b/packages/gnome/libbonoboui_2.10.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.14.0.bb b/packages/gnome/libbonoboui_2.14.0.bb
index 1b1dd9b032..53380c6fa0 100644
--- a/packages/gnome/libbonoboui_2.14.0.bb
+++ b/packages/gnome/libbonoboui_2.14.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.18.0.bb b/packages/gnome/libbonoboui_2.18.0.bb
index 1b1dd9b032..53380c6fa0 100644
--- a/packages/gnome/libbonoboui_2.18.0.bb
+++ b/packages/gnome/libbonoboui_2.18.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libbonoboui_2.6.1.bb b/packages/gnome/libbonoboui_2.6.1.bb
index ac7cb09ec9..34f10c60d6 100644
--- a/packages/gnome/libbonoboui_2.6.1.bb
+++ b/packages/gnome/libbonoboui_2.6.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/libgnome_2.10.1.bb b/packages/gnome/libgnome_2.10.1.bb
index cfd55845dc..0866b426c0 100644
--- a/packages/gnome/libgnome_2.10.1.bb
+++ b/packages/gnome/libgnome_2.10.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.12.0.1.bb b/packages/gnome/libgnome_2.12.0.1.bb
index 30b0701a33..f11aeacd37 100644
--- a/packages/gnome/libgnome_2.12.0.1.bb
+++ b/packages/gnome/libgnome_2.12.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.14.1.bb b/packages/gnome/libgnome_2.14.1.bb
index 7e4d98b341..d6c64ee7be 100644
--- a/packages/gnome/libgnome_2.14.1.bb
+++ b/packages/gnome/libgnome_2.14.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.16.0.bb b/packages/gnome/libgnome_2.16.0.bb
index 7e4d98b341..d6c64ee7be 100644
--- a/packages/gnome/libgnome_2.16.0.bb
+++ b/packages/gnome/libgnome_2.16.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnome_2.18.0.bb b/packages/gnome/libgnome_2.18.0.bb
index de6220deab..5eaa9a084e 100644
--- a/packages/gnome/libgnome_2.18.0.bb
+++ b/packages/gnome/libgnome_2.18.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome lib_package
 
diff --git a/packages/gnome/libgnome_2.24.0.bb b/packages/gnome/libgnome_2.24.0.bb
index f0ead37c32..549cda2855 100644
--- a/packages/gnome/libgnome_2.24.0.bb
+++ b/packages/gnome/libgnome_2.24.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnome application programming libraries"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome lib_package
 
diff --git a/packages/gnome/libgnome_2.6.1.1.bb b/packages/gnome/libgnome_2.6.1.1.bb
index c86f2cc187..06b85b7775 100644
--- a/packages/gnome/libgnome_2.6.1.1.bb
+++ b/packages/gnome/libgnome_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb
index 9544196ab1..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.10.2.bb
+++ b/packages/gnome/libgnomecanvas_2.10.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.12.0.bb b/packages/gnome/libgnomecanvas_2.12.0.bb
index 9544196ab1..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.12.0.bb
+++ b/packages/gnome/libgnomecanvas_2.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecanvas_2.6.1.1.bb b/packages/gnome/libgnomecanvas_2.6.1.1.bb
index 8165fd1c45..5c716855e7 100644
--- a/packages/gnome/libgnomecanvas_2.6.1.1.bb
+++ b/packages/gnome/libgnomecanvas_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb
index 4c81f9dff2..166161fdcd 100644
--- a/packages/gnome/libgnomecups_0.2.2.bb
+++ b/packages/gnome/libgnomecups_0.2.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
-FILE_PR ="r0"
+PR ="r0"
 
 DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
 
diff --git a/packages/gnome/libgnomeprint_2.6.2.bb b/packages/gnome/libgnomeprint_2.6.2.bb
index c5ece2bc6d..ae9d6cc70b 100644
--- a/packages/gnome/libgnomeprint_2.6.2.bb
+++ b/packages/gnome/libgnomeprint_2.6.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
diff --git a/packages/gnome/libgnomeprint_2.8.2.bb b/packages/gnome/libgnomeprint_2.8.2.bb
index aae93d71e0..a7db775e22 100644
--- a/packages/gnome/libgnomeprint_2.8.2.bb
+++ b/packages/gnome/libgnomeprint_2.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
 
diff --git a/packages/gnome/libgnomeprintui_2.6.2.bb b/packages/gnome/libgnomeprintui_2.6.2.bb
index 2ec4d0471d..5a37a78514 100644
--- a/packages/gnome/libgnomeprintui_2.6.2.bb
+++ b/packages/gnome/libgnomeprintui_2.6.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/libgnomeprintui_2.8.2.bb b/packages/gnome/libgnomeprintui_2.8.2.bb
index 2ec4d0471d..5a37a78514 100644
--- a/packages/gnome/libgnomeprintui_2.8.2.bb
+++ b/packages/gnome/libgnomeprintui_2.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/libgnomeui_2.12.0.bb b/packages/gnome/libgnomeui_2.12.0.bb
index d9859c3b83..9324676cec 100644
--- a/packages/gnome/libgnomeui_2.12.0.bb
+++ b/packages/gnome/libgnomeui_2.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r3"
+PR = "r3"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.15.2.bb b/packages/gnome/libgnomeui_2.15.2.bb
index 3e822dc7db..a6700434c3 100644
--- a/packages/gnome/libgnomeui_2.15.2.bb
+++ b/packages/gnome/libgnomeui_2.15.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb
index 4e3d3ddaec..ca299d8cac 100644
--- a/packages/gnome/libgnomeui_2.16.1.bb
+++ b/packages/gnome/libgnomeui_2.16.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgnomeui_2.6.1.1.bb b/packages/gnome/libgnomeui_2.6.1.1.bb
index a2be070902..844d91b1fd 100644
--- a/packages/gnome/libgnomeui_2.6.1.1.bb
+++ b/packages/gnome/libgnomeui_2.6.1.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
diff --git a/packages/gnome/libgweather_2.24.0.bb b/packages/gnome/libgweather_2.24.0.bb
index 58037835e6..f8da526b2b 100644
--- a/packages/gnome/libgweather_2.24.0.bb
+++ b/packages/gnome/libgweather_2.24.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DEPENDS = "libgnome libsoup-2.4 gtk+"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/gnome/libsoup-2.4_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb
index bc1fd295d9..24de169e6f 100644
--- a/packages/gnome/libsoup-2.4_2.4.1.bb
+++ b/packages/gnome/libsoup-2.4_2.4.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gnutls libxml2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2"
 S = "${WORKDIR}/libsoup-${PV}"
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index 33178c9aa1..d69a985627 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
 
diff --git a/packages/gnome/orbit2-native_2.14.12.bb b/packages/gnome/orbit2-native_2.14.12.bb
index 12f896b4d6..009974ade3 100644
--- a/packages/gnome/orbit2-native_2.14.12.bb
+++ b/packages/gnome/orbit2-native_2.14.12.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "CORBA ORB"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.10.2.bb b/packages/gnome/orbit2_2.10.2.bb
index e1d9550293..4ac4129414 100644
--- a/packages/gnome/orbit2_2.10.2.bb
+++ b/packages/gnome/orbit2_2.10.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.13.2.bb b/packages/gnome/orbit2_2.13.2.bb
index 9b79dd193a..e4d83408b1 100644
--- a/packages/gnome/orbit2_2.13.2.bb
+++ b/packages/gnome/orbit2_2.13.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnome/orbit2_2.14.12.bb b/packages/gnome/orbit2_2.14.12.bb
index 275dbbc96f..140776114d 100644
--- a/packages/gnome/orbit2_2.14.12.bb
+++ b/packages/gnome/orbit2_2.14.12.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
diff --git a/packages/gnu-config/gnu-config_20050701.bb b/packages/gnu-config/gnu-config_20050701.bb
index 1b203b4fab..8ee0a32120 100644
--- a/packages/gnu-config/gnu-config_20050701.bb
+++ b/packages/gnu-config/gnu-config_20050701.bb
@@ -6,7 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.1+cvs${FIXEDSRCDATE}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
 	   file://config-guess-uclibc.patch;patch=1 \
diff --git a/packages/gnumeric/gnumeric_1.8.2.bb b/packages/gnumeric/gnumeric_1.8.2.bb
index 470e929262..8d3b1b5fb7 100644
--- a/packages/gnumeric/gnumeric_1.8.2.bb
+++ b/packages/gnumeric/gnumeric_1.8.2.bb
@@ -4,7 +4,7 @@ S = "${WORKDIR}/gnumeric-${PV}"
 DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/gnumeric/gnumeric_1.8.3.bb b/packages/gnumeric/gnumeric_1.8.3.bb
index 00b3e96830..0f70e37d5c 100644
--- a/packages/gnumeric/gnumeric_1.8.3.bb
+++ b/packages/gnumeric/gnumeric_1.8.3.bb
@@ -4,7 +4,7 @@ S = "${WORKDIR}/gnumeric-${PV}"
 DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
-FILE_PR = "r0"
+PR = "r0"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/gnupg/gnupg_1.4.2.2.bb b/packages/gnupg/gnupg_1.4.2.2.bb
index 5f444ca2c1..b21eb88b91 100644
--- a/packages/gnupg/gnupg_1.4.2.2.bb
+++ b/packages/gnupg/gnupg_1.4.2.2.bb
@@ -11,4 +11,4 @@ SRC_URI += "file://15_free_caps.patch;patch=1 \
 
 S = "${WORKDIR}/gnupg-${PV}"
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 72efdfd3e3..abf519ae6e 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -1,6 +1,6 @@
 require gnuplot.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
 	   file://subdirs.patch;patch=1 \
diff --git a/packages/gnuplot/gnuplot_4.2.4.bb b/packages/gnuplot/gnuplot_4.2.4.bb
index 8c2e7cbbc5..478f6e2b0f 100644
--- a/packages/gnuplot/gnuplot_4.2.4.bb
+++ b/packages/gnuplot/gnuplot_4.2.4.bb
@@ -1,6 +1,6 @@
 require gnuplot.inc
 
-FILE_PR = "r0"
+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
index b4fe9beeab..ff3e9b3810 100644
--- a/packages/gnuplot/gnuplot_cvs.bb
+++ b/packages/gnuplot/gnuplot_cvs.bb
@@ -1,7 +1,7 @@
 require gnuplot.inc
 
 PV = "4.3.0+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
index d0b178630f..cc57260f49 100644
--- a/packages/gnuplot/qtplot_0.2.bb
+++ b/packages/gnuplot/qtplot_0.2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "gnuplot"
 RDEPDENDS_${PN} = "gnuplot"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI  = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz"
 
diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb
index b9ce92ddce..0f339c30c1 100644
--- a/packages/gnuradio/gnuradio_3.0.4.bb
+++ b/packages/gnuradio/gnuradio_3.0.4.bb
@@ -1,6 +1,6 @@
 require gnuradio.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb
index fe93b5084e..a49f1c468d 100644
--- a/packages/gnuradio/gnuradio_3.1.2.bb
+++ b/packages/gnuradio/gnuradio_3.1.2.bb
@@ -1,6 +1,6 @@
 require gnuradio.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
diff --git a/packages/gnuradio/gnuradio_3.1.3.bb b/packages/gnuradio/gnuradio_3.1.3.bb
index d890391750..2fbe0fd36a 100644
--- a/packages/gnuradio/gnuradio_3.1.3.bb
+++ b/packages/gnuradio/gnuradio_3.1.3.bb
@@ -1,6 +1,6 @@
 require gnuradio.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 #           file://gnuradio-libusb.patch;patch=1 \
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index bd5df17645..3d4f12aa7d 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -3,7 +3,7 @@ require gnuradio.inc
 DEFAULT_PREFERENCE = "-1"
 
 PV = "3.1.3+svnr${SRCREV}"
-FILE_PR = "r4"
+PR = "r4"
 
 EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp1 --disable--usrp2"
 
diff --git a/packages/gnutls/gnutls_1.4.5.bb b/packages/gnutls/gnutls_1.4.5.bb
index 3eb87842d7..749064af65 100644
--- a/packages/gnutls/gnutls_1.4.5.bb
+++ b/packages/gnutls/gnutls_1.4.5.bb
@@ -1,3 +1,3 @@
 require gnutls.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index 0d856a2eb1..ce10a4b6cf 100644
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -6,4 +6,4 @@ SRC_URI += "\
 	file://configure_madness.patch;patch=1 \
 	"
 
-FILE_PR = "r6"
+PR = "r6"
diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb
index dce08ad667..4c6e9daad2 100644
--- a/packages/gomunicator/gomunicator_cvs.bb
+++ b/packages/gomunicator/gomunicator_cvs.bb
@@ -5,7 +5,7 @@ AUTHOR = "Robert Woerle"
 SECTION = "gpe"
 DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib dbus-glib"
 PV = "0.1.3+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gparted/gparted_0.3.3.bb b/packages/gparted/gparted_0.3.3.bb
index be74c35df6..43623d7348 100644
--- a/packages/gparted/gparted_0.3.3.bb
+++ b/packages/gparted/gparted_0.3.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME Partition Manager"
 LICENSE = "GPL"
 DEPENDS = "gtkmm parted"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/gpdf/gpdf_2.10.0.bb b/packages/gpdf/gpdf_2.10.0.bb
index 280a5acd15..30c42dcb0c 100644
--- a/packages/gpdf/gpdf_2.10.0.bb
+++ b/packages/gpdf/gpdf_2.10.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gpdf/gpdf_2.7.90.bb b/packages/gpdf/gpdf_2.7.90.bb
index 76fd6b4b39..975523530a 100644
--- a/packages/gpdf/gpdf_2.7.90.bb
+++ b/packages/gpdf/gpdf_2.7.90.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome gettext
 
diff --git a/packages/gpdf/gpdf_2.8.0.bb b/packages/gpdf/gpdf_2.8.0.bb
index eb97e3964c..b4afdb02b8 100644
--- a/packages/gpdf/gpdf_2.8.0.bb
+++ b/packages/gpdf/gpdf_2.8.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gpdf/gpdf_2.8.2.bb b/packages/gpdf/gpdf_2.8.2.bb
index 8472e0d01a..3943ff93e1 100644
--- a/packages/gpdf/gpdf_2.8.2.bb
+++ b/packages/gpdf/gpdf_2.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/gpe-aerial/gpe-aerial_0.2.11.bb b/packages/gpe-aerial/gpe-aerial_0.2.11.bb
index 25129ef877..543dc09e88 100644
--- a/packages/gpe-aerial/gpe-aerial_0.2.11.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.11.bb
@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-FILE_PR = "r1"
+PR = "r1"
 
 DESCRIPTION = "GPE wireless LAN communication applet"
 DEPENDS = "gtk+ libgpewidget prismstumbler"
diff --git a/packages/gpe-aerial/gpe-aerial_0.2.12.bb b/packages/gpe-aerial/gpe-aerial_0.2.12.bb
index 25129ef877..543dc09e88 100644
--- a/packages/gpe-aerial/gpe-aerial_0.2.12.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.12.bb
@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-FILE_PR = "r1"
+PR = "r1"
 
 DESCRIPTION = "GPE wireless LAN communication applet"
 DEPENDS = "gtk+ libgpewidget prismstumbler"
diff --git a/packages/gpe-aerial/gpe-aerial_0.2.13.bb b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
index 9ba0b9f3ff..1f79de876b 100644
--- a/packages/gpe-aerial/gpe-aerial_0.2.13.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-FILE_PR = "r1"
+PR = "r1"
 
 
 DESCRIPTION = "GPE wireless LAN communication applet"
diff --git a/packages/gpe-aerial/gpe-aerial_0.3.0.bb b/packages/gpe-aerial/gpe-aerial_0.3.0.bb
index cf08b00f54..9158305a80 100644
--- a/packages/gpe-aerial/gpe-aerial_0.3.0.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.3.0.bb
@@ -1,6 +1,6 @@
 inherit gpe autotools
 
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "GPE wireless LAN communication applet"
 DEPENDS  = "gtk+ libgpewidget prismstumbler"
 RDEPENDS = "prismstumbler"
diff --git a/packages/gpe-aerial/gpe-aerial_svn.bb b/packages/gpe-aerial/gpe-aerial_svn.bb
index 9ef1a0fcfa..faa8b5c813 100644
--- a/packages/gpe-aerial/gpe-aerial_svn.bb
+++ b/packages/gpe-aerial/gpe-aerial_svn.bb
@@ -6,7 +6,7 @@ RDEPENDS = "prismstumbler"
 SECTION  = "gpe"
 PRIORITY = "optional"
 LICENSE  = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 PV = "0.3.0+svn${SRCDATE}"
 
 SRC_URI = "${GPE_EXTRA_SVN}"
diff --git a/packages/gpe-announce/gpe-announce_0.13.bb b/packages/gpe-announce/gpe-announce_0.13.bb
index 81cfebc386..6ffe317a12 100644
--- a/packages/gpe-announce/gpe-announce_0.13.bb
+++ b/packages/gpe-announce/gpe-announce_0.13.bb
@@ -2,6 +2,6 @@ inherit gpe
 
 DEPENDS = "libsoundgen libschedule gtk+ libgpewidget"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-esound.diff;patch=1"
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.8.bb b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
index 5e10e221ed..e638bc9912 100644
--- a/packages/gpe-appmgr/gpe-appmgr_2.8.bb
+++ b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE application launcher"
 DEPENDS = "libgpewidget libgpelaunch cairo libxsettings-client"
 SECTION = "gpe"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gpe
 
diff --git a/packages/gpe-appmgr/gpe-appmgr_svn.bb b/packages/gpe-appmgr/gpe-appmgr_svn.bb
index 4b29b77e1e..25492b1bc6 100644
--- a/packages/gpe-appmgr/gpe-appmgr_svn.bb
+++ b/packages/gpe-appmgr/gpe-appmgr_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget libgpelaunch cairo libxsettings-client"
 PV = "2.8+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe
 
diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb
index 669f44a8ac..89f8e8230a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.6.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.6.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://vcard-send.patch;patch=1;pnum=0"
 
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index 5c6d2984bc..f19b64d933 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://decl.patch;patch=1;pnum=0"
 
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
index a4cbe620a3..98cdbc4b7f 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -1,6 +1,6 @@
 require gpe-bluetooth.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_configure () {
 	autotools_do_configure
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
index 1af6b2fdf5..9164cc4088 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -1,6 +1,6 @@
 require gpe-bluetooth.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://hciattach-bts.patch;patch=1 \
 	file://include-sdp_lib.patch;patch=1"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb
index 0a7d0e0385..e6ff0d6624 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb
@@ -1,4 +1,4 @@
 require gpe-bluetooth.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_svn.bb b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb
index e82719409b..956e82e0ad 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_svn.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb
@@ -3,7 +3,7 @@ require gpe-bluetooth.inc
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.54+svn${SRCDATE}" 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
index 5f5a5afacb..9790d8ebad 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gpe-bootsplash"
 RDEPENDS = "gpe-bootsplash"
-FILE_PR = "r1"
+PR = "r1"
 
 export THEME = "e"
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb
index ba196b82e4..c170746e79 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gpe-bootsplash"
 RDEPENDS = "gpe-bootsplash"
-FILE_PR = "r0"
+PR = "r0"
 
 export THEME = "gpephone"
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
index a31f0027c7..293766a0b6 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gpe-bootsplash"
 RDEPENDS = "gpe-bootsplash"
-FILE_PR = "r1"
+PR = "r1"
 
 export THEME = "opie"
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
index 4f0711f85e..6f54eadad0 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ librsvg"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg"
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 3ffdfd8488..414041dbcb 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg \
             file://c7x0-rotation.patch;patch=1 \
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index bcac7b0f99..c947587207 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI += "file://splash-p.svg \
 	    file://splash-l.svg \
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_svn.bb b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb
index b918e29276..56267ce48a 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_svn.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_svn.bb
@@ -2,7 +2,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libsvg-cairo"
-FILE_PR = "r1"
+PR = "r1"
 PV = "1.15+svn-${SRCDATE}"
 
 inherit autotools
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_svn.bb b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb
index 96ac3592f4..f1a932f788 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_svn.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Buttonbox for gpe"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget libgpelaunch"
 PV = "0.5+svn-${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/gpe-calendar/gpe-calendar_0.72.bb b/packages/gpe-calendar/gpe-calendar_0.72.bb
index bbf389a409..1b648ce52e 100644
--- a/packages/gpe-calendar/gpe-calendar_0.72.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.72.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
 RDEPENDS = "gpe-icons"
 
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-calendar/gpe-calendar_0.90.bb b/packages/gpe-calendar/gpe-calendar_0.90.bb
index 544e07c4c5..5b7c321fa9 100644
--- a/packages/gpe-calendar/gpe-calendar_0.90.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.90.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
 RDEPENDS = "gpe-icons"
 
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-calendar/gpe-calendar_0.91.bb b/packages/gpe-calendar/gpe-calendar_0.91.bb
index a91a54cecd..534721b0b8 100644
--- a/packages/gpe-calendar/gpe-calendar_0.91.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.91.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen"
 RDEPENDS = "gpe-icons"
 
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-calendar/gpe-calendar_0.92.bb b/packages/gpe-calendar/gpe-calendar_0.92.bb
index a91a54cecd..534721b0b8 100644
--- a/packages/gpe-calendar/gpe-calendar_0.92.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.92.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen"
 RDEPENDS = "gpe-icons"
 
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-calendar/gpe-calendar_svn.bb b/packages/gpe-calendar/gpe-calendar_svn.bb
index 69a152a419..3462ebf631 100644
--- a/packages/gpe-calendar/gpe-calendar_svn.bb
+++ b/packages/gpe-calendar/gpe-calendar_svn.bb
@@ -11,7 +11,7 @@ inherit autotools gpe
 
 
 PV = "0.91+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/gpe-clock/gpe-clock_0.14.bb b/packages/gpe-clock/gpe-clock_0.14.bb
index 46ba53d980..8b888f5126 100644
--- a/packages/gpe-clock/gpe-clock_0.14.bb
+++ b/packages/gpe-clock/gpe-clock_0.14.bb
@@ -1,6 +1,6 @@
 require gpe-clock.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
 	   file://default-time-24hrs.patch;patch=1"
diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb
index 68ddc92983..0cb645c5d4 100644
--- a/packages/gpe-conf/gpe-conf_0.2.3.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.3.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
 RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons tzdata"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-FILE_PR = "r1"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.4.bb b/packages/gpe-conf/gpe-conf_0.2.4.bb
index 6b97593d8e..15a5bce0f3 100644
--- a/packages/gpe-conf/gpe-conf_0.2.4.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.4.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client l
 RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
 RDEPENDS_gpe-conf-panel = "gpe-conf"
 
-FILE_PR = "r2"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.5.bb b/packages/gpe-conf/gpe-conf_0.2.5.bb
index 3d7a0fa278..8cb2d61f3d 100644
--- a/packages/gpe-conf/gpe-conf_0.2.5.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.5.bb
@@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf"
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-FILE_PR = "r4"
+PR = "r4"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.6.bb b/packages/gpe-conf/gpe-conf_0.2.6.bb
index 04d11da560..b56b780210 100644
--- a/packages/gpe-conf/gpe-conf_0.2.6.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.6.bb
@@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf"
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.7.bb b/packages/gpe-conf/gpe-conf_0.2.7.bb
index c3561a06d9..ec836eb068 100644
--- a/packages/gpe-conf/gpe-conf_0.2.7.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.7.bb
@@ -10,7 +10,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf"
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-conf/gpe-conf_svn.bb b/packages/gpe-conf/gpe-conf_svn.bb
index a3ad8babf7..dfa7a8bce6 100644
--- a/packages/gpe-conf/gpe-conf_svn.bb
+++ b/packages/gpe-conf/gpe-conf_svn.bb
@@ -12,7 +12,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf"
 inherit autotools gpe
 
 PV = "0.2.5+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/gpe-confd/gpe-confd_0.16.bb b/packages/gpe-confd/gpe-confd_0.16.bb
index 2f0ceb18ff..b9c31029e2 100644
--- a/packages/gpe-confd/gpe-confd_0.16.bb
+++ b/packages/gpe-confd/gpe-confd_0.16.bb
@@ -4,5 +4,5 @@ DEPENDS = "libxsettings glib-2.0 sqlite"
 SECTION = "gpe"
 DESCRIPTION = "GPE configuration daemon"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
diff --git a/packages/gpe-contacts/gpe-contacts.inc b/packages/gpe-contacts/gpe-contacts.inc
index 775e04a62e..e6af955190 100644
--- a/packages/gpe-contacts/gpe-contacts.inc
+++ b/packages/gpe-contacts/gpe-contacts.inc
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 inherit gpe autotools pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libgpewidget libdisplaymigration libgpevtype dbus"
 SECTION = "gpe"
diff --git a/packages/gpe-contacts/gpe-contacts_0.45.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb
index 7f6d4cf4fb..56c3af8eb2 100644
--- a/packages/gpe-contacts/gpe-contacts_0.45.bb
+++ b/packages/gpe-contacts/gpe-contacts_0.45.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 inherit gpe autotools
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib"
 SECTION = "gpe"
diff --git a/packages/gpe-contacts/gpe-contacts_svn.bb b/packages/gpe-contacts/gpe-contacts_svn.bb
index bb3f4fa9fe..9a626572a5 100644
--- a/packages/gpe-contacts/gpe-contacts_svn.bb
+++ b/packages/gpe-contacts/gpe-contacts_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
 RDEPENDS = "gpe-icons"
 PV = "0.47+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools gpe
 
diff --git a/packages/gpe-dm/gpe-dm_0.48.bb b/packages/gpe-dm/gpe-dm_0.48.bb
index 9f5296f016..51af5a98d9 100644
--- a/packages/gpe-dm/gpe-dm_0.48.bb
+++ b/packages/gpe-dm/gpe-dm_0.48.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 xserver-common"
 RDEPENDS_${PN} += "procps xserver-common"
-FILE_PR = "r3"
+PR = "r3"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/packages/gpe-edit/gpe-edit_0.32.bb b/packages/gpe-edit/gpe-edit_0.32.bb
index a5cc5171fd..db15a3d7b6 100644
--- a/packages/gpe-edit/gpe-edit_0.32.bb
+++ b/packages/gpe-edit/gpe-edit_0.32.bb
@@ -1,7 +1,7 @@
 SECTION = "gpe"
 DESCRIPTION = "Editor for the GPE Palmtop Environment"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "gtk+ libgpewidget"
 
diff --git a/packages/gpe-filemanager/gpe-filemanager_svn.bb b/packages/gpe-filemanager/gpe-filemanager_svn.bb
index 733dd3effb..2c2d82d253 100644
--- a/packages/gpe-filemanager/gpe-filemanager_svn.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "libgpewidget gnome-vfs dbus-glib"
 RDEPENDS = "gpe-icons"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
-FILE_PR = "r1"
+PR = "r1"
 PV = "0.25+svn-${SRCDATE}"
 
 inherit autotools
diff --git a/packages/gpe-fsi/gpe-fsi_0.1.bb b/packages/gpe-fsi/gpe-fsi_0.1.bb
index b1ab948b5a..479308d64c 100644
--- a/packages/gpe-fsi/gpe-fsi_0.1.bb
+++ b/packages/gpe-fsi/gpe-fsi_0.1.bb
@@ -4,7 +4,7 @@ LICENSE = "gpl"
 inherit gpe
 
 SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/gpe-fsi.tar.bz2"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libgpewidget fsi-client gtk+"
 SECTION = "gpe"
diff --git a/packages/gpe-gallery/gpe-gallery_0.97.bb b/packages/gpe-gallery/gpe-gallery_0.97.bb
index dc36bc9471..4b4cfaebb8 100644
--- a/packages/gpe-gallery/gpe-gallery_0.97.bb
+++ b/packages/gpe-gallery/gpe-gallery_0.97.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe
 
diff --git a/packages/gpe-go/gpe-go_0.05.bb b/packages/gpe-go/gpe-go_0.05.bb
index ae2df6df3f..2e0ce7c634 100644
--- a/packages/gpe-go/gpe-go_0.05.bb
+++ b/packages/gpe-go/gpe-go_0.05.bb
@@ -5,6 +5,6 @@ DEPENDS = "gtk+ libgpewidget gpe-icons"
 RDEPENDS = "gdk-pixbuf-loader-jpeg"
 SECTION = "gpe"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-make.patch;patch=1"
diff --git a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
index d52293432f..dcd6486fab 100644
--- a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
+++ b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A helpviewer based on gtk+webcore"
 LICENSE = "GPL"
 DEPENDS = "osb-nrcit"
 RDEPENDS = "gpe-helpviewer-doc"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://stag.mind.be/gpe-helpviewer-${PV}.tar.bz2"
 
diff --git a/packages/gpe-icons/gpe-icons_0.25.bb b/packages/gpe-icons/gpe-icons_0.25.bb
index d14edffb79..6276e9510b 100644
--- a/packages/gpe-icons/gpe-icons_0.25.bb
+++ b/packages/gpe-icons/gpe-icons_0.25.bb
@@ -7,7 +7,7 @@ RDEPENDS = "gdk-pixbuf-loader-png"
 
 inherit gpe
 
-FILE_PR = "r1"
+PR = "r1"
 
 #only icons present in the package
 PACKAGE_ARCH = "all"
diff --git a/packages/gpe-life/gpe-life_0.2.bb b/packages/gpe-life/gpe-life_0.2.bb
index f43459ed0e..0f5acc2716 100644
--- a/packages/gpe-life/gpe-life_0.2.bb
+++ b/packages/gpe-life/gpe-life_0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Conway's Game of Life for GPE"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "gpe/games"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libglade"
 
diff --git a/packages/gpe-lights/gpe-lights_0.12.bb b/packages/gpe-lights/gpe-lights_0.12.bb
index 571773b869..4b09058565 100644
--- a/packages/gpe-lights/gpe-lights_0.12.bb
+++ b/packages/gpe-lights/gpe-lights_0.12.bb
@@ -5,6 +5,6 @@ DESCRIPTION = "A simple light puzzle."
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe/games"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-makefiles.patch;patch=1"
diff --git a/packages/gpe-lights/gpe-lights_0.13.bb b/packages/gpe-lights/gpe-lights_0.13.bb
index 571773b869..4b09058565 100644
--- a/packages/gpe-lights/gpe-lights_0.13.bb
+++ b/packages/gpe-lights/gpe-lights_0.13.bb
@@ -5,6 +5,6 @@ DESCRIPTION = "A simple light puzzle."
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe/games"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-makefiles.patch;patch=1"
diff --git a/packages/gpe-login/gpe-login_0.93.bb b/packages/gpe-login/gpe-login_0.93.bb
index 63c8295a94..4ea1cc235e 100644
--- a/packages/gpe-login/gpe-login_0.93.bb
+++ b/packages/gpe-login/gpe-login_0.93.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
diff --git a/packages/gpe-login/gpe-login_0.95.bb b/packages/gpe-login/gpe-login_0.95.bb
index 4dac589dd2..0b3f480e6e 100644
--- a/packages/gpe-login/gpe-login_0.95.bb
+++ b/packages/gpe-login/gpe-login_0.95.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
index c08c35ef9f..6f1ba31274 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
@@ -1,6 +1,6 @@
 require gpe-mini-browser.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
 DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
index 6490d24ed5..5f3d1f4d1b 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
@@ -1,6 +1,6 @@
 require gpe-mini-browser.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
 DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
index 991eb2492d..3069730fbb 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb
@@ -1,6 +1,6 @@
 require gpe-mini-browser.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
 DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser2_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser2_svn.bb
index 8281e82753..8b56e23630 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser2_svn.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser2_svn.bb
@@ -1,6 +1,6 @@
 DEPENDS = "gtk+ glib-2.0 libgpewidget webkit-gtk"
 PV = "0.0.1+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
index 5e63dd2311..06e910af53 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -1,6 +1,6 @@
 require gpe-mini-browser.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
 DEPENDS = "osb-nrcit libgpewidget"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
index 83eafdf6c0..35cca41d18 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb
@@ -1,6 +1,6 @@
 require gpe-mini-browser.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
 DEPENDS = "osb-nrcit sqlite libgpewidget"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
index 0d98e1448a..74c31e09f3 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.20.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.20.bb
index 0d98e1448a..74c31e09f3 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.20.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.20.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
index 74a8014d36..2a9249818b 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://mini-browser-desktop-fix.patch;patch=0"
 
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
index f7859e2e74..30d9d83a49 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
@@ -1,7 +1,7 @@
 DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 PV = "0.20+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/gpe-mininet/gpe-mininet_0.5.bb b/packages/gpe-mininet/gpe-mininet_0.5.bb
index ee447ac19d..6ca4da8ca4 100644
--- a/packages/gpe-mininet/gpe-mininet_0.5.bb
+++ b/packages/gpe-mininet/gpe-mininet_0.5.bb
@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget gpe-icons gpe-conf matchbox-panel"
 SECTION = "gpe"
diff --git a/packages/gpe-mininet/gpe-mininet_0.6.bb b/packages/gpe-mininet/gpe-mininet_0.6.bb
index f3b62271eb..da95c97343 100644
--- a/packages/gpe-mininet/gpe-mininet_0.6.bb
+++ b/packages/gpe-mininet/gpe-mininet_0.6.bb
@@ -1,6 +1,6 @@
 inherit autotools gpe pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget gpe-icons gpe-conf"
 RRECOMMENDS = "gpe-conf"
diff --git a/packages/gpe-mininet/gpe-mininet_0.7.bb b/packages/gpe-mininet/gpe-mininet_0.7.bb
index f3b62271eb..da95c97343 100644
--- a/packages/gpe-mininet/gpe-mininet_0.7.bb
+++ b/packages/gpe-mininet/gpe-mininet_0.7.bb
@@ -1,6 +1,6 @@
 inherit autotools gpe pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget gpe-icons gpe-conf"
 RRECOMMENDS = "gpe-conf"
diff --git a/packages/gpe-mininet/gpe-mininet_svn.bb b/packages/gpe-mininet/gpe-mininet_svn.bb
index f21e4d9422..1acca052fd 100644
--- a/packages/gpe-mininet/gpe-mininet_svn.bb
+++ b/packages/gpe-mininet/gpe-mininet_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget gpe-icons gpe-conf"
 RRECOMMENDS = "gpe-conf"
-FILE_PR = "r0"
+PR = "r0"
 PV = "0.7+svn-${SRCDATE}"
 
 inherit autotools pkgconfig
diff --git a/packages/gpe-mixer/gpe-mixer_0.42.bb b/packages/gpe-mixer/gpe-mixer_0.42.bb
index b1bb90c811..5fe0e98c82 100644
--- a/packages/gpe-mixer/gpe-mixer_0.42.bb
+++ b/packages/gpe-mixer/gpe-mixer_0.42.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gpe pkgconfig
 
diff --git a/packages/gpe-nmf/gpe-nmf_0.19.bb b/packages/gpe-nmf/gpe-nmf_0.19.bb
index 4550781f47..6ee24032e0 100644
--- a/packages/gpe-nmf/gpe-nmf_0.19.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.19.bb
@@ -1,3 +1,3 @@
 require gpe-nmf.inc
 
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/gpe-nmf/gpe-nmf_0.20.bb b/packages/gpe-nmf/gpe-nmf_0.20.bb
index 19e12f1126..bfbb7a487c 100644
--- a/packages/gpe-nmf/gpe-nmf_0.20.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.20.bb
@@ -1,4 +1,4 @@
 require gpe-nmf.inc
 
 RRECOMMENDS += "gst-plugin-tcp"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb
index 41da339066..98b7683232 100644
--- a/packages/gpe-nmf/gpe-nmf_0.22.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.22.bb
@@ -2,7 +2,7 @@ require gpe-nmf.inc
 
 RDEPENDS += "gst-plugin-decodebin"
 RRECOMMENDS += "gst-plugin-ivorbis gst-plugin-tcp"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \
              file://fix-includepath.patch;patch=1"
diff --git a/packages/gpe-othello/gpe-othello_0.2-1.bb b/packages/gpe-othello/gpe-othello_0.2-1.bb
index 5ba53cfc64..43d9a197f4 100644
--- a/packages/gpe-othello/gpe-othello_0.2-1.bb
+++ b/packages/gpe-othello/gpe-othello_0.2-1.bb
@@ -4,6 +4,6 @@ DESCRIPTION = "An Othello clone using GTK, hacked from ugothello."
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe/games"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-makefiles.patch;patch=1"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
index 967fdaf804..c5d8184cbf 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
@@ -1,3 +1,3 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
index b23ff857b2..e63a6172a2 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
@@ -1,5 +1,5 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://fixloop.patch;patch=1;pnum=0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
index 4427a03864..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
@@ -1,3 +1,3 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
index 4427a03864..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
@@ -1,3 +1,3 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
index 4427a03864..e7ef651bc4 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
@@ -1,3 +1,3 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index 4c831302d7..b00cc7cc66 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -1,5 +1,5 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://compile.patch;patch=1"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
index 86aeb0ca17..036f70eaf1 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
@@ -1,6 +1,6 @@
 require gpe-ownerinfo.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PV = "0.28+svn-${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpe-package/gpe-package_0.2.bb b/packages/gpe-package/gpe-package_0.2.bb
index 35c37e8bcb..ff85a33ec0 100644
--- a/packages/gpe-package/gpe-package_0.2.bb
+++ b/packages/gpe-package/gpe-package_0.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 inherit gpe pkgconfig
 
 DESCRIPTION = "A package manager GUI for GPE"
diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb
index 14b9fc5ced..1ee7a9a2ff 100644
--- a/packages/gpe-package/gpe-package_0.3.bb
+++ b/packages/gpe-package/gpe-package_0.3.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 inherit gpe pkgconfig
 
 DESCRIPTION = "A package manager GUI for GPE"
diff --git a/packages/gpe-package/gpe-package_0.4.bb b/packages/gpe-package/gpe-package_0.4.bb
index 2102b3283d..65b4ac138b 100644
--- a/packages/gpe-package/gpe-package_0.4.bb
+++ b/packages/gpe-package/gpe-package_0.4.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 inherit gpe pkgconfig
 
 DESCRIPTION = "A package manager GUI for GPE"
diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb
index a78706b0ee..8e90d2f06b 100644
--- a/packages/gpe-plucker/gpe-plucker_0.4.bb
+++ b/packages/gpe-plucker/gpe-plucker_0.4.bb
@@ -10,5 +10,5 @@ SRC_URI += " file://plucker-no-host-includes.patch;patch=1"
 PARALLEL_MAKE=""
 EXTRA_OEMAKE="RANLIB=${RANLIB}"
 
-FILE_PR = "r2"
+PR = "r2"
 
diff --git a/packages/gpe-scap/gpe-scap_1.2.bb b/packages/gpe-scap/gpe-scap_1.2.bb
index a08315a045..1fc8f9a57a 100644
--- a/packages/gpe-scap/gpe-scap_1.2.bb
+++ b/packages/gpe-scap/gpe-scap_1.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "gpe"
-FILE_PR = "r1"
+PR = "r1"
 
 RREPLACES = "gpe-screenshot"
 
diff --git a/packages/gpe-scap/gpe-scap_1.3.bb b/packages/gpe-scap/gpe-scap_1.3.bb
index dfb3882d94..c2eb2acbaf 100644
--- a/packages/gpe-scap/gpe-scap_1.3.bb
+++ b/packages/gpe-scap/gpe-scap_1.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "gpe"
-FILE_PR = "r2"
+PR = "r2"
 
 RREPLACES = "gpe-screenshot"
 
diff --git a/packages/gpe-scap/gpe-scap_svn.bb b/packages/gpe-scap/gpe-scap_svn.bb
index 409b8144de..3360189422 100644
--- a/packages/gpe-scap/gpe-scap_svn.bb
+++ b/packages/gpe-scap/gpe-scap_svn.bb
@@ -1,7 +1,7 @@
 DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup"
 RREPLACES = "gpe-screenshot"
 PV = "1.2+svn-${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools 
 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 621b897cc5..bab26e7df0 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-FILE_PR = "r11"
+PR = "r11"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb
index e94b415635..5daf39c836 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-FILE_PR = "r0"
+PR = "r0"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gpe-snes/gpe-snes_0.2.bb b/packages/gpe-snes/gpe-snes_0.2.bb
index 693f174a54..6d647cf160 100644
--- a/packages/gpe-snes/gpe-snes_0.2.bb
+++ b/packages/gpe-snes/gpe-snes_0.2.bb
@@ -6,6 +6,6 @@ DEPENDS = "gtk+ libgpewidget libxrandr"
 
 inherit autotools
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.telefonica.net/web2/mteirap/gpe-snes-${PV}.tar.gz"
diff --git a/packages/gpe-su/gpe-su_0.11.bb b/packages/gpe-su/gpe-su_0.11.bb
index 4fb9550945..c13aa877e3 100644
--- a/packages/gpe-su/gpe-su_0.11.bb
+++ b/packages/gpe-su/gpe-su_0.11.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-su/gpe-su_0.14.bb b/packages/gpe-su/gpe-su_0.14.bb
index 4fb9550945..c13aa877e3 100644
--- a/packages/gpe-su/gpe-su_0.14.bb
+++ b/packages/gpe-su/gpe-su_0.14.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-su/gpe-su_0.15.bb b/packages/gpe-su/gpe-su_0.15.bb
index 4fb9550945..c13aa877e3 100644
--- a/packages/gpe-su/gpe-su_0.15.bb
+++ b/packages/gpe-su/gpe-su_0.15.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-su/gpe-su_0.18.bb b/packages/gpe-su/gpe-su_0.18.bb
index 4fb9550945..c13aa877e3 100644
--- a/packages/gpe-su/gpe-su_0.18.bb
+++ b/packages/gpe-su/gpe-su_0.18.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-su/gpe-su_0.19.bb b/packages/gpe-su/gpe-su_0.19.bb
index 4fb9550945..c13aa877e3 100644
--- a/packages/gpe-su/gpe-su_0.19.bb
+++ b/packages/gpe-su/gpe-su_0.19.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-su/gpe-su_0.20.bb b/packages/gpe-su/gpe-su_0.20.bb
index e71b961c2d..84ef6eb5ae 100644
--- a/packages/gpe-su/gpe-su_0.20.bb
+++ b/packages/gpe-su/gpe-su_0.20.bb
@@ -1,3 +1,3 @@
 require gpe-su.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpe-su/gpe-su_svn.bb b/packages/gpe-su/gpe-su_svn.bb
index b496e12d95..73d36855e9 100644
--- a/packages/gpe-su/gpe-su_svn.bb
+++ b/packages/gpe-su/gpe-su_svn.bb
@@ -1,6 +1,6 @@
 require gpe-su.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN} \
            file://svn-build.patch;patch=1"
diff --git a/packages/gpe-terminal/gpe-terminal_1.1.bb b/packages/gpe-terminal/gpe-terminal_1.1.bb
index ef0bea9f09..3d89e355e9 100644
--- a/packages/gpe-terminal/gpe-terminal_1.1.bb
+++ b/packages/gpe-terminal/gpe-terminal_1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE terminal wrapper"
 SECTION = "gpe"
 LICENSE = "GPL"
 RRECOMMENDS = "rxvt-unicode"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://${PN}.desktop file://${PN}.png"
 
diff --git a/packages/gpe-terminal/gpe-terminal_svn.bb b/packages/gpe-terminal/gpe-terminal_svn.bb
index 67b9b71eeb..875c675b2c 100644
--- a/packages/gpe-terminal/gpe-terminal_svn.bb
+++ b/packages/gpe-terminal/gpe-terminal_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPE terminal wrapper"
 SECTION = "gpe"
 LICENSE = "GPL"
 RRECOMMENDS = "rxvt-unicode"
-FILE_PR = "r1"
+PR = "r1"
 PV = "1.1+svn-${SRCDATE}" 
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index 139529fb02..da61845f4d 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 #it doesn't really depends on it, but it's nice to make OE build it
 DEPENDS = "gtk-engines"
diff --git a/packages/gpe-themes/gpe-theme-e17_0.1.bb b/packages/gpe-themes/gpe-theme-e17_0.1.bb
index 4711ed648d..a6d36a5ac0 100644
--- a/packages/gpe-themes/gpe-theme-e17_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
 LICENSE = 	"MIT + GPL"
-FILE_PR =		"r0"
+PR =		"r0"
 
 #it doesn't really depends on it, but it's nice to make OE build it
 RDEPENDS =		"gtk+"
diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
index 56dd27bec5..c2b829ab74 100644
--- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
@@ -1,7 +1,7 @@
 inherit gpe
 
 LICENSE = 		"gpe-theme-foxbox"
-FILE_PR = 			"r2"
+PR = 			"r2"
 SECTION = 		"x11/base"
 DESCRIPTION = 	"Simple GPE theme using the Smooth theming engine."
 DEPENDS = 		"gtk-engines"
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
index ce6618973f..c0322948e4 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =	"GTK+ industrial theme adjusted for GPE"
 LICENSE = 	"GPL"
-FILE_PR =		"r0"
+PR =		"r0"
 
 #it doesn't really depends on it, but it's nice to make OE build it
 DEPENDS =		"gtk-engines"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
index ae5c968ad9..c642bfacb5 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.30.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
@@ -1,3 +1,3 @@
 require gpe-timesheet.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
index ae5c968ad9..c642bfacb5 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.31.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
@@ -1,3 +1,3 @@
 require gpe-timesheet.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.32.bb b/packages/gpe-timesheet/gpe-timesheet_0.32.bb
index 420ed39637..9a3b61106c 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.32.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.32.bb
@@ -1,3 +1,3 @@
 require gpe-timesheet.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpe-timesheet/gpe-timesheet_svn.bb b/packages/gpe-timesheet/gpe-timesheet_svn.bb
index ce9b1d1467..28eb65d31b 100644
--- a/packages/gpe-timesheet/gpe-timesheet_svn.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_svn.bb
@@ -1,6 +1,6 @@
 require gpe-timesheet.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PV = "0.31+svn-${SRCDATE}"
 
 SRC_URI = "${GPE_SVN}"
diff --git a/packages/gpe-today/gpe-today_svn.bb b/packages/gpe-today/gpe-today_svn.bb
index ee098e698d..329e2271ea 100644
--- a/packages/gpe-today/gpe-today_svn.bb
+++ b/packages/gpe-today/gpe-today_svn.bb
@@ -2,7 +2,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
 PV = "0.11+svn-${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe
 
diff --git a/packages/gpe-todo/gpe-todo_0.51.bb b/packages/gpe-todo/gpe-todo_0.51.bb
index 4e1e81b107..639a98cc9d 100644
--- a/packages/gpe-todo/gpe-todo_0.51.bb
+++ b/packages/gpe-todo/gpe-todo_0.51.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "GPE to-do list"
 DEPENDS = "gtk+ libdisplaymigration libgpewidget libgpepimc libtododb"
 SECTION = "gpe"
 PRIORITY = "optional"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI += "file://remove-render.patch;patch=1"
 
diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb
index 0e9d4647d7..624f2e365e 100644
--- a/packages/gpe-what/gpe-what_0.43.bb
+++ b/packages/gpe-what/gpe-what_0.43.bb
@@ -1,5 +1,5 @@
 require gpe-what.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += " file://set-wm-hint.patch;patch=1;pnum=0"
diff --git a/packages/gpe-windowlist/gpe-windowlist_0.1.bb b/packages/gpe-windowlist/gpe-windowlist_0.1.bb
index 2cb6a056db..e90e4e95e9 100644
--- a/packages/gpe-windowlist/gpe-windowlist_0.1.bb
+++ b/packages/gpe-windowlist/gpe-windowlist_0.1.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
 DESCRIPTION = "GPE windowlist applet"
 LICENSE = "GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/gpe-windowlist/gpe-windowlist_svn.bb b/packages/gpe-windowlist/gpe-windowlist_svn.bb
index eec5d7c8bb..2f9d18111e 100644
--- a/packages/gpe-windowlist/gpe-windowlist_svn.bb
+++ b/packages/gpe-windowlist/gpe-windowlist_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget libgpelaunch gtk+"
 PV = "0.1+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools 
 
diff --git a/packages/gpephone/almmgrd_svn.bb b/packages/gpephone/almmgrd_svn.bb
index 5b8234a2e2..70d02ff018 100644
--- a/packages/gpephone/almmgrd_svn.bb
+++ b/packages/gpephone/almmgrd_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb
index 90cbc3526c..4b943f4a6d 100644
--- a/packages/gpephone/cms92init_0.1.bb
+++ b/packages/gpephone/cms92init_0.1.bb
@@ -3,7 +3,7 @@ LICENSE  = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
 DEPENDS  = "glibc"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone
 
diff --git a/packages/gpephone/connect_0.1.bb b/packages/gpephone/connect_0.1.bb
index 07251586ac..a3171eef97 100644
--- a/packages/gpephone/connect_0.1.bb
+++ b/packages/gpephone/connect_0.1.bb
@@ -3,7 +3,7 @@ LICENSE  = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
 DEPENDS  = "glibc"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone
 
diff --git a/packages/gpephone/contact_svn.bb b/packages/gpephone/contact_svn.bb
index 0fdf553943..ef4d2707ab 100644
--- a/packages/gpephone/contact_svn.bb
+++ b/packages/gpephone/contact_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone autotools
 
diff --git a/packages/gpephone/dialer_svn.bb b/packages/gpephone/dialer_svn.bb
index 5e90985fa8..7b1b883652 100644
--- a/packages/gpephone/dialer_svn.bb
+++ b/packages/gpephone/dialer_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone libgemwidget"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone autotools
 
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 50b699deff..62bd5a649b 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
 	   file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-FILE_PR = "r10"
+PR = "r10"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
diff --git a/packages/gpephone/libabenabler2_svn.bb b/packages/gpephone/libabenabler2_svn.bb
index 9a0fabff06..004ba3ec46 100644
--- a/packages/gpephone/libabenabler2_svn.bb
+++ b/packages/gpephone/libabenabler2_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/libalmmgr_svn.bb b/packages/gpephone/libalmmgr_svn.bb
index 3738f5ef1d..cbae037109 100644
--- a/packages/gpephone/libalmmgr_svn.bb
+++ b/packages/gpephone/libalmmgr_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 libiac"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/libcalenabler2_svn.bb b/packages/gpephone/libcalenabler2_svn.bb
index 8c7a913301..e3bf129ab1 100644
--- a/packages/gpephone/libcalenabler2_svn.bb
+++ b/packages/gpephone/libcalenabler2_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 sqlite3 libical libalmmgr"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 
 inherit gpephone pkgconfig autotools
diff --git a/packages/gpephone/libiac2_svn.bb b/packages/gpephone/libiac2_svn.bb
index 72f22ce411..7ae0c7b693 100644
--- a/packages/gpephone/libiac2_svn.bb
+++ b/packages/gpephone/libiac2_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ gtk-doc dbus-glib"
 PV = "0.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/libiac_svn.bb b/packages/gpephone/libiac_svn.bb
index 9baea37e3d..0cd1d6487d 100644
--- a/packages/gpephone/libiac_svn.bb
+++ b/packages/gpephone/libiac_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ gtk-doc"
 PV = "1.0+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index 5e512957de..631c2d7933 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "SIP-based IP phone"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
 LICENSE = "GPLv2"
 DEPENDS = "libosip2 speex libogg alsa-lib readline"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \
            file://linphone-1.5.0.patch;patch=1 \
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
index 91509b46d3..0c5ccfff51 100644
--- a/packages/gpephone/machined_svn.bb
+++ b/packages/gpephone/machined_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus-glib gtk+"
 PV = "0.1+svnr-${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/ptim-engine_1.0.bb b/packages/gpephone/ptim-engine_1.0.bb
index 9a107365d9..e1cd76ae30 100644
--- a/packages/gpephone/ptim-engine_1.0.bb
+++ b/packages/gpephone/ptim-engine_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index e43aeaf053..281ee72c26 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svnr-${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/ptim-helper_1.0.bb b/packages/gpephone/ptim-helper_1.0.bb
index e38c3a5982..4d5609e6a2 100644
--- a/packages/gpephone/ptim-helper_1.0.bb
+++ b/packages/gpephone/ptim-helper_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 7c055e7991..71b004e92b 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svnr-${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/ptim-manager_1.0.bb b/packages/gpephone/ptim-manager_1.0.bb
index 8134e0e35d..c0955a2176 100644
--- a/packages/gpephone/ptim-manager_1.0.bb
+++ b/packages/gpephone/ptim-manager_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
index 619619e56a..da0f4e6af4 100644
--- a/packages/gpephone/ptim-manager_svn.bb
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
 PV = "0.1+svnr-${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/xoo-vm_0.7-20070204.bb b/packages/gpephone/xoo-vm_0.7-20070204.bb
index 02608526e0..0bdda47359 100644
--- a/packages/gpephone/xoo-vm_0.7-20070204.bb
+++ b/packages/gpephone/xoo-vm_0.7-20070204.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
 SRCDATE = 20070204
 PV = "0.7+svn${SRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
            file://gpephone-vm.patch;patch=1;pnum=0"
diff --git a/packages/gpesyncd/gpe-synctool_svn.bb b/packages/gpesyncd/gpe-synctool_svn.bb
index 2d43c66d95..e85013c117 100644
--- a/packages/gpesyncd/gpe-synctool_svn.bb
+++ b/packages/gpesyncd/gpe-synctool_svn.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ glib-2.0 libgpewidget"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.2+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
 
diff --git a/packages/gpesyncd/gpesyncd_2.0.bb b/packages/gpesyncd/gpesyncd_2.0.bb
index 179803bd7d..69e0a677ec 100644
--- a/packages/gpesyncd/gpesyncd_2.0.bb
+++ b/packages/gpesyncd/gpesyncd_2.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION =	"Sync daemon for GPE and OpenSync"
 
 DEPENDS =	"libgpevtype libtododb libcontactsdb libeventdb sqlite libmimedir glib-2.0"
 
-FILE_PR =		"r0"
+PR =		"r0"
 
 GPE_TARBALL_SUFFIX="bz2"
 inherit autotools gpe
diff --git a/packages/gpesyncd/gpesyncd_svn.bb b/packages/gpesyncd/gpesyncd_svn.bb
index 02a48ad71a..c7adad7340 100644
--- a/packages/gpesyncd/gpesyncd_svn.bb
+++ b/packages/gpesyncd/gpesyncd_svn.bb
@@ -7,7 +7,7 @@ DEPENDS =	"libgpevtype libtododb libcontactsdb libeventdb sqlite libmimedir glib
 
 S =		"${WORKDIR}/${PN}"
 PV =		"0.0+svn${SRCDATE}"
-FILE_PR =		"r0"
+PR =		"r0"
 
 inherit autotools
 
diff --git a/packages/gpgme/gpgme_1.0.0.bb b/packages/gpgme/gpgme_1.0.0.bb
index fd12979b3d..2b8b07c90e 100644
--- a/packages/gpgme/gpgme_1.0.0.bb
+++ b/packages/gpgme/gpgme_1.0.0.bb
@@ -1,3 +1,3 @@
 require gpgme.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb
index fd12979b3d..2b8b07c90e 100644
--- a/packages/gpgme/gpgme_1.0.3.bb
+++ b/packages/gpgme/gpgme_1.0.3.bb
@@ -1,3 +1,3 @@
 require gpgme.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/gpgme/gpgme_1.1.4.bb b/packages/gpgme/gpgme_1.1.4.bb
index d163ad75a4..7ab54ec5d7 100644
--- a/packages/gpgme/gpgme_1.1.4.bb
+++ b/packages/gpgme/gpgme_1.1.4.bb
@@ -1,3 +1,3 @@
 require gpgme.inc
 
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb
index 6d7400fef7..80d0ee0f27 100644
--- a/packages/gphoto2/gphoto2_2.1.4.bb
+++ b/packages/gphoto2/gphoto2_2.1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
 
diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb
index 631e79e7c9..0913b9743c 100644
--- a/packages/gphoto2/gphoto2_2.1.5.bb
+++ b/packages/gphoto2/gphoto2_2.1.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb
index eb1e544256..63dad91f14 100644
--- a/packages/gphoto2/gphoto2_2.1.6.bb
+++ b/packages/gphoto2/gphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libgphoto2 popt"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb
index ffe95f5c03..996edb25a0 100644
--- a/packages/gphoto2/gphoto2_2.4.0.bb
+++ b/packages/gphoto2/gphoto2_2.4.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libtool libgphoto2 popt"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
 
diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb
index ffe95f5c03..996edb25a0 100644
--- a/packages/gphoto2/gphoto2_2.4.2.bb
+++ b/packages/gphoto2/gphoto2_2.4.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "libtool libgphoto2 popt"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
 
diff --git a/packages/gphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb
index 7ecabbc5a1..67efc38785 100644
--- a/packages/gphoto2/libgphoto2_2.1.5.bb
+++ b/packages/gphoto2/libgphoto2_2.1.5.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
diff --git a/packages/gphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb
index ce5787fafa..ad57ba8cf1 100644
--- a/packages/gphoto2/libgphoto2_2.1.6.bb
+++ b/packages/gphoto2/libgphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
diff --git a/packages/gphoto2/libgphoto2_2.4.2.bb b/packages/gphoto2/libgphoto2_2.4.2.bb
index ff38d39ac0..991f3ec759 100644
--- a/packages/gphoto2/libgphoto2_2.4.2.bb
+++ b/packages/gphoto2/libgphoto2_2.4.2.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "libtool jpeg libusb libexif"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
 
diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb
index 24888099b7..5b278b7cee 100644
--- a/packages/gpm/gpm_1.20.1.bb
+++ b/packages/gpm/gpm_1.20.1.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 
-FILE_PR = "r3"
+PR = "r3"
 PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
diff --git a/packages/gpsbabel/gpsbabel_1.2.5.bb b/packages/gpsbabel/gpsbabel_1.2.5.bb
index 01281b1ff1..987b000f10 100644
--- a/packages/gpsbabel/gpsbabel_1.2.5.bb
+++ b/packages/gpsbabel/gpsbabel_1.2.5.bb
@@ -4,7 +4,7 @@ DEPENDS = "expat libusb"
 HOMEPAGE = "http://gpsbabel.sf.net"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
 
diff --git a/packages/gpsbabel/gpsbabel_1.3.5.bb b/packages/gpsbabel/gpsbabel_1.3.5.bb
index c1baa394ce..c46b9df81d 100644
--- a/packages/gpsbabel/gpsbabel_1.3.5.bb
+++ b/packages/gpsbabel/gpsbabel_1.3.5.bb
@@ -4,7 +4,7 @@ DEPENDS = "expat libusb-compat"
 HOMEPAGE = "http://gpsbabel.sf.net"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.gpsbabel.org/plan9.php?dl=gpsbabel-${PV}.tar.gz"
 
diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb
index 0dd0b864cd..d5a02e27b4 100644
--- a/packages/gpsd/gpsd_2.28.bb
+++ b/packages/gpsd/gpsd_2.28.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-FILE_PR = "r9"
+PR = "r9"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index a211446f57..8e46cb01eb 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,4 +1,4 @@
 require gpsd.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb
index 422acfb1b9..b3cc2f1f19 100644
--- a/packages/gpsd/gpsd_2.36.bb
+++ b/packages/gpsd/gpsd_2.36.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-FILE_PR = "r4"
+PR = "r4"
diff --git a/packages/gpsd/gpsd_2.37.bb b/packages/gpsd/gpsd_2.37.bb
index 01d8454d5b..58e9ebeee2 100644
--- a/packages/gpsd/gpsd_2.37.bb
+++ b/packages/gpsd/gpsd_2.37.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
index 7e2411806c..e79240e392 100644
--- a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
@@ -1,6 +1,6 @@
 require gpsdrive.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 DESCRIPTION = "GPS navigation/map display software, PDA-optimized version"
 HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/"
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index b901320bf3..4d6abf9a85 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -1,6 +1,6 @@
 require gpsdrive.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive.desktop"
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
index 4a612d57ae..102a917c1f 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -3,7 +3,7 @@ require gpsdrive.inc
 DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
 RDEPENDS_${PN} += "libwww-perl"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
diff --git a/packages/gpstk/gpstk_1.2.bb b/packages/gpstk/gpstk_1.2.bb
index a31e7660b5..64ed3e025f 100644
--- a/packages/gpstk/gpstk_1.2.bb
+++ b/packages/gpstk/gpstk_1.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gpstk.org/"
 LICENSE = "LGPL"
 SECTION = "libs"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/gputty/gputty_0.9.8.bb b/packages/gputty/gputty_0.9.8.bb
index 2fcbfe8175..5e1ed06357 100644
--- a/packages/gputty/gputty_0.9.8.bb
+++ b/packages/gputty/gputty_0.9.8.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "GPuTTY is a PuTTY clone using the Gnome environment"
 HOMEPAGE = "http://www.defora.org/index.php?page=gputty"
 LICENSE = "GPL"
 SECTION = "network"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://people.defora.org/~khorben/projects/gputty/gputty-${PV}.tar.gz \
            file://gputty"
diff --git a/packages/gqview/gqview_2.1.5.bb b/packages/gqview/gqview_2.1.5.bb
index 2460020232..60f74c4b4e 100644
--- a/packages/gqview/gqview_2.1.5.bb
+++ b/packages/gqview/gqview_2.1.5.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+"
 LICENSE = "GPL"
 HOMEPAGE = "http://gqview.sourceforge.net/"
 RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.5.tar.gz \
 	   file://include-path-fix.patch;patch=1"
diff --git a/packages/granule/libassa_3.4.2.bb b/packages/granule/libassa_3.4.2.bb
index 843eb18415..0598a6f5c2 100644
--- a/packages/granule/libassa_3.4.2.bb
+++ b/packages/granule/libassa_3.4.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://libassa.sf.net"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-2.tar.gz"
diff --git a/packages/grdesktop/grdesktop_0.23.bb b/packages/grdesktop/grdesktop_0.23.bb
index 66981c5f35..e0f19f0197 100644
--- a/packages/grdesktop/grdesktop_0.23.bb
+++ b/packages/grdesktop/grdesktop_0.23.bb
@@ -10,7 +10,7 @@ DEPENDS = "gtk+ libgnomeui"
 RDEPENDS ="rdesktop gail orbit2 gnome-vfs gnome-keyring libbonobo libbonoboui \ 
             libart-lgpl libgnome libidl libglade libgnomecanvas "
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \
            file://fr.po.patch;patch=1 \
diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb
index 0dc70af999..6d184b8c4c 100644
--- a/packages/grep/grep_2.5.1.bb
+++ b/packages/grep/grep_2.5.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "grep GNU utility"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
            file://uclibc-fix.patch;patch=1"
diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb
index 538610b434..42b0d80d15 100644
--- a/packages/groff/groff_1.19.1.bb
+++ b/packages/groff/groff_1.19.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU roff"
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
 	           file://groff.patch;patch=1"
diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb
index 4c7503197f..62f56a8c27 100644
--- a/packages/groff/groff_1.19.2.bb
+++ b/packages/groff/groff_1.19.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU roff"
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
 	           file://Makefile.in.patch;patch=1 \
diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb
index 78e2f8e84a..67fca242d4 100644
--- a/packages/grub/grub_0.97.bb
+++ b/packages/grub/grub_0.97.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/grub"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 RDEPENDS = "diffutils"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
            file://automake-1.10.patch;patch=1"
diff --git a/packages/gs/gs_8.16.bb b/packages/gs/gs_8.16.bb
index f91303732c..cf1e8ba411 100644
--- a/packages/gs/gs_8.16.bb
+++ b/packages/gs/gs_8.16.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "console/utils"
 HOMEPAGE = "http://www.gnu.org/software/ghostscript/ghostscript.html"
 DEPENDS = "jpeg zlib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/ghostscript/gnu-ghostscript-${PV}.tar.gz"
 S = "${WORKDIR}/gnu-ghostscript-${PV}"
diff --git a/packages/gsl/gsl_1.10.bb b/packages/gsl/gsl_1.10.bb
index 4a9bae189e..bd941bc7ae 100644
--- a/packages/gsl/gsl_1.10.bb
+++ b/packages/gsl/gsl_1.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gsl/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz"
 
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index b83934fdb8..4ce23d51f5 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,7 +5,7 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r44"
+PR = "r44"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
diff --git a/packages/gsm/pty_0.0.bb b/packages/gsm/pty_0.0.bb
index 39d22a960c..ab767f7979 100644
--- a/packages/gsm/pty_0.0.bb
+++ b/packages/gsm/pty_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Forwards a socket to a tty"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://pty.c"
 
diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb
index 274453f17b..206208d329 100644
--- a/packages/gsoap/gsoap-native_2.7.7.bb
+++ b/packages/gsoap/gsoap-native_2.7.7.bb
@@ -1,7 +1,7 @@
 require gsoap_${PV}.bb
 
 DEPENDS = ""
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://use-just-built-binary.patch;patch=1"
 
diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb
index 9e97fd1009..dc6ff6e320 100644
--- a/packages/gsoap/gsoap_2.7.7.bb
+++ b/packages/gsoap/gsoap_2.7.7.bb
@@ -3,7 +3,7 @@ for the development of SOAP Web Services and clients."
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "gsoap-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz"
 S = "${WORKDIR}/gsoap-2.7"
diff --git a/packages/gspcav1/gspcav1_20070110.bb b/packages/gspcav1/gspcav1_20070110.bb
index 235dc0b6f1..40a99d9bd9 100644
--- a/packages/gspcav1/gspcav1_20070110.bb
+++ b/packages/gspcav1/gspcav1_20070110.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 RRECOMMENDS = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common"
 
diff --git a/packages/gspcav1/gspcav1_20070508.bb b/packages/gspcav1/gspcav1_20070508.bb
index 1811fee9c1..866d32b86a 100644
--- a/packages/gspcav1/gspcav1_20070508.bb
+++ b/packages/gspcav1/gspcav1_20070508.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 RRECOMMENDS = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common"
 
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
index 9c9bad6aae..d41a013cba 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "gstreamer gst-plugins-base zlib"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index ce40fb257f..c7a2d2e433 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
-FILE_PR = "r7"
+PR = "r7"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index d3af063129..0fa5794d0a 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "Gstreamer package groups"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-FILE_PR = "r11"
+PR = "r11"
 
 PACKAGES = "${PN}-dbg \
     gst-meta-base \
diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
index 2e00786e18..cfa200ef3d 100644
--- a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
+++ b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
 HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
 LICENSE = "GPL"
 DEPENDS = "gstreamer pulseaudio gst-plugins-base"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \
 	file://dont-overload-pulseaudio.patch;patch=1"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.17.bb b/packages/gstreamer/gst-plugins-base_0.10.17.bb
index 1c634a748a..56c9bfab04 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.17.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.17.bb
@@ -8,5 +8,5 @@ PROVIDES += "gst-plugins"
 # a missing alsa plugin
 DEPENDS += "alsa-lib libsm"
 
-FILE_PR = "r3"
+PR = "r3"
 
diff --git a/packages/gstreamer/gst-plugins-good_0.10.7.bb b/packages/gstreamer/gst-plugins-good_0.10.7.bb
index 8575f909fb..ac3a5e73c5 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.7.bb
@@ -1,5 +1,5 @@
 require gst-plugins.inc
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gconf 
 
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
index 8b6c5da7e7..fd008b065a 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
@@ -1,5 +1,5 @@
 require gst-plugins.inc
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
diff --git a/packages/gstreamer/gstreamer_0.10.17.bb b/packages/gstreamer/gstreamer_0.10.17.bb
index e9904f2676..51a1426564 100644
--- a/packages/gstreamer/gstreamer_0.10.17.bb
+++ b/packages/gstreamer/gstreamer_0.10.17.bb
@@ -1,6 +1,6 @@
 require gstreamer.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://po-makefile-fix.patch;patch=1"
 
diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb
index 8b6f335af9..7d3e7dc92a 100644
--- a/packages/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "libpng gettext glib-2.0"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index aa9ba641d5..dfe0fbd979 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
            file://timezone-fix.patch;patch=1 \
diff --git a/packages/gtk+/gtk+-fastscaling_2.10.14.bb b/packages/gtk+/gtk+-fastscaling_2.10.14.bb
index 0a743e6a63..cb79d66301 100644
--- a/packages/gtk+/gtk+-fastscaling_2.10.14.bb
+++ b/packages/gtk+/gtk+-fastscaling_2.10.14.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 
 PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
 
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index e51fa52aa1..f5ad1a58ab 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
 
-FILE_PR = "r1"
+PR = "r1"
 
 FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index ace0019d4e..c9b98a1897 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 3d3b66b730..3d4dcde40f 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.11.bb b/packages/gtk+/gtk+_2.12.11.bb
index e4716c04d7..d246eb8de9 100644
--- a/packages/gtk+/gtk+_2.12.11.bb
+++ b/packages/gtk+/gtk+_2.12.11.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb
index 5b84c884b4..642154b207 100644
--- a/packages/gtk+/gtk+_2.12.3.bb
+++ b/packages/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.14.1.bb b/packages/gtk+/gtk+_2.14.1.bb
index a1abbc196c..627a1750c0 100644
--- a/packages/gtk+/gtk+_2.14.1.bb
+++ b/packages/gtk+/gtk+_2.14.1.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "cairo jasper"
 
diff --git a/packages/gtk+/gtk+_2.14.2.bb b/packages/gtk+/gtk+_2.14.2.bb
index a8233a240a..b0002b8102 100644
--- a/packages/gtk+/gtk+_2.14.2.bb
+++ b/packages/gtk+/gtk+_2.14.2.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "cairo jasper"
 
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index 6f8d383e79..cab18db85c 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb
index 7bd2ca5784..fd25122d5c 100644
--- a/packages/gtk+/gtk+_2.8.16.bb
+++ b/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-FILE_PR = "r5"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index 121bd62975..91b6b3dce9 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/pixops-test.bb b/packages/gtk+/pixops-test.bb
index 8b4b3ee80d..79bc33a04f 100644
--- a/packages/gtk+/pixops-test.bb
+++ b/packages/gtk+/pixops-test.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Productive gtk+ devel prodder"
 DEPENDS = "gtk+"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit pkgconfig
 
diff --git a/packages/gtk-doc/gtk-doc.bb b/packages/gtk-doc/gtk-doc.bb
index 57185bef83..f0dbdd0bae 100644
--- a/packages/gtk-doc/gtk-doc.bb
+++ b/packages/gtk-doc/gtk-doc.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/base"
 SRC_URI = "file://gtk-doc.m4"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 ALLOW_EMPTY_${PN} = "1"
 
diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
index 77d4cae847..1b009b5380 100644
--- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
+++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -2,7 +2,7 @@ SECTION = "x11/base"
 DESCRIPTION = "Clearlooks theme engine for GTK"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clearlooks/clearlooks-0.6.2.tar.bz2"
 
diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb
index 657ae124a4..0dc9a95ecc 100644
--- a/packages/gtk-engines/gtk-engines_2.6.5.bb
+++ b/packages/gtk-engines/gtk-engines_2.6.5.bb
@@ -3,7 +3,7 @@ SECTION = "x11/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-FILE_PR = "r1"
+PR = "r1"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
 RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
diff --git a/packages/gtk-engines/gtk-sato-engine_0.3.1.bb b/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
index 72eb5e680b..2b12d2d9e8 100644
--- a/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
+++ b/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
@@ -1,6 +1,6 @@
 require gtk-sato-engine.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-${PV}.tar.gz"
 S = "${WORKDIR}/sato-engine-${PV}"
diff --git a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
index 4528e36045..28888c45ba 100644
--- a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
+++ b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
@@ -3,7 +3,7 @@ SECTION = "x11/base"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/smooth-engine/${PN}-${PV}.tar.gz"
 
diff --git a/packages/gtk-sharp/gtk-sharp_2.10.2.bb b/packages/gtk-sharp/gtk-sharp_2.10.2.bb
index 90bf2a7a6e..28b50e13c7 100644
--- a/packages/gtk-sharp/gtk-sharp_2.10.2.bb
+++ b/packages/gtk-sharp/gtk-sharp_2.10.2.bb
@@ -1,5 +1,5 @@
 PV = "2.10.2"
-FILE_PR = "r1"
+PR = "r1"
 SDIRVER = "210"
 SEXT = "bz2"
 
diff --git a/packages/gtk-webcore/midori_0.0.18.bb b/packages/gtk-webcore/midori_0.0.18.bb
index 85afb12fe7..bb144f8600 100644
--- a/packages/gtk-webcore/midori_0.0.18.bb
+++ b/packages/gtk-webcore/midori_0.0.18.bb
@@ -1,6 +1,6 @@
 require midori.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://desktop.patch;patch=1"
 
diff --git a/packages/gtk-webcore/osb-browser_20050430.bb b/packages/gtk-webcore/osb-browser_20050430.bb
index 7434b555e2..749698eba5 100644
--- a/packages/gtk-webcore/osb-browser_20050430.bb
+++ b/packages/gtk-webcore/osb-browser_20050430.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb
index 9ec643b749..608b3ec014 100644
--- a/packages/gtk-webcore/osb-browser_20060212.bb
+++ b/packages/gtk-webcore/osb-browser_20060212.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb
index b90509407f..912215cfbd 100644
--- a/packages/gtk-webcore/osb-browser_svn.bb
+++ b/packages/gtk-webcore/osb-browser_svn.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
 PV = "0.5.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb
index 383973220b..434c39fde3 100644
--- a/packages/gtk-webcore/osb-jscore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Gtk+ WebCore - JavaScriptCore"
 HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
 SECTION = "gpe"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-jscore-${PV}.tar.gz \
            file://missing-includes.patch;patch=1 \
diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
index 8ae44cd017..f024bbfa02 100644
--- a/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
            file://libm.patch;patch=1"
diff --git a/packages/gtk-webcore/osb-jscore_20070816.bb b/packages/gtk-webcore/osb-jscore_20070816.bb
index c8493ee5c4..672b0ba0a7 100644
--- a/packages/gtk-webcore/osb-jscore_20070816.bb
+++ b/packages/gtk-webcore/osb-jscore_20070816.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
            file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb
index fb0b063a7f..554ab5b96d 100644
--- a/packages/gtk-webcore/osb-jscore_svn.bb
+++ b/packages/gtk-webcore/osb-jscore_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 
 PV = "0.5.2+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
            file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
diff --git a/packages/gtk-webcore/osb-nrcit_0.5.0.bb b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
index 4ffdc1beca..ca0a845c2a 100644
--- a/packages/gtk-webcore/osb-nrcit_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
 PRIORITY = "optional"
 DEPENDS = "curl osb-nrcore"
 SECTION = "gpe"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcit-${PV}.tar.gz"
 
diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb
index 7d102c6a83..261b52f01b 100644
--- a/packages/gtk-webcore/osb-nrcit_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcit_20050430.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = "curl librsvg osb-nrcore"
 
diff --git a/packages/gtk-webcore/osb-nrcit_20070816.bb b/packages/gtk-webcore/osb-nrcit_20070816.bb
index 2a15d37f9b..3441d1d508 100644
--- a/packages/gtk-webcore/osb-nrcit_20070816.bb
+++ b/packages/gtk-webcore/osb-nrcit_20070816.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "curl librsvg osb-nrcore"
 
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 0008991541..57bb096183 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 SECTION = "gpe"
 
 PV = "0.5.2+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "curl librsvg osb-nrcore pango"
 
diff --git a/packages/gtk-webcore/osb-nrcore_0.5.0.bb b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
index f44feac652..37800f3f78 100644
--- a/packages/gtk-webcore/osb-nrcore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
@@ -1,6 +1,6 @@
 require osb-nrcore.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcore-${PV}.tar.gz \
            file://KWQDictImpl.patch;patch=1"
diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb
index bf8ebdf737..c79f2b9fbd 100644
--- a/packages/gtk-webcore/osb-nrcore_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcore_20050430.bb
@@ -2,7 +2,7 @@ require osb-nrcore.inc
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
 	   file://KWIQ-mimetype-segfault.patch;patch=1 \
diff --git a/packages/gtk-webcore/osb-nrcore_20070816.bb b/packages/gtk-webcore/osb-nrcore_20070816.bb
index 534a095936..1c946d05c6 100644
--- a/packages/gtk-webcore/osb-nrcore_20070816.bb
+++ b/packages/gtk-webcore/osb-nrcore_20070816.bb
@@ -2,7 +2,7 @@ require osb-nrcore.inc
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
            file://KWIQ-mimetype-segfault.patch;patch=1 \
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 95641daa9e..b85c06e422 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -1,7 +1,7 @@
 require osb-nrcore.inc
 
 PV = "0.5.2+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
            file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
diff --git a/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb b/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
index 3c048fe364..54e1284ad2 100644
--- a/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
+++ b/packages/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SRC_URI = "file://gtkrc file://gtkrc-global"
 DEPENDS = "gnome-themes"
 RDEPENDS = "gtk-engine-mist"
-FILE_PR = "r3"
+PR = "r3"
 
 FILES_${PN} += "${datadir}/themes"
 
diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
index 55cf0b2821..f44e8b57a6 100644
--- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz"
 
diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
index 5239fa7671..66993cec74 100644
--- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
 	file://fix-missing-colormap.patch;patch=1"
diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
index 52a80e4018..cb2b8b2acc 100644
--- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
 
 SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
 	file://cross-includedir.patch;patch=1"
-FILE_PR = "r1"
+PR = "r1"
 FILES_${PN} += "${datadir}/gtkhtml-3.6"
 
 do_stage() {
diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index 75e8863156..44a96d6d64 100644
--- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
 require gtkhtml.inc
 
 DEPENDS = "gtk+ gail libgnomeprint orbit2-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
diff --git a/packages/gtkmm/gtkmm_2.12.7.bb b/packages/gtkmm/gtkmm_2.12.7.bb
index 2578057f95..9ef908db63 100644
--- a/packages/gtkmm/gtkmm_2.12.7.bb
+++ b/packages/gtkmm/gtkmm_2.12.7.bb
@@ -1,6 +1,6 @@
 require gtkmm.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 # Hack! Remove once gtkmm likes libtool 2x
 do_configure() {
diff --git a/packages/gtkmm/gtkmm_2.14.1.bb b/packages/gtkmm/gtkmm_2.14.1.bb
index d08092cbbe..e3def49b5b 100644
--- a/packages/gtkmm/gtkmm_2.14.1.bb
+++ b/packages/gtkmm/gtkmm_2.14.1.bb
@@ -2,7 +2,7 @@ require gtkmm.inc
 
 DEPENDS += "pangomm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 # Hack! Remove once gtkmm likes libtool 2x
 do_cconfigure() {
diff --git a/packages/guichan/guichan_0.7.1.bb b/packages/guichan/guichan_0.7.1.bb
index f7a4958335..83a9eca2c5 100644
--- a/packages/guichan/guichan_0.7.1.bb
+++ b/packages/guichan/guichan_0.7.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A portable C++ GUI library designed for games using Allegro, HGE, OpenGL, OpenLayer and/or SDL."
 HOMEPAGE = "http://guichan.sourceforge.net"
 DEPENDS = "virtual/libsdl libsdl-image"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://guichan.googlecode.com/files/${PN}-${PV}.tar.gz \
            file://link-against-sdlimage.patch;patch=1"
diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb
index 168071fe06..62fdedd44a 100644
--- a/packages/guile/guile_1.8.5.bb
+++ b/packages/guile/guile_1.8.5.bb
@@ -5,7 +5,7 @@ SECTION = "devel/scheme"
 DEPENDS = "guile-native gmp"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 "
diff --git a/packages/gutenprint/gutenprint_5.1.3.bb b/packages/gutenprint/gutenprint_5.1.3.bb
index 2114b8ed10..f0e0b734ab 100644
--- a/packages/gutenprint/gutenprint_5.1.3.bb
+++ b/packages/gutenprint/gutenprint_5.1.3.bb
@@ -1,6 +1,6 @@
 require gutenprint.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 ijs ncurses cups tiff jpeg libpng gutenprint-native espgs"
 
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
index 33e40efa70..9648e9ef0c 100644
--- a/packages/gxine/gxine_0.4.1.bb
+++ b/packages/gxine/gxine_0.4.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libxine-x11"
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
index d58f3def66..96776645ab 100644
--- a/packages/gxine/gxine_0.4.1enhanced.bb
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gxine is a front-end for libxine."
 SECTION = "x11/multimedia"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libxine-x11"
-FILE_PR = "r1"
+PR = "r1"
 
 # Long list of RDEPENDS required to playback mp3/ogg audio and mpeg/mpeg4 video
 RDEPENDS = "libxine-plugin-vo-out-xshm \
diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb
index 3f614f85cf..1fcc47e828 100644
--- a/packages/gypsy/gypsy_svn.bb
+++ b/packages/gypsy/gypsy_svn.bb
@@ -6,4 +6,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
 S = "${WORKDIR}/${PN}"
 
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb
index 4ab69d4ed2..a0c49864b4 100644
--- a/packages/gzip/gzip_1.3.5.bb
+++ b/packages/gzip/gzip_1.3.5.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DESCRIPTION = "gzip (GNU zip) is a compression utility designed \
 to be a replacement for 'compress'. The GNU Project uses it as \
 the standard compression program for its system."
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index 171d3fc922..5db3cd058d 100644
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ"
 RRECOMMENDS_${PN} = "kernel-module-mtdblock"
 ALLOW_EMPTY = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "h2200"
 #it is a shell script, but lets protect the innocent some more
diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb
index 6a7cbbaacc..48192a8e7e 100644
--- a/packages/hal/hal-info_git.bb
+++ b/packages/hal/hal-info_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL AFL"
 DEPENDS = "hal"
 
 PV = "${SRCDATE}+git"
-FILE_PR = "r2"
+PR = "r2"
 
 
 SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20070831"
diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb
index 8e92b100bc..8bd193c40a 100644
--- a/packages/hal/hal_0.5.9.1.bb
+++ b/packages/hal/hal_0.5.9.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb-compat"
 RDEPENDS_${PN} += "udev hal-info"
 RRECOMMENDS_${PN} += "udev-utils"
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 \
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index 7b8a0c349a..68ee572f25 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -1,3 +1,3 @@
 require hal.inc
-FILE_PR = "r8"
+PR = "r8"
 
diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb
index f67efc0b7e..49ecfde9ea 100644
--- a/packages/hal/hal_git.bb
+++ b/packages/hal/hal_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://99_hal"
 
 PV = "0.5.9.1+git${SRCDATE}"
-FILE_PR = "r6"
+PR = "r6"
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/handsfree/handsfree_0.1.bb b/packages/handsfree/handsfree_0.1.bb
index cd5b854b3c..bd909a0140 100644
--- a/packages/handsfree/handsfree_0.1.bb
+++ b/packages/handsfree/handsfree_0.1.bb
@@ -4,7 +4,7 @@ SECTION = "network/misc"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS= "bluez-libs alsa-lib"
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "\
diff --git a/packages/haserl/haserl_0.8.0.bb b/packages/haserl/haserl_0.8.0.bb
index 6c9e11cf6e..ba10060c9c 100644
--- a/packages/haserl/haserl_0.8.0.bb
+++ b/packages/haserl/haserl_0.8.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A cgi wrapper for embedding shell scripts into html documents"
 SECTION = "console/network"
 DEPENDS = ""
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
diff --git a/packages/haserl/haserl_0.9.23.bb b/packages/haserl/haserl_0.9.23.bb
index d04bded223..3bc6467d85 100644
--- a/packages/haserl/haserl_0.9.23.bb
+++ b/packages/haserl/haserl_0.9.23.bb
@@ -3,7 +3,7 @@
 DESCRIPTION = "A cgi wrapper for embedding shell scripts into html documents"
 SECTION = "console/network"
 DEPENDS = ""
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb
index cebc080bd0..447c37b01b 100644
--- a/packages/havp/havp_0.82.bb
+++ b/packages/havp/havp_0.82.bb
@@ -1,5 +1,5 @@
 require havp.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI_append += " file://sysconfdir-is-etc.patch;patch=1"
diff --git a/packages/havp/havp_0.86.bb b/packages/havp/havp_0.86.bb
index 8e76826560..c1e392e80f 100644
--- a/packages/havp/havp_0.86.bb
+++ b/packages/havp/havp_0.86.bb
@@ -1,5 +1,5 @@
 require havp.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI_append += " file://reconfigure.patch;patch=1"
diff --git a/packages/helloworld/helloworld_1.0.0.bb b/packages/helloworld/helloworld_1.0.0.bb
index 566ce2488d..af29a7769a 100644
--- a/packages/helloworld/helloworld_1.0.0.bb
+++ b/packages/helloworld/helloworld_1.0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Minimal statically compiled Hello world!"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/${P}"
 
diff --git a/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb
index 0ef2016a91..43037573f4 100644
--- a/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb
+++ b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "HFS plus file system utilities"
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 S="${WORKDIR}/${P}"
 
diff --git a/packages/hfsutils/hfsutils_3.2.6.bb b/packages/hfsutils/hfsutils_3.2.6.bb
index d02cf1fc02..5292ac386c 100644
--- a/packages/hfsutils/hfsutils_3.2.6.bb
+++ b/packages/hfsutils/hfsutils_3.2.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "HFS file system utilities"
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig
 
diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
index 223dc6da9c..f50f8f8a32 100644
--- a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
+++ b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
@@ -2,7 +2,7 @@ SECTION = "unknown"
 LICENSE = "GPL"
 inherit gnome
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
 
diff --git a/packages/horizon/horizon_cvs.bb b/packages/horizon/horizon_cvs.bb
index 071f003320..bfa26b54a1 100644
--- a/packages/horizon/horizon_cvs.bb
+++ b/packages/horizon/horizon_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Horizon is a sketchbook application for tablet devices."
 LICENSE = "GPLv2"
 SECTION = "x11/graphics"
 DEPENDS = "glib-2.0 libpng jpeg virtual/libsdl"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=horizon \
 	file://makefile.patch;patch=1"
diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
index 9d94f933b1..e0909dde3f 100644
--- a/packages/hostap/hostap-conf_1.0.bb
+++ b/packages/hostap/hostap-conf_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "file://hostap_cs.conf \
            file://hostap_cs.modalias \
diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb
index a4f50b9b88..bece7d1450 100644
--- a/packages/hostap/hostap-daemon_0.4.4.bb
+++ b/packages/hostap/hostap-daemon_0.4.4.bb
@@ -1,3 +1,3 @@
 require hostap-daemon.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/hostap/hostap-daemon_0.4.8.bb b/packages/hostap/hostap-daemon_0.4.8.bb
index f06202cbf7..de3abdbea5 100644
--- a/packages/hostap/hostap-daemon_0.4.8.bb
+++ b/packages/hostap/hostap-daemon_0.4.8.bb
@@ -1,5 +1,5 @@
 require hostap-daemon.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/hostap/hostap-daemon_0.5.10.bb b/packages/hostap/hostap-daemon_0.5.10.bb
index 3ee7a6572b..3fc1d8dc11 100644
--- a/packages/hostap/hostap-daemon_0.5.10.bb
+++ b/packages/hostap/hostap-daemon_0.5.10.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
-FILE_PR = "r1"
+PR = "r1"
 
 #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
 MY_ARCH := "${PACKAGE_ARCH}"
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index 939bcdb1a6..f415d31614 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -1,4 +1,4 @@
 require hostap-modules.inc
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb
index 2692f12322..369240cfe4 100644
--- a/packages/hostap/hostap-modules_0.4.7.bb
+++ b/packages/hostap/hostap-modules_0.4.7.bb
@@ -1,4 +1,4 @@
 require hostap-modules.inc
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-utils.inc b/packages/hostap/hostap-utils.inc
index 088bc92630..94cb42010d 100644
--- a/packages/hostap/hostap-utils.inc
+++ b/packages/hostap/hostap-utils.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://hostap.epitest.fi"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
 	   file://hostap-fw-load.patch;patch=1"
diff --git a/packages/hotplug-dbus/hotplug-dbus_0.9.bb b/packages/hotplug-dbus/hotplug-dbus_0.9.bb
index e716db3f1b..60cb39cd51 100644
--- a/packages/hotplug-dbus/hotplug-dbus_0.9.bb
+++ b/packages/hotplug-dbus/hotplug-dbus_0.9.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 SECTION = "base"
 DESCRIPTION = "D-BUS glue for hotplug system"
 # DEPENDS = "dbus hotplug"
diff --git a/packages/hotplug-ng/hotplug-ng_001.bb b/packages/hotplug-ng/hotplug-ng_001.bb
index 7d4aaaabf1..c76c0f06eb 100644
--- a/packages/hotplug-ng/hotplug-ng_001.bb
+++ b/packages/hotplug-ng/hotplug-ng_001.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 RPROVIDES = "hotplug"
 RCONFLICTS = "hotplug"
 RREPLACES = "hotplug"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \
 	   file://flags.patch;patch=1"
diff --git a/packages/hotplug-qcop/hotplug-qcop_cvs.bb b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
index 8f94476c01..5c0d238453 100644
--- a/packages/hotplug-qcop/hotplug-qcop_cvs.bb
+++ b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "HotPlug -> QCOP Event Bridge"
 SECTION = "opie/base"
 RDEPENDS = "opie-qcop hotplug"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/hotplug-qcop"
 S = "${WORKDIR}/hotplug-qcop"
diff --git a/packages/howl/howl_1.0.0.bb b/packages/howl/howl_1.0.0.bb
index cf02c807ff..9acc33018c 100644
--- a/packages/howl/howl_1.0.0.bb
+++ b/packages/howl/howl_1.0.0.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://www.porchdogsoft.com/download/howl-${PV}.tar.gz \
 	file://mdnsresponder.init"
 LICENSE = "howl"
 
-FILE_PR = "r2"
+PR = "r2"
 
 INITSCRIPT_NAME = "mdnsresponder"
 INITSCRIPT_PARAMS = "defaults"
diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
index 9ba32ba847..471be84d29 100644
--- a/packages/hping/hping2_1.9.9+2.0.0rc3.bb
+++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -7,7 +7,7 @@ other features."
 HOMEPAGE = "http://www.hping.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \
 	   file://hping2_debian.patch;patch=1 \
diff --git a/packages/htb-init/htb-init_0.8.5.bb b/packages/htb-init/htb-init_0.8.5.bb
index 0523dcf886..a70da77746 100644
--- a/packages/htb-init/htb-init_0.8.5.bb
+++ b/packages/htb-init/htb-init_0.8.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "HTB.init is a shell script that allows for easy setup of HTB-based traffic control on Linux."
 HOMEPAGE = "http://sourceforge.net/projects/htbinit"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \
 	file://htb.init+ingress+predef+verbose.diff;patch=1;pnum=0 \
diff --git a/packages/htun/htun_0.9.5.bb b/packages/htun/htun_0.9.5.bb
index 7732bd8bae..5495ec5799 100644
--- a/packages/htun/htun_0.9.5.bb
+++ b/packages/htun/htun_0.9.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Http tunnelling daemon"
 SECTION = "network"
 HOMEPAGE = "http://htun.runslinux.net"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://htun.runslinux.net/dist/htun-${PV}.tar.gz"
 S = "${WORKDIR}/htun-${PV}/src"
diff --git a/packages/hugs/hugs_hugs98-Nov2003.bb b/packages/hugs/hugs_hugs98-Nov2003.bb
index 857cf948d7..0269e7c4cb 100644
--- a/packages/hugs/hugs_hugs98-Nov2003.bb
+++ b/packages/hugs/hugs_hugs98-Nov2003.bb
@@ -3,7 +3,7 @@ SRC_URI = "http://cvs.haskell.org/Hugs/downloads/Nov2003/${PV}.tar.gz \
            file://hugs.desktop \
            file://hugs.png"
 LICENSE = "BSD"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/${PV}/src/unix"
 
diff --git a/packages/hwdata/hwdata_0.191.bb b/packages/hwdata/hwdata_0.191.bb
index d7bd607e72..5d607ddc1a 100644
--- a/packages/hwdata/hwdata_0.191.bb
+++ b/packages/hwdata/hwdata_0.191.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "This package contains various hardware identification and configuration data, such as the pci.ids database, or the XFree86/xorg Cards database. It's needed for the kudzu hardware detection."
 LICENSE = "GPL + X11"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191.orig.tar.gz \
            http://archive.ubuntu.com/ubuntu/pool/main/h/hwdata/hwdata_0.191-1.diff.gz;patch=1 \
diff --git a/packages/iana-etc/iana-etc_2.20.bb b/packages/iana-etc/iana-etc_2.20.bb
index d8d9866a9c..6d8c615877 100644
--- a/packages/iana-etc/iana-etc_2.20.bb
+++ b/packages/iana-etc/iana-etc_2.20.bb
@@ -3,7 +3,7 @@ AUTHOR = "Seth W. Klein"
 HOMEPAGE = "http://www.sethwklein.net/projects/iana-etc/"
 SECTION = "base"
 LICENSE = "OPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.sethwklein.net/projects/iana-etc/downloads/${P}.tar.bz2"
 
diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb
index e396573abe..cd8cfe5bde 100644
--- a/packages/icewm/icewm_1.2.30.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
 RRECOMMENDS = "ttf-dejavu-sans"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
diff --git a/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb b/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb
index 5205c1a27c..68d0667670 100644
--- a/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb
+++ b/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 DEPENDS = "libxml-simple-perl-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-0.8.2.tar.gz"
 
diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb
index 3e7940b882..91b25adbe9 100644
--- a/packages/icu/icu_3.6.bb
+++ b/packages/icu/icu_3.6.bb
@@ -1,7 +1,7 @@
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://use-g++-for-linking.patch;patch=1"
 
diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb
index 0b13e9fab8..fa6fc3c5bc 100644
--- a/packages/id3lib/id3lib_3.8.3.bb
+++ b/packages/id3lib/id3lib_3.8.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs/multimedia"
 PRIORITY = "optional"
 DEPENDS = "zlib"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 
diff --git a/packages/ifplugd/ifplugd_0.25.bb b/packages/ifplugd/ifplugd_0.25.bb
index 3a03146d8d..ca7f219165 100644
--- a/packages/ifplugd/ifplugd_0.25.bb
+++ b/packages/ifplugd/ifplugd_0.25.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/"
 SECTION = "network"
 DEPENDS = "libdaemon"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \
  file://kernel-types.patch;patch=1 \
diff --git a/packages/imagemagick/imagemagick_6.3.5-10.bb b/packages/imagemagick/imagemagick_6.3.5-10.bb
index a7fb8f4c5e..7b92a8252e 100644
--- a/packages/imagemagick/imagemagick_6.3.5-10.bb
+++ b/packages/imagemagick/imagemagick_6.3.5-10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "tiff"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
            file://PerlMagic_MakePatch;patch=1 \
diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb
index be4b697031..5dd08f6e23 100644
--- a/packages/images/minimal-gpe-image.bb
+++ b/packages/images/minimal-gpe-image.bb
@@ -6,7 +6,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
 
 export IMAGE_BASENAME = "minimalist-gpe-image"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "task-boot"
 IMAGE_INSTALL = "\
diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
index c126952230..008bd67321 100644
--- a/packages/images/neuros-osd-base-image.bb
+++ b/packages/images/neuros-osd-base-image.bb
@@ -4,7 +4,7 @@ inherit image
 
 export IMAGE_BASENAME = "Neuros-OSD2-base-image"
 
-FILE_PR = "r1"
+PR = "r1"
 
 # Select which Secure Shell Daemon gets included into the rootfs
 DISTRO_SSH_DAEMON ?= "dropbear"
diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb
index 6c5a66c303..9e0f4e6a41 100644
--- a/packages/images/sdr-image.bb
+++ b/packages/images/sdr-image.bb
@@ -5,7 +5,7 @@
 # X demo
 # xorg.conf
 
-FILE_PR = "r3"
+PR = "r3"
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb
index 96b8afb4cf..0622dd0330 100644
--- a/packages/initrdscripts/devimage_0.1.bb
+++ b/packages/initrdscripts/devimage_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-FILE_PR = "r4"
+PR = "r4"
 
 do_install() {
 	install -d ${D}/etc/dropbear
diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb
index d241fcdc80..812e612126 100644
--- a/packages/initrdscripts/initramfs-jffs2_0.1.bb
+++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://jffs2boot.sh"
-FILE_PR = "r3"
+PR = "r3"
 RRECOMMENDS = "kernel-module-mtdblock kernel-module-mtdram"
 
 do_install() {
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
index efbd1d5fb7..b4b2d43150 100644
--- a/packages/initrdscripts/initramfs-module-block_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-block_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://85-blockboot.sh"
-FILE_PR = "r3"
+PR = "r3"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
diff --git a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
index 3e754c32d7..8c4c2f7e93 100644
--- a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://01-bootldr-buster.sh"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr"
 RDEPENDS = "initramfs-uniboot"
 
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 867e857702..5893420742 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-FILE_PR = "r17"
+PR = "r17"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-module-check-modules_1.0.bb b/packages/initrdscripts/initramfs-module-check-modules_1.0.bb
index 6911705664..6986316a6f 100644
--- a/packages/initrdscripts/initramfs-module-check-modules_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-check-modules_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://90-check-modules.sh"
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
 RDEPENDS = "initramfs-uniboot"
 
diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
index f9cba376cd..2c2ec07bf5 100644
--- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://10-initfs.sh"
-FILE_PR = "r4"
+PR = "r4"
 DESCRIPTION = "An initramfs module for initializing filesystems."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
diff --git a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
index 272a9b851f..face73038a 100644
--- a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://87-kexecboot.sh"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
 RDEPENDS = "initramfs-uniboot kexec-static"
 
diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb
index cd33c26f1a..1a2d0a9754 100644
--- a/packages/initrdscripts/initramfs-module-loop_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://80-loopboot.sh"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
                mounting it."
 RDEPENDS = "initramfs-uniboot initramfs-module-initfs"
diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
index 6ec8ac7cab..77c38799f3 100644
--- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://80-nfsboot.sh"
-FILE_PR = "r2"
+PR = "r2"
 DESCRIPTION = "An initramfs module for booting via NFS."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 6c66ba0a52..5a042ab748 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://init.sh"
-FILE_PR = "r9"
+PR = "r9"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 405cd468ed..b1c43174e8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-FILE_PR = "r109"
+PR = "r109"
 
 SRC_URI = "file://functions \
            file://halt \
diff --git a/packages/inotify-tools/inotify-tools_2.1.bb b/packages/inotify-tools/inotify-tools_2.1.bb
index c6704429a9..0808ee964f 100644
--- a/packages/inotify-tools/inotify-tools_2.1.bb
+++ b/packages/inotify-tools/inotify-tools_2.1.bb
@@ -3,7 +3,7 @@ Linux inotify filesystem change notification system."
 LICENSE = "GPL"
 AUTHOR = "Rohan McGovern"
 HOMEPAGE = "http://rohanpm.net/inotify-tools"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://rohanpm.net/files/inotify-tools-2.1.tar.gz"
 
diff --git a/packages/inotify-tools/inotify-tools_3.12.bb b/packages/inotify-tools/inotify-tools_3.12.bb
index 81930391e4..2ec511409e 100644
--- a/packages/inotify-tools/inotify-tools_3.12.bb
+++ b/packages/inotify-tools/inotify-tools_3.12.bb
@@ -3,7 +3,7 @@ Linux inotify filesystem change notification system."
 LICENSE = "GPL"
 AUTHOR = "Rohan McGovern"
 HOMEPAGE = "http://inotify-tools.sourceforge.net/"
-FILE_PR = "r0"
+PR = "r0"
 
 EXTRA_OECONF = "--disable-doxygen"
 
diff --git a/packages/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb
index 1bbaf7ca84..70c027bfe1 100644
--- a/packages/install/install-native_0.1.bb
+++ b/packages/install/install-native_0.1.bb
@@ -5,7 +5,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "MIT"
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://install-sh"
 
diff --git a/packages/intercom/intercom_0.15.bb b/packages/intercom/intercom_0.15.bb
index 54fa5aa332..28764c6411 100644
--- a/packages/intercom/intercom_0.15.bb
+++ b/packages/intercom/intercom_0.15.bb
@@ -6,7 +6,7 @@ DESCRIPTION="A flexible audio communication utility"
 SECTION = "console/telephony"
 LICENSE="GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="ftp://ftp.cm.nu/pub/people/shane/intercom/intercom-${PV}.tar.gz"
 
diff --git a/packages/intltool/intltool-native_0.40.3.bb b/packages/intltool/intltool-native_0.40.3.bb
index d5a2a6d513..b9550cc982 100644
--- a/packages/intltool/intltool-native_0.40.3.bb
+++ b/packages/intltool/intltool-native_0.40.3.bb
@@ -1,6 +1,6 @@
 require intltool_${PV}.bb
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit native
 DEPENDS = "libxml-parser-perl-native"
diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb
index e1cbe0afa6..6dea51a5fc 100644
--- a/packages/intltool/intltool_0.35.0.bb
+++ b/packages/intltool/intltool_0.35.0.bb
@@ -3,6 +3,6 @@ require intltool.inc
 DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS = "libxml-parser-perl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 RRECOMMENDS = "perl-modules"
diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb
index dacda25266..5e2f94eb43 100644
--- a/packages/intltool/intltool_0.35.2.bb
+++ b/packages/intltool/intltool_0.35.2.bb
@@ -3,6 +3,6 @@ require intltool.inc
 DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
 
-FILE_PR = "r1"
+PR = "r1"
 
 RRECOMMENDS = "perl-modules"
diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
index dfd60a5ce4..092689b24b 100644
--- a/packages/intltool/intltool_0.35.5.bb
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -3,7 +3,7 @@ require intltool.inc
 DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
 
-FILE_PR = "r2"
+PR = "r2"
 
 RRECOMMENDS = "perl-modules"
 
diff --git a/packages/intltool/intltool_0.40.3.bb b/packages/intltool/intltool_0.40.3.bb
index 205d51a4d4..b4000dc7c0 100644
--- a/packages/intltool/intltool_0.40.3.bb
+++ b/packages/intltool/intltool_0.40.3.bb
@@ -1,6 +1,6 @@
 require intltool.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'"
 
diff --git a/packages/iotop/iotop_0.2.1.bb b/packages/iotop/iotop_0.2.1.bb
index 008dec4612..5f85f59fe3 100644
--- a/packages/iotop/iotop_0.2.1.bb
+++ b/packages/iotop/iotop_0.2.1.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://guichaz.free.fr/iotop/"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 RDEPENDS = "python-distutils python-curses python-setuptools python-textutils"
 
diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb
index cb23153ce1..216811ab56 100644
--- a/packages/ipaq-boot-params/ipaq-boot-params.bb
+++ b/packages/ipaq-boot-params/ipaq-boot-params.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Kernel boot parameters for HH.org bootldr"
 LICENSE = "MIT"
-FILE_PR = "r5"
+PR = "r5"
 
 COMPATIBLE_MACHINE = "(h3600|h3800|h3900|h5000|simpad)"
 
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index 2807d5d3c7..24d881dd05 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -3,7 +3,7 @@ SECTION = "x11/base"
 LICENSE = "GPL"
 DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
 RDEPENDS = "apm"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit gpe pkgconfig
 
diff --git a/packages/ipatience/ipatience_0.1.bb b/packages/ipatience/ipatience_0.1.bb
index 017820e68b..b223437b19 100644
--- a/packages/ipatience/ipatience_0.1.bb
+++ b/packages/ipatience/ipatience_0.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 xft libxtst libxpm fltk"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "cvs://anoncvs@keithp.com/local/src/CVS;method=pserver;module=ipatience \
           file://fix-make.patch;patch=1"
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
index beb67f66cd..1a5fec48d3 100644
--- a/packages/iperf/iperf_1.7.0.bb
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
 HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
 	file://socketaddr-h-errno.diff;patch=1"
diff --git a/packages/iperf/iperf_2.0.2.bb b/packages/iperf/iperf_2.0.2.bb
index ec3d65f8b3..28d009ad58 100644
--- a/packages/iperf/iperf_2.0.2.bb
+++ b/packages/iperf/iperf_2.0.2.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
 HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf2.0/iperf-${PV}.tar.gz"
 #	file://socketaddr-h-errno.diff;patch=1"
diff --git a/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
index eac414d6a6..35e5ba1086 100644
--- a/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Itsy Package Manager utilities link script"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
 SRCDATE = "20050404"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
 	   file://link-vfat-libs.patch;patch=1"
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 70851970d1..0adb5da265 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-FILE_PR = "r19"
+PR = "r19"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index cc63ee2aa3..40bef907c8 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-FILE_PR = "r21"
+PR = "r21"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index 7488280ad0..3fd55507e2 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = " \
 file://ipkg.conf.comments	\
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index 656e1c3f4a..dd9ff16b65 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}"
 
 #require ipkg_${PV}.bb
 require ipkg-native.inc
-FILE_PR = "r6"
+PR = "r6"
 
 inherit autotools pkgconfig native
 
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index faad03eb9d..f546f6e6c8 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -1,5 +1,5 @@
 include ipkg.inc
-FILE_PR = "r8"
+PR = "r8"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
diff --git a/packages/ipkg/ipkgorphan_0.0.1.bb b/packages/ipkg/ipkgorphan_0.0.1.bb
index 81e287aef6..686f0eb5ee 100644
--- a/packages/ipkg/ipkgorphan_0.0.1.bb
+++ b/packages/ipkg/ipkgorphan_0.0.1.bb
@@ -5,7 +5,7 @@ SECTION = "console/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "ipkg"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ipkgorphan/ipkgorphan/tags;module=${PV};rev=HEAD;proto=svn"
 S = "${WORKDIR}/${PV}"
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index 4363edc443..d442a091db 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 require iproute2.inc
 
diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb
index 58bd5ae6f1..e72dfccdde 100644
--- a/packages/iproute2/iproute2_2.6.20.bb
+++ b/packages/iproute2/iproute2_2.6.20.bb
@@ -1,6 +1,6 @@
 require iproute2.inc
 
-FILE_PR = "r2"
+PR = "r2"
 DATE = "070313"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
diff --git a/packages/iproute2/iproute2_2.6.22.bb b/packages/iproute2/iproute2_2.6.22.bb
index 485bdb65cc..1ee0ce7ab2 100644
--- a/packages/iproute2/iproute2_2.6.22.bb
+++ b/packages/iproute2/iproute2_2.6.22.bb
@@ -1,6 +1,6 @@
 require iproute2.inc
 
-FILE_PR = "r1"
+PR = "r1"
 DATE = "070710"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb
index c8086e72b7..1ccc60c18d 100644
--- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb
+++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r1"
+PR = "r1"
 
 require ipsec-tools.inc
diff --git a/packages/ipsec-tools/ipsec-tools_0.6.7.bb b/packages/ipsec-tools/ipsec-tools_0.6.7.bb
index 6c1242d31c..3f23b198c1 100644
--- a/packages/ipsec-tools/ipsec-tools_0.6.7.bb
+++ b/packages/ipsec-tools/ipsec-tools_0.6.7.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require ipsec-tools.inc
diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb
index 266b7e12f3..040be0643f 100644
--- a/packages/iptables/iptables_1.3.8.bb
+++ b/packages/iptables/iptables_1.3.8.bb
@@ -1,5 +1,5 @@
 require iptables.inc
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "\
   file://getsockopt-failed.patch;patch=1 \
diff --git a/packages/iptstate/iptstate_2.2.1.bb b/packages/iptstate/iptstate_2.2.1.bb
index 7c33fffd55..40be6eb109 100644
--- a/packages/iptstate/iptstate_2.2.1.bb
+++ b/packages/iptstate/iptstate_2.2.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.phildev.net/iptstate/"
 SECTION = "console/network"
 LICENSE = "zlib"
 DEPENDS = "ncurses"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/iptstate/iptstate-${PV}.tar.bz2"
 
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 45f17763af..2b82b853f1 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
 tracepath, tracepath6, ping, ping6 and arping."
 SECTION = "console/network"
 LICENSE ="BSD"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \
 	    file://debian-fixes.patch;patch=1 \
diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb
index 2db15daec2..7123f68bb2 100644
--- a/packages/iqnotes/iqnotes_2.0.2.bb
+++ b/packages/iqnotes/iqnotes_2.0.2.bb
@@ -1,6 +1,6 @@
 require iqnotes.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \
            file://md5.diff;patch=1 \
diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
index 072f970101..e3288505eb 100644
--- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
+++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb
@@ -2,7 +2,7 @@ require iqnotes.inc
 
 #upstream version
 UPV = "2.1.0rc1"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \
            file://pro.patch;patch=1"
diff --git a/packages/ircp/ircp_0.3.bb b/packages/ircp/ircp_0.3.bb
index 321fc2c4a3..1998176734 100644
--- a/packages/ircp/ircp_0.3.bb
+++ b/packages/ircp/ircp_0.3.bb
@@ -1,6 +1,6 @@
 DEPENDS = "openobex"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/ircp-${PV}.tar.gz"
 
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index 94558a55d2..19bcdf397c 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \
 such as phones and laptops."
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb
index be6fe8ebf4..e543ebdcc5 100644
--- a/packages/irk/irk-belkin_0.11.bb
+++ b/packages/irk/irk-belkin_0.11.bb
@@ -3,7 +3,7 @@ require irk.inc
 DESCRIPTION += "(version with Belkin support)"
 RCONFLICTS = "irk-targus"
 RREPLACES = "irk-targus"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz \
            file://install-default-conf.patch;patch=1"
diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb
index 04b912873c..87b74cb5eb 100644
--- a/packages/irk/irk-targus_0.11.0.bb
+++ b/packages/irk/irk-targus_0.11.0.bb
@@ -1,5 +1,5 @@
 require irk.inc
-FILE_PR = "r2"
+PR = "r2"
 
 DESCRIPTION += "(version with Targus support)"
 HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
diff --git a/packages/irssi/irssi_0.8.10.bb b/packages/irssi/irssi_0.8.10.bb
index 096bffb1d9..f67e8fe9c5 100644
--- a/packages/irssi/irssi_0.8.10.bb
+++ b/packages/irssi/irssi_0.8.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS += "ncurses glib-2.0"
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES += "${PN}-common"
 FILES_${PN} = "${bindir}/irssi"
diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb
index fd50ea84e6..1fc31515d9 100644
--- a/packages/irssi/irssi_svn.bb
+++ b/packages/irssi/irssi_svn.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS += "ncurses glib-2.0"
 PV = "0.8.11+svn${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/irssi/xirssi_cvs.bb b/packages/irssi/xirssi_cvs.bb
index 1815c66b15..e6c0057fb9 100644
--- a/packages/irssi/xirssi_cvs.bb
+++ b/packages/irssi/xirssi_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS += "irssi gtk+"
 RDEPENDS_${PN} += "irssi-common"
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 
diff --git a/packages/iscsi-target/iscsi-target_0.4.16.bb b/packages/iscsi-target/iscsi-target_0.4.16.bb
index d299c62d35..0e50bfe22b 100644
--- a/packages/iscsi-target/iscsi-target_0.4.16.bb
+++ b/packages/iscsi-target/iscsi-target_0.4.16.bb
@@ -2,7 +2,7 @@
 DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
 HOMEPAGE = "http://iscsitarget.sourceforge.net/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
 	   file://libs.patch;patch=1 \
diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb
index 18248cfe81..6671934c48 100644
--- a/packages/iscsi-target/iscsi-target_svn.bb
+++ b/packages/iscsi-target/iscsi-target_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
 HOMEPAGE = "http://iscsitarget.sourceforge.net/"
 LICENSE = "GPL"
-FILE_PR = "r12"
+PR = "r12"
 
 SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \
 	   file://libs.patch;patch=1 \
diff --git a/packages/ivman/ivman_0.6.14.bb b/packages/ivman/ivman_0.6.14.bb
index aaf7945d23..ecc4665b9b 100644
--- a/packages/ivman/ivman_0.6.14.bb
+++ b/packages/ivman/ivman_0.6.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Daemon to mount/unmount devices, based on info from HAL"
 HOMEPAGE = "http://ivman.sf.net"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "hal libxml2"
 RDEPENDS = "hal pmount-hal"
diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb
index 8e848654ad..6b1ff0c8d2 100644
--- a/packages/ixp425-eth/ixp400-eth_1.4.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.4.bb
@@ -10,7 +10,7 @@ SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://ixp400_pollcontroller.patch;patch=1"
 SRC_URI += "file://2.6.14-mm.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
-FILE_PR = "r9"
+PR = "r9"
 
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
index f948794e79..2fa04fc672 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 #
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "ixp-osal"
 DEPENDS = "ixp4xx-csr"
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index c5b652f0c4..5e25deb1d4 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -3,7 +3,7 @@
 #
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
-FILE_PR = "r15"
+PR = "r15"
 
 DEPENDS = "ixp-osal"
 DEPENDS = "ixp4xx-csr"
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 7d5b2ebb11..92e11e3fd2 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa
 SRC_URI += "file://2.6.13.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
-FILE_PR = "r15"
+PR = "r15"
 
 RDEPENDS = "ixp4xx-csr"
 
diff --git a/packages/ixp425-eth/ixp425-eth_1.2.bb b/packages/ixp425-eth/ixp425-eth_1.2.bb
index 303428c97d..9d537d9126 100644
--- a/packages/ixp425-eth/ixp425-eth_1.2.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.2.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://makefile.patch;patch=1"
 SRC_URI += "file://2.6.13.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
diff --git a/packages/ixp4xx/ixp-osal_1.5.bb b/packages/ixp4xx/ixp-osal_1.5.bb
index 5ffb51aec6..eac1c1c28d 100644
--- a/packages/ixp4xx/ixp-osal_1.5.bb
+++ b/packages/ixp4xx/ixp-osal_1.5.bb
@@ -20,7 +20,7 @@ LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/ixp400AccessLibrary-1_5.zip"
 SRC_URI += "file://2.6.patch;patch=1"
 S = "${WORKDIR}/ixp_osal"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index aa62ca296a..009d45d67a 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -26,7 +26,7 @@ SRC_URI += "file://Makefile.patch;patch=1"
 SRC_URI += "file://2.6.patch;patch=1"
 SRC_URI += "file://le.patch;patch=1"
 S = "${WORKDIR}/ixp_osal"
-FILE_PR = "r4"
+PR = "r4"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb
index a6b5725d56..481033fd0a 100644
--- a/packages/ixp4xx/ixp-osal_2.1.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.1.bb
@@ -34,7 +34,7 @@ SRC_URI += "file://le.patch;patch=1"
 SRC_URI += "file://assert.patch;patch=1"
 
 S = "${WORKDIR}/ixp_osal"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb
index 0f24e85b21..dd70289598 100644
--- a/packages/ixp4xx/ixp-osal_2.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.bb
@@ -30,7 +30,7 @@ SRC_URI += "file://le.patch;patch=1"
 SRC_URI += "file://assert.patch;patch=1"
 
 S = "${WORKDIR}/ixp_osal"
-FILE_PR = "r6"
+PR = "r6"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index 00a9f42a5c..3e5b444002 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -24,7 +24,7 @@ SRC_URI += "file://badpaths.patch;patch=1"
 SRC_URI += "file://build-timing-annoyance.patch;patch=1"
 
 S = "${WORKDIR}/ixp400_xscale_sw"
-FILE_PR = "r6"
+PR = "r6"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-csr_1.5.bb b/packages/ixp4xx/ixp4xx-csr_1.5.bb
index 8776d09cb2..d9c69564f7 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.5.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.5.bb
@@ -23,7 +23,7 @@ SRC_URI += "http://www.intel.com/Please-Read-The-BB-File/ixp400NpeLibrary-1_5.zi
 SRC_URI += "file://2.6.patch;patch=1"
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb
index df2c77a27c..e462c505fb 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.0.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb
@@ -31,7 +31,7 @@ SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://le.patch;patch=1"
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-FILE_PR = "r6"
+PR = "r6"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
index d45c9464b2..32685d30f6 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
@@ -40,7 +40,7 @@ SRC_URI += "file://undefined-attribute.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 84b1961d98..e95f807107 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -39,7 +39,7 @@ SRC_URI += "file://module-param.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-FILE_PR = "r12"
+PR = "r12"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
index 8942177f65..4f1d9383a5 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
index 093f8e90ff..9db83352c4 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.4.bb b/packages/ixp4xx/ixp4xx-npe-native_2.4.bb
index c9f6ff2e03..2b3da60b5d 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.4.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Software License Agreement"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index 172104530c..7fdc3abf63 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-FILE_PR = "r6"
+PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
index 85f070998d..a53b9d703b 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "ixp4xx-npe-native"
 
 # You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
diff --git a/packages/ixp4xx/ixp4xx-npe_2.4.bb b/packages/ixp4xx/ixp4xx-npe_2.4.bb
index 33dd808be8..121838684f 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.4.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "ixp4xx-npe-native"
 
 # You need to download the IPL_ixp400NpeLibrary-2_4.zip file (without crypto) from:
diff --git a/packages/jaaa/clalsadrv_1.2.2.bb b/packages/jaaa/clalsadrv_1.2.2.bb
index 9ec19b5aff..de0df937a4 100644
--- a/packages/jaaa/clalsadrv_1.2.2.bb
+++ b/packages/jaaa/clalsadrv_1.2.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "clalsadrv library from http://www.kokkinizita.net/linuxaudio/"
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "alsa-lib"
 
diff --git a/packages/jaaa/clthreads_2.4.0.bb b/packages/jaaa/clthreads_2.4.0.bb
index f668c167f1..ac67c5028d 100644
--- a/packages/jaaa/clthreads_2.4.0.bb
+++ b/packages/jaaa/clthreads_2.4.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "clthreads library from http://www.kokkinizita.net/linuxaudio/"
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = ""
 
diff --git a/packages/jaaa/clxclient_3.6.1.bb b/packages/jaaa/clxclient_3.6.1.bb
index fcc444b707..ff499ba4dc 100644
--- a/packages/jaaa/clxclient_3.6.1.bb
+++ b/packages/jaaa/clxclient_3.6.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "clxclient library from http://www.kokkinizita.net/linuxaudio/"
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libx11 clthreads freetype libxft"
 RDEPENDS = "libx11-locale"
diff --git a/packages/jaaa/jaaa_0.4.2.bb b/packages/jaaa/jaaa_0.4.2.bb
index 04ad5f01e5..693d7061d1 100644
--- a/packages/jaaa/jaaa_0.4.2.bb
+++ b/packages/jaaa/jaaa_0.4.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "JACK and ALSA Audio Analyzer from http://www.kokkinizita.net/linu
 SECTION = "x11/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "clthreads clxclient clalsadrv jack freetype fftwf"
 
diff --git a/packages/jack/jack_0.103.0.bb b/packages/jack/jack_0.103.0.bb
index bd0f54e386..ccd6379447 100644
--- a/packages/jack/jack_0.103.0.bb
+++ b/packages/jack/jack_0.103.0.bb
@@ -5,7 +5,7 @@ themselves."
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "alsa-lib"
 
diff --git a/packages/jamvm/jamvm-initial_1.4.5.bb b/packages/jamvm/jamvm-initial_1.4.5.bb
index e965027e37..c71811dd4e 100644
--- a/packages/jamvm/jamvm-initial_1.4.5.bb
+++ b/packages/jamvm/jamvm-initial_1.4.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial"
 
-FILE_PR = "r0"
+PR = "r0"
 
 PROVIDES = "virtual/java-initial"
 
diff --git a/packages/jamvm/jamvm-initial_1.5.0.bb b/packages/jamvm/jamvm-initial_1.5.0.bb
index a7a9a3b6a2..a1c415dd62 100644
--- a/packages/jamvm/jamvm-initial_1.5.0.bb
+++ b/packages/jamvm/jamvm-initial_1.5.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PROVIDES = "virtual/java-initial"
 
diff --git a/packages/jamvm/jamvm-native_1.5.1.bb b/packages/jamvm/jamvm-native_1.5.1.bb
index 92728e0c2a..3b42dbbef6 100644
--- a/packages/jamvm/jamvm-native_1.5.1.bb
+++ b/packages/jamvm/jamvm-native_1.5.1.bb
@@ -1,4 +1,4 @@
 require jamvm-native.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb
index 67645e0916..e8ca076350 100644
--- a/packages/jamvm/jamvm_1.4.5.bb
+++ b/packages/jamvm/jamvm_1.4.5.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
 
diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb
index 712c483c78..92c1992ea9 100644
--- a/packages/jamvm/jamvm_1.5.0.bb
+++ b/packages/jamvm/jamvm_1.5.0.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-FILE_PR = "r3"
+PR = "r3"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb
index e023039d54..81977a5f40 100644
--- a/packages/jamvm/jamvm_1.5.1.bb
+++ b/packages/jamvm/jamvm_1.5.1.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-FILE_PR = "r2"
+PR = "r2"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/jards/jards_1.0.bb b/packages/jards/jards_1.0.bb
index dfd2f46bf4..c0504ae88c 100644
--- a/packages/jards/jards_1.0.bb
+++ b/packages/jards/jards_1.0.bb
@@ -5,7 +5,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "virtual/japanese-font qte-mt libpng (>= 1) kpengine"
-FILE_PR = "r7"
+PR = "r7"
 
 #  stuff that still needs fixing
 #) is the RDEPENDS line correct and sufficient?
diff --git a/packages/javasqlite/javasqlite_20080130.bb b/packages/javasqlite/javasqlite_20080130.bb
index a5808a6330..3137fba4d4 100644
--- a/packages/javasqlite/javasqlite_20080130.bb
+++ b/packages/javasqlite/javasqlite_20080130.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "JDBC driver for sqlite and sqlite3"
 HOMEPAGE = "http://www.ch-werner.de/javasqlite"
 LICENSE  = "BSD"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "\
   http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
diff --git a/packages/jhead/jhead_2.6.0.bb b/packages/jhead/jhead_2.6.0.bb
index db24e375a5..3779c1ec34 100644
--- a/packages/jhead/jhead_2.6.0.bb
+++ b/packages/jhead/jhead_2.6.0.bb
@@ -1,5 +1,5 @@
 SECTION = "apps"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz \
            file://makefile.patch;patch=1"
diff --git a/packages/jikes/jikes_1.21.bb b/packages/jikes/jikes_1.21.bb
index d07703be41..c7a8c6afe7 100644
--- a/packages/jikes/jikes_1.21.bb
+++ b/packages/jikes/jikes_1.21.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "IBM"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2"
 
diff --git a/packages/jikes/jikes_1.22.bb b/packages/jikes/jikes_1.22.bb
index 717f779727..02de9d577e 100644
--- a/packages/jikes/jikes_1.22.bb
+++ b/packages/jikes/jikes_1.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "IBM"
-FILE_PR = "r1"
+PR = "r1"
 
 RDEPENDS = "classpath"
 
diff --git a/packages/joe/joe_3.1.bb b/packages/joe/joe_3.1.bb
index a95593ea62..d2f2aa6ad2 100644
--- a/packages/joe/joe_3.1.bb
+++ b/packages/joe/joe_3.1.bb
@@ -3,6 +3,6 @@ DESCRIPTION = "Console text editor with good functionality, good choice for vi-h
 HOMEPAGE = "http://joe-editor.sourceforge.net/"
 LICENSE ="GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 9295920aa1..48771c8de5 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -6,7 +6,7 @@ PRIORITY = "required"
 DEPENDS = "libtool-cross"
 RPROVIDES_${PN} = "jpeg"
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
diff --git a/packages/js/js_1.5.bb b/packages/js/js_1.5.bb
index 0c5aacf3a2..f53a4f83a5 100644
--- a/packages/js/js_1.5.bb
+++ b/packages/js/js_1.5.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "libs/network"
 DEPENDS = "readline"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \
            file://jsautocfg.h"
diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb
index b84c93e900..6aca160262 100644
--- a/packages/juce/juce_1.29.bb
+++ b/packages/juce/juce_1.29.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.rawmaterialsoftware.com/juce"
 AUTHOR = "Julian Stoerer"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib freetype virtual/libx11"
-FILE_PR = "r0"
+PR = "r0"
 
 #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion
 SRC_URI = "http://downloads.openmoko.org/sources/juce_${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}.zip \
diff --git a/packages/justreader/justreader_2.0k.bb b/packages/justreader/justreader_2.0k.bb
index cc2c2d8fb1..f3f71493fc 100644
--- a/packages/justreader/justreader_2.0k.bb
+++ b/packages/justreader/justreader_2.0k.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://justreader.sourceforge.net/"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/justreader/justreader_${PV}.tgz \
 file://correct-settings-path.patch;patch=1"
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index ec6b36224b..d4d6287592 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -1,6 +1,6 @@
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 require kaffe.inc
 
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index ccef9d4e80..60dab7859e 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,6 +1,6 @@
 PV = "1.1.5+cvs${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
diff --git a/packages/kanatest/kanatest_0.3.6.bb b/packages/kanatest/kanatest_0.3.6.bb
index d1813a89a6..f0b17a2af9 100644
--- a/packages/kanatest/kanatest_0.3.6.bb
+++ b/packages/kanatest/kanatest_0.3.6.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://clay.ll.pl/download/${PN}-${PV}.tar.gz file://${PN}.desktop"
 
diff --git a/packages/kanjipad/kanjipad_svn.bb b/packages/kanjipad/kanjipad_svn.bb
index 7b1cdd0af9..73c6ddba0f 100644
--- a/packages/kanjipad/kanjipad_svn.bb
+++ b/packages/kanjipad/kanjipad_svn.bb
@@ -2,7 +2,7 @@ require kanjipad.inc
 
 DEPENDS += "perl-native"
 PV = "2.0.0+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
 S = "${WORKDIR}/trunk"
diff --git a/packages/kanjipad/kpengine_0.1.bb b/packages/kanjipad/kpengine_0.1.bb
index 3e2c66d488..d9a6fee7d6 100644
--- a/packages/kanjipad/kpengine_0.1.bb
+++ b/packages/kanjipad/kpengine_0.1.bb
@@ -2,7 +2,7 @@ require kanjipad.inc
 
 DESCRIPTION = "Japanese HWR engine used by a number of programs. Original algorithms by Todd Ruddick."
 SECTION = "inputmethods"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://Makefile-kpengine-only.patch;patch=1"
 
diff --git a/packages/kbdd/kbdd_svn.bb b/packages/kbdd/kbdd_svn.bb
index 13b6c8d5c6..b9468593da 100644
--- a/packages/kbdd/kbdd_svn.bb
+++ b/packages/kbdd/kbdd_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "virtual/kernel"
 RRECOMMENDS_${PN} = "kernel-module-keybdev kernel-module-uinput"
 PV = "0.12+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/kbdd;module=trunk;proto=svn \
            file://kbdd.init \
diff --git a/packages/kde4/strigi_0.5.10.bb b/packages/kde4/strigi_0.5.10.bb
index 6ddbb4db93..0331d9fe59 100644
--- a/packages/kde4/strigi_0.5.10.bb
+++ b/packages/kde4/strigi_0.5.10.bb
@@ -1,6 +1,6 @@
 inherit qt4x11 cmake
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "clucene-core pidgin expat gamin"
 
diff --git a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb
index d33e9dae24..b44471e9d6 100644
--- a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb
+++ b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb
@@ -9,4 +9,4 @@ file://nomail.patch;patch=1 \
 include kdepimpi-base.inc
 include kdepimpi-x11.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/kdepimpi/kdepimpi_2.2.10.bb b/packages/kdepimpi/kdepimpi_2.2.10.bb
index 65a087fd40..f6a1caf212 100644
--- a/packages/kdepimpi/kdepimpi_2.2.10.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.10.bb
@@ -3,4 +3,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
 
 require kdepimpi-base.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/kdepimpi/ktimetrackerpi_0.9.7.bb b/packages/kdepimpi/ktimetrackerpi_0.9.7.bb
index bd2fe75505..d022dc55cc 100644
--- a/packages/kdepimpi/ktimetrackerpi_0.9.7.bb
+++ b/packages/kdepimpi/ktimetrackerpi_0.9.7.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.pi-sync.net"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/ktimetracker_pi097.tar.gz"
 
diff --git a/packages/kexec/kexec-tools-static_1.101.bb b/packages/kexec/kexec-tools-static_1.101.bb
index e713b46d08..670f055506 100644
--- a/packages/kexec/kexec-tools-static_1.101.bb
+++ b/packages/kexec/kexec-tools-static_1.101.bb
@@ -1,7 +1,7 @@
 # the binaries are statical linked against klibc
 require kexec-tools.inc
 
-FILE_PR = "r4"
+PR = "r4"
 DEPENDS = "klibc"
 
 SRC_URI += "file://kexec-klibc.patch;patch=1"
diff --git a/packages/kexec/kexec-tools_1.101.bb b/packages/kexec/kexec-tools_1.101.bb
index cc04a88cd3..f74c7bcd83 100644
--- a/packages/kexec/kexec-tools_1.101.bb
+++ b/packages/kexec/kexec-tools_1.101.bb
@@ -2,4 +2,4 @@ require kexec-tools.inc
 export LDFLAGS = "-L${STAGING_LIBDIR}"
 EXTRA_OECONF = " --with-zlib=yes"
 
-FILE_PR = "r5"
+PR = "r5"
diff --git a/packages/kexecboot/initramfs-kexecboot_1.0.bb b/packages/kexecboot/initramfs-kexecboot_1.0.bb
index 62865a5b58..a6450b0bfb 100644
--- a/packages/kexecboot/initramfs-kexecboot_1.0.bb
+++ b/packages/kexecboot/initramfs-kexecboot_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-FILE_PR = "r8"
+PR = "r8"
 RDEPENDS = "kexecboot klibc-utils-static-mount klibc-utils-static-sh klibc-utils-static-sleep"
 
 FBANGLE = "270"
diff --git a/packages/kexecboot/kexecboot_0.3.bb b/packages/kexecboot/kexecboot_0.3.bb
index ed9109aa82..f94e31b4e2 100644
--- a/packages/kexecboot/kexecboot_0.3.bb
+++ b/packages/kexecboot/kexecboot_0.3.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "klibc"
 RDEPENDS = "kexec-static"
 
diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb
index bcef0e88a2..f68c770a85 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "-1"
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index 26af506132..a0d00ab120 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-FILE_PR = "r6"
+PR = "r6"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
diff --git a/packages/keylaunch/keylaunch-conf_2.0.10.bb b/packages/keylaunch/keylaunch-conf_2.0.10.bb
index 37d2579672..aeb9c862ca 100644
--- a/packages/keylaunch/keylaunch-conf_2.0.10.bb
+++ b/packages/keylaunch/keylaunch-conf_2.0.10.bb
@@ -6,7 +6,7 @@ SECTION = "gpe"
 LICENSE = "GPL"
 DESCRIPTION = "Device-specific keylaunch configuration"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = " file://keylaunchrc"
 SRC_URI += " file://80chvt-SUID"
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index 5b3c5bc4f2..2afba67f16 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -11,7 +11,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
  computers. You can connect each key to a program of your choice; if the\
  program is already running, keylaunch can bring its window to the front\
  rather than just running another copy."
-FILE_PR = "r14"
+PR = "r14"
 
 SRC_URI += " file://makefile-fix.patch;patch=1 file://unbreak-keyevents.patch;patch=1"
 
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index c4ac1435ad..877b801f4c 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "file://*.map"
 
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index e5aea4b177..89b1cfacde 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-FILE_PR = "r20"
+PR = "r20"
 
 inherit update-rc.d
 
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index 9f33717bb8..5739255826 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gdbm"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \
 	   file://keyring-0.6.8-datatype.patch;patch=1"
diff --git a/packages/kf/kf_0.5.4.1.bb b/packages/kf/kf_0.5.4.1.bb
index 495c7bbc0e..f171bb8b81 100755
--- a/packages/kf/kf_0.5.4.1.bb
+++ b/packages/kf/kf_0.5.4.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Kf is a GTK+ instant messaging client."
 LICENSE = "GPL"
 DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
diff --git a/packages/kismet/kismet-newcore_svn.bb b/packages/kismet/kismet-newcore_svn.bb
index 88ab937963..6f3c00bdcb 100644
--- a/packages/kismet/kismet-newcore_svn.bb
+++ b/packages/kismet/kismet-newcore_svn.bb
@@ -3,7 +3,7 @@ require kismet.inc
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
 
diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb
index 2d06a95421..ef1cf86c98 100644
--- a/packages/kismet/kismet_2007-01-R1b.bb
+++ b/packages/kismet/kismet_2007-01-R1b.bb
@@ -1,3 +1,3 @@
 require kismet.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb
index d17cd351b1..4786543ec8 100644
--- a/packages/kismet/kismet_2007-10-R1.bb
+++ b/packages/kismet/kismet_2007-10-R1.bb
@@ -2,4 +2,4 @@ require kismet.inc
 
 SRC_URI += "file://fix_strip.patch;patch=1"
 
-FILE_PR = "r5"
+PR = "r5"
diff --git a/packages/kismet/kismet_svn.bb b/packages/kismet/kismet_svn.bb
index 3b0523c1f4..878678052a 100644
--- a/packages/kismet/kismet_svn.bb
+++ b/packages/kismet/kismet_svn.bb
@@ -3,7 +3,7 @@ require kismet.inc
 DEFAULT_PREFERENCE = "-1"
 
 PV = "2007-10-R1+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
 
diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb
index e04707d313..14a9f6b4d7 100644
--- a/packages/klibc/klibc-utils-static_1.5.bb
+++ b/packages/klibc/klibc-utils-static_1.5.bb
@@ -1,6 +1,6 @@
 require klibc-common.inc
 
-FILE_PR = "r11"
+PR = "r11"
 
 # We only want the static utils. klibc build both. So we install only what we want.				
 do_install() {
diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb
index 5b626a0a27..a607aa8a21 100644
--- a/packages/klibc/klibc_1.5.bb
+++ b/packages/klibc/klibc_1.5.bb
@@ -1,2 +1,2 @@
 require klibc.inc
-FILE_PR = "r9"
+PR = "r9"
diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb
index 65022b5423..4e516fc90d 100644
--- a/packages/klimt/klimt_0.6.1.bb
+++ b/packages/klimt/klimt_0.6.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Klimt is a software OpenGL rendering library for Qt/Embedded base
 SECTION = "opie/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/klimt/klimt-src-${PV}.zip"
 S = "${WORKDIR}/klimt/build/LinuxQTE"
diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb
index 3cbded0766..dc3e026376 100644
--- a/packages/knights/knights_1.14.bb
+++ b/packages/knights/knights_1.14.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "phalanx"
 RDEPENDS = "phalanx"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/mirror/knights.tar.gz \
            file://libqpe-opie.patch;patch=1 \
diff --git a/packages/kobodeluxe/kobodeluxe_0.5.1.bb b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
index b17e773fea..e94f03b628 100644
--- a/packages/kobodeluxe/kobodeluxe_0.5.1.bb
+++ b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 AUTHOR = "David Olofson <david@olofson.net>"
 HOMEPAGE = "http://olofson.net/kobodl"
 
-FILE_PR = "r5"
+PR = "r5"
 
 DEPENDS = "libsdl-image virtual/libsdl"
 
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index dba0275504..979c1ce305 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -4,7 +4,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libqpe-opie openssl libpcre"
 LICENSE = "LGPL GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 # Note if this .bb files fails with the error:
 # "No rule to make target `-lpcre', needed by `konqueror'.  Stop."
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 5be2e1f2a4..a84f47d471 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
diff --git a/packages/konqueror/konqueror-embedded_20070316.bb b/packages/konqueror/konqueror-embedded_20070316.bb
index 27cfadecfc..83b5ab40a3 100644
--- a/packages/konqueror/konqueror-embedded_20070316.bb
+++ b/packages/konqueror/konqueror-embedded_20070316.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
diff --git a/packages/kstars/kstars-embedded_0.8.5.bb b/packages/kstars/kstars-embedded_0.8.5.bb
index 7625e97065..58a8522600 100644
--- a/packages/kstars/kstars-embedded_0.8.5.bb
+++ b/packages/kstars/kstars-embedded_0.8.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPNAME = "kstars"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/apps/Applications"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://kstars.sourceforge.net/kstars-embedded-${PV}.tar.gz"
 S = "${WORKDIR}/kstars"
diff --git a/packages/kxml2/kxml2_2.3.0.bb b/packages/kxml2/kxml2_2.3.0.bb
index e0dac16894..6279852620 100644
--- a/packages/kxml2/kxml2_2.3.0.bb
+++ b/packages/kxml2/kxml2_2.3.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://kxml.sourceforge.net"
 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "BSD CPL LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit java-library
 
diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb
index 6cc3013264..ab9a99c064 100644
--- a/packages/lame/lame_3.96.1.bb
+++ b/packages/lame/lame_3.96.1.bb
@@ -1,7 +1,7 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
 	file://no-gtk1.patch;patch=1 \
diff --git a/packages/lbreakout/lbreakout2_2.6beta.bb b/packages/lbreakout/lbreakout2_2.6beta.bb
index 662d4e8a24..496a80904e 100644
--- a/packages/lbreakout/lbreakout2_2.6beta.bb
+++ b/packages/lbreakout/lbreakout2_2.6beta.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://lgames.sourceforge.net/index.php?project=LBreakout2"
 SECTION = "games/arcade"
 LICENSE = "GPL"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lgames/lbreakout2-2.6beta.tar.gz"
 
diff --git a/packages/lcd4linux/lcd4linux_0.10.0.bb b/packages/lcd4linux/lcd4linux_0.10.0.bb
index 7920c13f57..fe73954fe5 100644
--- a/packages/lcd4linux/lcd4linux_0.10.0.bb
+++ b/packages/lcd4linux/lcd4linux_0.10.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libusb-compat ncurses readline virtual/libx11"
 
 PV = "0.10.0+0.10.1-RC2"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
            file://libusb-compat.diff;patch=1 \ 
diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb
index 368778c92a..dafcbba170 100644
--- a/packages/lcdproc/lcdproc_0.5.1.bb
+++ b/packages/lcdproc/lcdproc_0.5.1.bb
@@ -3,7 +3,7 @@ require lcdproc5.inc
 DEPENDS += "libg15 g15daemon libg15render"
 DEPENDS_lcdd-driver-all += "lcdd-driver-g15"
 
-FILE_PR = "r3"
+PR = "r3"
 
 do_install_append () {
 	# binaries
diff --git a/packages/lcms/lcms_1.17.bb b/packages/lcms/lcms_1.17.bb
index e581fc0aea..2336142a23 100644
--- a/packages/lcms/lcms_1.17.bb
+++ b/packages/lcms/lcms_1.17.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms-${PV}.tar.gz"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 
diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb
index d65687758f..9017c11dbf 100644
--- a/packages/leafpad/leafpad_0.8.15.bb
+++ b/packages/leafpad/leafpad_0.8.15.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gtk+ intltool-native"
 SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/led/led_cvs.bb b/packages/led/led_cvs.bb
index f0baf2f69a..7d3b76c6f5 100644
--- a/packages/led/led_cvs.bb
+++ b/packages/led/led_cvs.bb
@@ -8,7 +8,7 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
 inherit module-base
 
 S = "${WORKDIR}/h3600_test"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit pkgconfig
 
diff --git a/packages/lemon/lemon-native_3.5.4.bb b/packages/lemon/lemon-native_3.5.4.bb
index da76387689..55a083ccb7 100644
--- a/packages/lemon/lemon-native_3.5.4.bb
+++ b/packages/lemon/lemon-native_3.5.4.bb
@@ -1,6 +1,6 @@
 require lemon.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit native
 
diff --git a/packages/lemon/lemon_3.5.4.bb b/packages/lemon/lemon_3.5.4.bb
index 94c8c45f7b..4a7e5e77f0 100644
--- a/packages/lemon/lemon_3.5.4.bb
+++ b/packages/lemon/lemon_3.5.4.bb
@@ -1,6 +1,6 @@
 require lemon.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/packages/liba52/liba52_0.7.4.bb b/packages/liba52/liba52_0.7.4.bb
index 0959f5355f..743fa30f83 100644
--- a/packages/liba52/liba52_0.7.4.bb
+++ b/packages/liba52/liba52_0.7.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Library for reading some sort of media format."
 LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb
index e9825ca624..af847f50c6 100644
--- a/packages/libaal/libaal_1.0.4.bb
+++ b/packages/libaal/libaal_1.0.4.bb
@@ -1,7 +1,7 @@
 # This is the support library for reiser4progs, required when
 # building that package.  The libraries from this build must
 # be installed on the system to use the reiser4progs programs
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems"
 HOMEPAGE = "http://www.namesys.com"
 SECTION = "base"
diff --git a/packages/libaio/libaio_0.3.106.bb b/packages/libaio/libaio_0.3.106.bb
index 659851e64e..bc70bbe8d2 100644
--- a/packages/libaio/libaio_0.3.106.bb
+++ b/packages/libaio/libaio_0.3.106.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
            file://00_arches.patch;patch=1 \
diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb
index f5f224eddf..c6fda2dbef 100644
--- a/packages/libao/libao-alsa_0.8.6.bb
+++ b/packages/libao/libao-alsa_0.8.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib libao"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 S = "${WORKDIR}/libao-${PV}"
diff --git a/packages/libao/libao-plugin-alsa_0.8.6.bb b/packages/libao/libao-plugin-alsa_0.8.6.bb
index e4d0fb4bf3..94727ad5c7 100644
--- a/packages/libao/libao-plugin-alsa_0.8.6.bb
+++ b/packages/libao/libao-plugin-alsa_0.8.6.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "alsa-lib libao"
 PROVIDES = "libao-alsa"
 PACKAGES = "${PN}-dbg libao-alsa libao-alsa-dev"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 S = "${WORKDIR}/libao-${PV}"
diff --git a/packages/libao/libao_0.8.4.bb b/packages/libao/libao_0.8.4.bb
index 39f7d52b6c..d77391fcb9 100644
--- a/packages/libao/libao_0.8.4.bb
+++ b/packages/libao/libao_0.8.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A cross platform audio library"
 HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb
index efdf3574b1..7bc44c0fc8 100644
--- a/packages/libao/libao_0.8.6.bb
+++ b/packages/libao/libao_0.8.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A cross platform audio library"
 HOMEPAGE = "http://www.xiph.org/ao/"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 
diff --git a/packages/libao/libao_0.8.8.bb b/packages/libao/libao_0.8.8.bb
index f0bb509d7a..88f7c898ec 100644
--- a/packages/libao/libao_0.8.8.bb
+++ b/packages/libao/libao_0.8.8.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib pulseaudio"
 PROVIDES = "libao-alsa libao-alsa-plugin"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 
diff --git a/packages/libassuan/libassuan_0.6.7.bb b/packages/libassuan/libassuan_0.6.7.bb
index 88eaa75552..f423502043 100644
--- a/packages/libassuan/libassuan_0.6.7.bb
+++ b/packages/libassuan/libassuan_0.6.7.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-${PV}.tar.gz"
 
diff --git a/packages/libcap/libcap_1.10.bb b/packages/libcap/libcap_1.10.bb
index 1aca9b15f8..172acaca6e 100644
--- a/packages/libcap/libcap_1.10.bb
+++ b/packages/libcap/libcap_1.10.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "bison-native flex-native"
-FILE_PR = "r1"
+PR = "r1"
 
 CFLAGS_append = " -I${S}/libcap/include"
 
diff --git a/packages/libccaudio2/libccaudio2_0.9.0.bb b/packages/libccaudio2/libccaudio2_0.9.0.bb
index ccdc4f2e1d..f38017833d 100644
--- a/packages/libccaudio2/libccaudio2_0.9.0.bb
+++ b/packages/libccaudio2/libccaudio2_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "a C++ class library for generating and recognising sounds."
 HOMEPAGE = "http://www.gnu.org/software/ccaudio/"
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/ccaudio/ccaudio2-${PV}.tar.gz \
 	file://01-ccaudio-fixed-point.diff;patch=1 \
diff --git a/packages/libcdaudio/libcdaudio_0.99.12p2.bb b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
index 6f573ea3fa..91b80611d4 100644
--- a/packages/libcdaudio/libcdaudio_0.99.12p2.bb
+++ b/packages/libcdaudio/libcdaudio_0.99.12p2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://libcdaudio.sourceforge.net/"
 DESCRIPTION = "Portable library for controlling audio CDs"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libcontactsdb/libcontactsdb_0.1.bb b/packages/libcontactsdb/libcontactsdb_0.1.bb
index cedb3b8e23..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.1.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.1.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
-FILE_PR = "r0"
+PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit autotools gpe pkgconfig
diff --git a/packages/libcontactsdb/libcontactsdb_0.3.bb b/packages/libcontactsdb/libcontactsdb_0.3.bb
index cedb3b8e23..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.3.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.3.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
-FILE_PR = "r0"
+PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit autotools gpe pkgconfig
diff --git a/packages/libcontactsdb/libcontactsdb_0.4.bb b/packages/libcontactsdb/libcontactsdb_0.4.bb
index cedb3b8e23..62b7566700 100644
--- a/packages/libcontactsdb/libcontactsdb_0.4.bb
+++ b/packages/libcontactsdb/libcontactsdb_0.4.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 
-FILE_PR = "r0"
+PR = "r0"
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit autotools gpe pkgconfig
diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb
index b5857ec098..d11818b0bc 100644
--- a/packages/libcontactsdb/libcontactsdb_cvs.bb
+++ b/packages/libcontactsdb/libcontactsdb_cvs.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 
 S = "${WORKDIR}/${PN}"
 PV = "0.3+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb
index 1c4a5cfa43..ed2d303ecb 100644
--- a/packages/libcroco/libcroco_0.6.0.bb
+++ b/packages/libcroco/libcroco_0.6.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading St
 SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb
index 16bdf8e08b..cc7fc05d62 100644
--- a/packages/libcroco/libcroco_0.6.1.bb
+++ b/packages/libcroco/libcroco_0.6.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading St
 SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/packages/libcwd/libcwd_0.99.47.bb b/packages/libcwd/libcwd_0.99.47.bb
index bb6a909843..38453c89e5 100644
--- a/packages/libcwd/libcwd_0.99.47.bb
+++ b/packages/libcwd/libcwd_0.99.47.bb
@@ -5,7 +5,7 @@ printing source line number information and demangled type names."
 SECTION = "devel/libs"
 LICENSE = "QPL"
 HOMEPAGE = "http://libcwd.sourceforge.net"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libcwd/libcwd-${PV}.tar.gz"
 
diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb
index fbdca021a8..ba7140ffdb 100644
--- a/packages/libdaemon/libdaemon_0.10.bb
+++ b/packages/libdaemon/libdaemon_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
 
diff --git a/packages/libdaemon/libdaemon_0.11.bb b/packages/libdaemon/libdaemon_0.11.bb
index de362d1dab..c91f6351ff 100644
--- a/packages/libdaemon/libdaemon_0.11.bb
+++ b/packages/libdaemon/libdaemon_0.11.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
 
diff --git a/packages/libdaemon/libdaemon_0.12.bb b/packages/libdaemon/libdaemon_0.12.bb
index de362d1dab..c91f6351ff 100644
--- a/packages/libdaemon/libdaemon_0.12.bb
+++ b/packages/libdaemon/libdaemon_0.12.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
 
diff --git a/packages/libdisplaymigration/libdisplaymigration_0.28.bb b/packages/libdisplaymigration/libdisplaymigration_0.28.bb
index f766744d6e..e92cf57ce8 100644
--- a/packages/libdisplaymigration/libdisplaymigration_0.28.bb
+++ b/packages/libdisplaymigration/libdisplaymigration_0.28.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Gtk+ display migration library"
 DEPENDS = "gtk+ libgcrypt"
 SECTION = "gpe"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit pkgconfig gpe
 
diff --git a/packages/libdisplaymigration/libdisplaymigration_0.99.bb b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
index 39adbd3170..0563ba3eea 100644
--- a/packages/libdisplaymigration/libdisplaymigration_0.99.bb
+++ b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Gtk+ display migration library (dummy version)"
 DEPENDS = "gtk+"
 SECTION = "gpe"
 PRIORITY = "optional"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit pkgconfig gpe
 
diff --git a/packages/libdmtx/libdmtx_0.5.2.bb b/packages/libdmtx/libdmtx_0.5.2.bb
index 9eb0b7d49f..0ddcff2d23 100644
--- a/packages/libdmtx/libdmtx_0.5.2.bb
+++ b/packages/libdmtx/libdmtx_0.5.2.bb
@@ -5,7 +5,7 @@ AUTHOR = "Mike Laughton"
 SECTION = "libs"
 PRIORITY = "optional"
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libpng tiff"
 
diff --git a/packages/libdotconf/libdotconf_1.0.13.bb b/packages/libdotconf/libdotconf_1.0.13.bb
index db1af21fa8..05520519b6 100644
--- a/packages/libdotconf/libdotconf_1.0.13.bb
+++ b/packages/libdotconf/libdotconf_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parse
 HOMEPAGE = "http://www.azzit.de/dotconf/"
 LICENSE = "LGPLv2"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 9001d736b9..d2db2ce0d6 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.metzlerbros.org/dvb/${P}.tar.gz \
           file://topf2ps.patch;patch=1"
diff --git a/packages/libdvdnav/libdvdnav_0.1.10.bb b/packages/libdvdnav/libdvdnav_0.1.10.bb
index fbb32f8fe5..d4a90f38c8 100644
--- a/packages/libdvdnav/libdvdnav_0.1.10.bb
+++ b/packages/libdvdnav/libdvdnav_0.1.10.bb
@@ -6,7 +6,7 @@ HOMEPAGE="http://dvd.sourceforge.net/"
 DESCRIPTION="DVD navigation multimeda library"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/dvd/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libeasysoap++/libeasysoap++0_0.6.1.bb b/packages/libeasysoap++/libeasysoap++0_0.6.1.bb
index bb68c5c48b..d3ebe20cc4 100644
--- a/packages/libeasysoap++/libeasysoap++0_0.6.1.bb
+++ b/packages/libeasysoap++/libeasysoap++0_0.6.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "C++ library for SOAP, the Simple Object Access Protocol"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_${PV}.orig.tar.gz \
   http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_${PV}-5.diff.gz;patch=1 \
diff --git a/packages/libedit/libedit_20050118.bb b/packages/libedit/libedit_20050118.bb
index 7b62d7b49f..eee231a22a 100644
--- a/packages/libedit/libedit_20050118.bb
+++ b/packages/libedit/libedit_20050118.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
 SECTION = "libs"
 LICENSE="BSD"
 DEPENDS = "ncurses"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-${PV}.tar.bz2 \
 	file://20031222-debian-to-gentoo.patch;patch=1;pnum=1 \
diff --git a/packages/libeina/libeina_0.96.7.bb b/packages/libeina/libeina_0.96.7.bb
index ebca0e387a..e76e99f95b 100644
--- a/packages/libeina/libeina_0.96.7.bb
+++ b/packages/libeina/libeina_0.96.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Multimedia library using gstreamer"
 HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "glib-2.0 gstreamer"
 
diff --git a/packages/libesmtp/libesmtp_1.0.4.bb b/packages/libesmtp/libesmtp_1.0.4.bb
index be0bc58929..06b46821d9 100644
--- a/packages/libesmtp/libesmtp_1.0.4.bb
+++ b/packages/libesmtp/libesmtp_1.0.4.bb
@@ -4,7 +4,7 @@ preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
 LICENSE = "GPL"
 SECTION = "libs/network"
 DEPENDS = "openssl"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
 
diff --git a/packages/libetpan/libetpan_0.46.bb b/packages/libetpan/libetpan_0.46.bb
index e90c3af3d9..dfef3b19c6 100644
--- a/packages/libetpan/libetpan_0.46.bb
+++ b/packages/libetpan/libetpan_0.46.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
 DEPENDS = "gnutls"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
            file://honor-oe-lflags.patch;patch=1"
diff --git a/packages/libetpan/libetpan_0.48.bb b/packages/libetpan/libetpan_0.48.bb
index e90c3af3d9..dfef3b19c6 100644
--- a/packages/libetpan/libetpan_0.48.bb
+++ b/packages/libetpan/libetpan_0.48.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
 DEPENDS = "gnutls"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
            file://honor-oe-lflags.patch;patch=1"
diff --git a/packages/libetpan/libetpan_0.52.bb b/packages/libetpan/libetpan_0.52.bb
index 7498728fde..77b2cca39b 100644
--- a/packages/libetpan/libetpan_0.52.bb
+++ b/packages/libetpan/libetpan_0.52.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
 DEPENDS = "gnutls"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz"
 
diff --git a/packages/libeventdb/libeventdb_0.17.bb b/packages/libeventdb/libeventdb_0.17.bb
index e812028262..bb8fbaa9b8 100644
--- a/packages/libeventdb/libeventdb_0.17.bb
+++ b/packages/libeventdb/libeventdb_0.17.bb
@@ -1,5 +1,5 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 headers = "event-db.h"
diff --git a/packages/libeventdb/libeventdb_0.18.bb b/packages/libeventdb/libeventdb_0.18.bb
index 2d96ac525e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.18.bb
+++ b/packages/libeventdb/libeventdb_0.18.bb
@@ -1,3 +1,3 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.19.bb b/packages/libeventdb/libeventdb_0.19.bb
index 2d96ac525e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.19.bb
+++ b/packages/libeventdb/libeventdb_0.19.bb
@@ -1,3 +1,3 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.21.bb b/packages/libeventdb/libeventdb_0.21.bb
index 2d96ac525e..1c9d3ab4bc 100644
--- a/packages/libeventdb/libeventdb_0.21.bb
+++ b/packages/libeventdb/libeventdb_0.21.bb
@@ -1,3 +1,3 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb
index 1456055d07..b3b34d3be9 100644
--- a/packages/libeventdb/libeventdb_0.30.bb
+++ b/packages/libeventdb/libeventdb_0.30.bb
@@ -1,4 +1,4 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libeventdb/libeventdb_0.90.bb b/packages/libeventdb/libeventdb_0.90.bb
index 59f4caf906..f26780ccea 100644
--- a/packages/libeventdb/libeventdb_0.90.bb
+++ b/packages/libeventdb/libeventdb_0.90.bb
@@ -1,4 +1,4 @@
 require libeventdb.inc
 
-FILE_PR = "r2"
+PR = "r2"
 SRC_URI += "file://libeventdb-unbreak-LIVE-macro.patch;patch=1"
diff --git a/packages/libeventdb/libeventdb_svn.bb b/packages/libeventdb/libeventdb_svn.bb
index 645452d96b..132205ee0a 100644
--- a/packages/libeventdb/libeventdb_svn.bb
+++ b/packages/libeventdb/libeventdb_svn.bb
@@ -1,6 +1,6 @@
 require libeventdb.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PV = "0.90+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb
index c5ff22d54c..8382de84f5 100644
--- a/packages/libexif/libexif_0.6.13.bb
+++ b/packages/libexif/libexif_0.6.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG p
 HOMEPAGE = "http://sourceforge.net/projects/libexif"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
 
diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb
index 06f7563ac8..d255f5d862 100644
--- a/packages/libexif/libexif_0.6.9.bb
+++ b/packages/libexif/libexif_0.6.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG p
 HOMEPAGE = "http://sourceforge.net/projects/libexif"
 LICENSE = "LGPL"
 SECTION = "libs"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz"
 
diff --git a/packages/libexosip2/libexosip2_2.2.3.bb b/packages/libexosip2/libexosip2_2.2.3.bb
index 20109b2d32..5251d0e2e2 100644
--- a/packages/libexosip2/libexosip2_2.2.3.bb
+++ b/packages/libexosip2/libexosip2_2.2.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "libosip2"
 SRCNAME = "libeXosip2"
 LEAD_SONAME = "libeXosip2"
 
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz \
            file://simplify-flags.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/libexosip2/libexosip2_3.1.0.bb b/packages/libexosip2/libexosip2_3.1.0.bb
index 960d429735..60bdc0a036 100644
--- a/packages/libexosip2/libexosip2_3.1.0.bb
+++ b/packages/libexosip2/libexosip2_3.1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libosip2"
 SRCNAME = "libeXosip2"
 LEAD_SONAME = "libeXosip2"
 
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz" 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb
index 3eca99bada..946080cf33 100644
--- a/packages/libfakekey/libfakekey_svn.bb
+++ b/packages/libfakekey/libfakekey_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libxtst"
 SECTION = "x11/wm"
 PV = "0.2+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://configure-fix.patch;patch=1"
diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb
index 243e646eee..6b2df35ae1 100644
--- a/packages/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DESCRIPTION = "Foreign Function Interface library"
 LICENSE = "libffi"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools gettext
 
diff --git a/packages/libfribidi/libfribidi_0.10.4.bb b/packages/libfribidi/libfribidi_0.10.4.bb
index edfb13f671..57aaf48bed 100644
--- a/packages/libfribidi/libfribidi_0.10.4.bb
+++ b/packages/libfribidi/libfribidi_0.10.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 
 inherit autotools pkgconfig
 
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/fribidi-${PV}"
 
diff --git a/packages/libftdi/ftdi-eeprom_0.2.bb b/packages/libftdi/ftdi-eeprom_0.2.bb
index 6cb04990ef..c71ac8d0c3 100644
--- a/packages/libftdi/ftdi-eeprom_0.2.bb
+++ b/packages/libftdi/ftdi-eeprom_0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ftdi-eeprom is a flashing utility for FTDI  chips."
 HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi"
 LICENSE = "GPL"
 DEPENDS = "libftdi confuse"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ftdi_eeprom-${PV}.tar.gz \
            file://ftdi_eeprom-0.2-moko.patch;patch=1"
diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb
index 3f31df1ee6..930cfe8640 100644
--- a/packages/libg15/libg15_1.2.1.bb
+++ b/packages/libg15/libg15_1.2.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libusb"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2"
 
diff --git a/packages/libg15render/libg15render_1.2.bb b/packages/libg15render/libg15render_1.2.bb
index b3d4c17d95..e0e2e0bf2c 100644
--- a/packages/libg15render/libg15render_1.2.bb
+++ b/packages/libg15render/libg15render_1.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libg15"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15render-${PV}.tar.bz2"
 
diff --git a/packages/libgcrypt/libgcrypt_1.1.91.bb b/packages/libgcrypt/libgcrypt_1.1.91.bb
index 751d013b90..0eaeaaf9fc 100644
--- a/packages/libgcrypt/libgcrypt_1.1.91.bb
+++ b/packages/libgcrypt/libgcrypt_1.1.91.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
 SECTION = "libs"
 PRIORITY = "optional"
diff --git a/packages/libgcrypt/libgcrypt_1.2.4.bb b/packages/libgcrypt/libgcrypt_1.2.4.bb
index 2134119acb..2fe98d62e3 100644
--- a/packages/libgcrypt/libgcrypt_1.2.4.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.4.bb
@@ -1,3 +1,3 @@
 require libgcrypt.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb
index 722586d56b..db3389b80e 100644
--- a/packages/libgcrypt/libgcrypt_1.4.0.bb
+++ b/packages/libgcrypt/libgcrypt_1.4.0.bb
@@ -1,3 +1,3 @@
 require libgcrypt.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/libglade/libglade_2.0.1.bb b/packages/libglade/libglade_2.0.1.bb
index 285cdafb55..ea7446b092 100644
--- a/packages/libglade/libglade_2.0.1.bb
+++ b/packages/libglade/libglade_2.0.1.bb
@@ -1,6 +1,6 @@
 require libglade.inc
 
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS += "libxml2"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
diff --git a/packages/libglade/libglade_2.4.0.bb b/packages/libglade/libglade_2.4.0.bb
index 4117f93cbe..774331719e 100644
--- a/packages/libglade/libglade_2.4.0.bb
+++ b/packages/libglade/libglade_2.4.0.bb
@@ -1,6 +1,6 @@
 require libglade.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 inherit gnome
 
diff --git a/packages/libglade/libglade_2.4.2.bb b/packages/libglade/libglade_2.4.2.bb
index f0e4e962a9..1565563cdf 100644
--- a/packages/libglade/libglade_2.4.2.bb
+++ b/packages/libglade/libglade_2.4.2.bb
@@ -1,6 +1,6 @@
 require libglade.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gnome
 
diff --git a/packages/libglade/libglade_2.5.1.bb b/packages/libglade/libglade_2.5.1.bb
index 7584b7e1ed..bf6825e03a 100644
--- a/packages/libglade/libglade_2.5.1.bb
+++ b/packages/libglade/libglade_2.5.1.bb
@@ -1,6 +1,6 @@
 require libglade.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/libglade/libglade_2.6.2.bb b/packages/libglade/libglade_2.6.2.bb
index 18678d243c..dace1d3f31 100644
--- a/packages/libglade/libglade_2.6.2.bb
+++ b/packages/libglade/libglade_2.6.2.bb
@@ -1,6 +1,6 @@
 require libglade.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gnome
 
diff --git a/packages/libglademm/libglademm_2.4.1.bb b/packages/libglademm/libglademm_2.4.1.bb
index 4c35ac8788..e36e134c09 100644
--- a/packages/libglademm/libglademm_2.4.1.bb
+++ b/packages/libglademm/libglademm_2.4.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtkmm libglade"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglademm/2.4/libglademm-${PV}.tar.bz2"
 
diff --git a/packages/libgmime/libgmime_2.1.7.bb b/packages/libgmime/libgmime_2.1.7.bb
index 8bd6aaf7fa..39a682eb73 100644
--- a/packages/libgmime/libgmime_2.1.7.bb
+++ b/packages/libgmime/libgmime_2.1.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0"
 
 inherit autotools pkgconfig gnome
 
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-${PV}.tar.gz \
 	   file://skip-iconv-detect.patch;patch=1 \
 	   file://configure-ldflags-cross.patch;patch=1"
diff --git a/packages/libgpelaunch/libgpelaunch_0.14.bb b/packages/libgpelaunch/libgpelaunch_0.14.bb
index 050358a31f..24ee20a1c6 100644
--- a/packages/libgpelaunch/libgpelaunch_0.14.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.14.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
 DEPENDS = "gtk+ startup-notification"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libgpelaunch/libgpelaunch_svn.bb b/packages/libgpelaunch/libgpelaunch_svn.bb
index f256102fe5..c7c3c8e83e 100644
--- a/packages/libgpelaunch/libgpelaunch_svn.bb
+++ b/packages/libgpelaunch/libgpelaunch_svn.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ startup-notification"
 PV = "0.14+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libgpepimc/libgpepimc_0.9.bb b/packages/libgpepimc/libgpepimc_0.9.bb
index ff811e3fa8..e8c4664cf8 100644
--- a/packages/libgpepimc/libgpepimc_0.9.bb
+++ b/packages/libgpepimc/libgpepimc_0.9.bb
@@ -1,4 +1,4 @@
 require libgpepimc.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += " file://get-category-by-name.patch;patch=1"
diff --git a/packages/libgpepimc/libgpepimc_svn.bb b/packages/libgpepimc/libgpepimc_svn.bb
index ca8ddd438a..b195837ed3 100644
--- a/packages/libgpepimc/libgpepimc_svn.bb
+++ b/packages/libgpepimc/libgpepimc_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "libgpewidget gtk+ sqlite"
 PROVIDES = "libgepepimc"
 RPROVIDES = "libgepepimc"
 PV = "0.8+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit pkgconfig autotools
 
diff --git a/packages/libgpeplugin/libgpeplugin_svn.bb b/packages/libgpeplugin/libgpeplugin_svn.bb
index 2048542f25..91eca5abc1 100644
--- a/packages/libgpeplugin/libgpeplugin_svn.bb
+++ b/packages/libgpeplugin/libgpeplugin_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Plugin system for GPE applications"
 AUTHOR = "Luce DeCicco <ldecicco@gmail.com>"
 DEPENDS = "gtk+ libgpewidget"
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libgpevtype/libgpevtype_0.14.bb b/packages/libgpevtype/libgpevtype_0.14.bb
index d62aa1160a..c336c2451b 100644
--- a/packages/libgpevtype/libgpevtype_0.14.bb
+++ b/packages/libgpevtype/libgpevtype_0.14.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Data interchange library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS = "libmimedir libeventdb"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit pkgconfig gpe autotools
 
diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb
index 99a8c43fcb..44388ba37c 100644
--- a/packages/libgpevtype/libgpevtype_svn.bb
+++ b/packages/libgpevtype/libgpevtype_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libmimedir libeventdb libtododb"
 PV = "0.50+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit pkgconfig gpe autotools
 
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index a11f6a690c..39a85c52e6 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
-FILE_PR = "r2"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb
index e290d33459..2aa529f723 100644
--- a/packages/libgpewidget/libgpewidget_0.115.bb
+++ b/packages/libgpewidget/libgpewidget_0.115.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 LICENSE = "LGPL"
 SECTION = "gpe/libs"
 DEPENDS = "gtk+ cairo libxinerama libxrender gtk-doc"
-FILE_PR = "r2"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libgpewidget/libgpewidget_svn.bb b/packages/libgpewidget/libgpewidget_svn.bb
index f47a0d3a6e..324173752d 100644
--- a/packages/libgpewidget/libgpewidget_svn.bb
+++ b/packages/libgpewidget/libgpewidget_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
 PV = "0.114+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libgpg-error/libgpg-error_0.6.bb b/packages/libgpg-error/libgpg-error_0.6.bb
index 19ac4c524f..4929121167 100644
--- a/packages/libgpg-error/libgpg-error_0.6.bb
+++ b/packages/libgpg-error/libgpg-error_0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GPG-Error library"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz"
 
diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb
index 197f21abb3..edbe91afea 100644
--- a/packages/libgpg-error/libgpg-error_0.7.bb
+++ b/packages/libgpg-error/libgpg-error_0.7.bb
@@ -1,6 +1,6 @@
 require libgpg-error.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \
 	   file://pkgconfig.patch;patch=1"
diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb
index 1f0f1603e3..bdbbed0b34 100644
--- a/packages/libgpg-error/libgpg-error_1.0.bb
+++ b/packages/libgpg-error/libgpg-error_1.0.bb
@@ -1,3 +1,3 @@
 require libgpg-error.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb
index 1f0f1603e3..bdbbed0b34 100644
--- a/packages/libgpg-error/libgpg-error_1.3.bb
+++ b/packages/libgpg-error/libgpg-error_1.3.bb
@@ -1,3 +1,3 @@
 require libgpg-error.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libgpg-error/libgpg-error_1.4.bb b/packages/libgpg-error/libgpg-error_1.4.bb
index 1f0f1603e3..bdbbed0b34 100644
--- a/packages/libgpg-error/libgpg-error_1.4.bb
+++ b/packages/libgpg-error/libgpg-error_1.4.bb
@@ -1,3 +1,3 @@
 require libgpg-error.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libgphoto2/libgphoto2_2.4.0.bb b/packages/libgphoto2/libgphoto2_2.4.0.bb
index 4135c41903..c6f63374cc 100644
--- a/packages/libgphoto2/libgphoto2_2.4.0.bb
+++ b/packages/libgphoto2/libgphoto2_2.4.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "libtool jpeg libusb libexif"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
 
diff --git a/packages/libgsf/libgsf_1.10.0.bb b/packages/libgsf/libgsf_1.10.0.bb
index b69d90405e..ce464feba9 100644
--- a/packages/libgsf/libgsf_1.10.0.bb
+++ b/packages/libgsf/libgsf_1.10.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 
diff --git a/packages/libgsf/libgsf_1.12.0.bb b/packages/libgsf/libgsf_1.12.0.bb
index 623f0b6437..2698639873 100644
--- a/packages/libgsf/libgsf_1.12.0.bb
+++ b/packages/libgsf/libgsf_1.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 
diff --git a/packages/libgsf/libgsf_1.12.1.bb b/packages/libgsf/libgsf_1.12.1.bb
index 7b35fda441..310d922d6e 100644
--- a/packages/libgsf/libgsf_1.12.1.bb
+++ b/packages/libgsf/libgsf_1.12.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 
diff --git a/packages/libgsf/libgsf_1.12.2.bb b/packages/libgsf/libgsf_1.12.2.bb
index ebadc1be80..02e95718dd 100644
--- a/packages/libgsf/libgsf_1.12.2.bb
+++ b/packages/libgsf/libgsf_1.12.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 
diff --git a/packages/libgsf/libgsf_1.13.2.bb b/packages/libgsf/libgsf_1.13.2.bb
index fdda508d11..caeb4e4dc9 100644
--- a/packages/libgsf/libgsf_1.13.2.bb
+++ b/packages/libgsf/libgsf_1.13.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 
diff --git a/packages/libgsf/libgsf_1.13.3.bb b/packages/libgsf/libgsf_1.13.3.bb
index 97c746c37d..1f793b1143 100644
--- a/packages/libgsf/libgsf_1.13.3.bb
+++ b/packages/libgsf/libgsf_1.13.3.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 RDEPENDS = "gconf gnome-vfs"
diff --git a/packages/libgsf/libgsf_1.14.8.bb b/packages/libgsf/libgsf_1.14.8.bb
index 81005fc3ee..43fd3ab9c7 100644
--- a/packages/libgsf/libgsf_1.14.8.bb
+++ b/packages/libgsf/libgsf_1.14.8.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "libs"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
 RDEPENDS = "gconf gnome-vfs"
diff --git a/packages/libgsm/libgsm_1.0.10.bb b/packages/libgsm/libgsm_1.0.10.bb
index c0eccbcf7f..93d042ed36 100644
--- a/packages/libgsm/libgsm_1.0.10.bb
+++ b/packages/libgsm/libgsm_1.0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 #DEPENDS = ""
 LICENSE = "libgsm"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit pkgconfig gpe
 
diff --git a/packages/libgtkinput/libgtkinput_0.3.bb b/packages/libgtkinput/libgtkinput_0.3.bb
index dc6e70c06f..45da1548d6 100644
--- a/packages/libgtkinput/libgtkinput_0.3.bb
+++ b/packages/libgtkinput/libgtkinput_0.3.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
 GPE_TARBALL_SUFFIX = "bz2"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit gpe autotools
 
diff --git a/packages/libgtkstylus/libgtkstylus_0.1.bb b/packages/libgtkstylus/libgtkstylus_0.1.bb
index 78fb40b5ef..cc624a4684 100644
--- a/packages/libgtkstylus/libgtkstylus_0.1.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GTK plugin for stylus based systems"
 SECTION = "libs"
 DEPENDS = "gtk+"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "LGPL"
 FILES_${PN} = "/etc ${libdir}/gtk-2.0"
 
diff --git a/packages/libgtkstylus/libgtkstylus_0.3.bb b/packages/libgtkstylus/libgtkstylus_0.3.bb
index e184a43866..e19a8a9f26 100644
--- a/packages/libgtkstylus/libgtkstylus_0.3.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GTK plugin for stylus based systems"
 SECTION = "libs"
 DEPENDS = "gtk+"
 LICENSE = "LGPL"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools
 
diff --git a/packages/libgtkstylus/libgtkstylus_svn.bb b/packages/libgtkstylus/libgtkstylus_svn.bb
index 1aebbf8f12..33122345a7 100644
--- a/packages/libgtkstylus/libgtkstylus_svn.bb
+++ b/packages/libgtkstylus/libgtkstylus_svn.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
 PV = "0.3+svn${SRCDATE}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools
 
diff --git a/packages/libhal-nm/libhal-nm_0.0.2.bb b/packages/libhal-nm/libhal-nm_0.0.2.bb
index 2b1cbf85f8..60bcca07b9 100644
--- a/packages/libhal-nm/libhal-nm_0.0.2.bb
+++ b/packages/libhal-nm/libhal-nm_0.0.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "glib-2.0"
 SRC_URI = "http://www.handhelds.org/~mmp/files/libhal-nm-${PV}.tar.gz"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/libhandoff/libhandoff_svn.bb b/packages/libhandoff/libhandoff_svn.bb
index 510027110c..c545d9270e 100644
--- a/packages/libhandoff/libhandoff_svn.bb
+++ b/packages/libhandoff/libhandoff_svn.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 DEPENDS  = "glib-2.0"
 PV = "0.1+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 inherit pkgconfig gpe autotools
diff --git a/packages/libhangul/libhangul_0.0.4.bb b/packages/libhangul/libhangul_0.0.4.bb
index 5644a0e691..289dc33dc1 100644
--- a/packages/libhangul/libhangul_0.0.4.bb
+++ b/packages/libhangul/libhangul_0.0.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://kldp.net/projects/hangul/"
 SECTION = "x11/input"
 LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://kldp.net/frs/download.php/3733/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libical/libical_0.27.bb b/packages/libical/libical_0.27.bb
index 28a827014f..b41b2e688a 100644
--- a/packages/libical/libical_0.27.bb
+++ b/packages/libical/libical_0.27.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
 HOMEPAGE = "http://www.softwarestudio.org/softwarestudio/app.php/libical"
 SECTION = "libs"
 LICENSE = "LGPL / MPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz \
            file://pthread-link.patch;patch=1"
diff --git a/packages/libiconv/libiconv_1.11.bb b/packages/libiconv/libiconv_1.11.bb
index 8192fcd531..de87486a87 100644
--- a/packages/libiconv/libiconv_1.11.bb
+++ b/packages/libiconv/libiconv_1.11.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 PROVIDES = "virtual/libiconv"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "LGPL"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"
 
diff --git a/packages/libid3tag/libid3tag_0.15.1b.bb b/packages/libid3tag/libid3tag_0.15.1b.bb
index b9d8508c4c..c9f4a0c0ba 100644
--- a/packages/libid3tag/libid3tag_0.15.1b.bb
+++ b/packages/libid3tag/libid3tag_0.15.1b.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 DEPENDS = "zlib"
 DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
            file://id3tag.pc"
diff --git a/packages/libidl/libidl_0.8.10.bb b/packages/libidl/libidl_0.8.10.bb
index 532b077a27..c6664acb23 100644
--- a/packages/libidl/libidl_0.8.10.bb
+++ b/packages/libidl/libidl_0.8.10.bb
@@ -2,7 +2,7 @@ require libidl.inc
 
 DEPENDS = "glib-2.0 libidl-native"
 
-FILE_PR = "r0"
+PR = "r0"
 
 BINCONFIG_GLOB = "*-config-2"
 inherit autotools pkgconfig binconfig
diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb
index 94b550e6e3..b451ada539 100644
--- a/packages/libidl/libidl_0.8.2.bb
+++ b/packages/libidl/libidl_0.8.2.bb
@@ -1,3 +1,3 @@
 require libidl.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index 639c5fbadd..c4586f94f8 100644
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -2,7 +2,7 @@ require libidl.inc
 
 DEPENDS = "glib-2.0"
 
-FILE_PR = "r3"
+PR = "r3"
 
 # Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
 # strange reason - so we do some sed fu to fix the path there
diff --git a/packages/libjson/libjson_0.6.bb b/packages/libjson/libjson_0.6.bb
index 0b9c0324b2..4c93e82a0b 100644
--- a/packages/libjson/libjson_0.6.bb
+++ b/packages/libjson/libjson_0.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
 S = "${WORKDIR}/json-c-${PV}"
diff --git a/packages/liblockfile/liblockfile_1.06.bb b/packages/liblockfile/liblockfile_1.06.bb
index 6a13c58bef..a59259cc62 100644
--- a/packages/liblockfile/liblockfile_1.06.bb
+++ b/packages/liblockfile/liblockfile_1.06.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "File locking library."
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
 	   file://install.patch;patch=1 \
diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb
index a0b3fa2f8c..005e89eb5e 100644
--- a/packages/libmad/libmad_0.15.0b.bb
+++ b/packages/libmad/libmad_0.15.0b.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
 S = "${WORKDIR}/libmad-${PV}"
diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb
index a967e49c6e..4a75c2d927 100644
--- a/packages/libmad/libmad_0.15.1b.bb
+++ b/packages/libmad/libmad_0.15.1b.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
            file://add-pkgconfig.patch;patch=1 \
diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
index e1d9df54b6..e5f5bfe158 100644
--- a/packages/libmailwrapper/libmailwrapper_1.2.2.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 
diff --git a/packages/libmailwrapper/libmailwrapper_1.2.3.bb b/packages/libmailwrapper/libmailwrapper_1.2.3.bb
index 00c9886b7b..c3fcddf49b 100644
--- a/packages/libmailwrapper/libmailwrapper_1.2.3.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper"
diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb
index 5d85993def..56cf1040e4 100644
--- a/packages/libmailwrapper/libmailwrapper_cvs.bb
+++ b/packages/libmailwrapper/libmailwrapper_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper"
diff --git a/packages/libmatchbox/libmatchbox.inc b/packages/libmatchbox/libmatchbox.inc
index d1aec3b663..71682b336a 100644
--- a/packages/libmatchbox/libmatchbox.inc
+++ b/packages/libmatchbox/libmatchbox.inc
@@ -2,7 +2,7 @@ SECTION = "x11/libs"
 DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb
index 7406060c0c..b462dc5aca 100644
--- a/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,5 +1,5 @@
 require libmatchbox.inc
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "\
   http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
diff --git a/packages/libmatthew/libmatthew_0.7.1.bb b/packages/libmatthew/libmatthew_0.7.1.bb
index bedac3bbc8..2a3092cda5 100644
--- a/packages/libmatthew/libmatthew_0.7.1.bb
+++ b/packages/libmatthew/libmatthew_0.7.1.bb
@@ -1,6 +1,6 @@
 require libmatthew.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
            file://Makefile-0.7.patch;patch=1"
diff --git a/packages/libmatthew/libmatthew_0.7.bb b/packages/libmatthew/libmatthew_0.7.bb
index 54a0477f0c..054881cf9b 100644
--- a/packages/libmatthew/libmatthew_0.7.bb
+++ b/packages/libmatthew/libmatthew_0.7.bb
@@ -1,6 +1,6 @@
 require libmatthew.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
            file://Makefile-0.7.patch;patch=1"
diff --git a/packages/libmikmod/libmikmod_3.1.12.bb b/packages/libmikmod/libmikmod_3.1.12.bb
index bb9872d00a..f1ed9d672c 100644
--- a/packages/libmikmod/libmikmod_3.1.12.bb
+++ b/packages/libmikmod/libmikmod_3.1.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libmikmod is a module player library supporting many formats, inc
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
diff --git a/packages/libmimedir/libmimedir_0.0-20040307.bb b/packages/libmimedir/libmimedir_0.0-20040307.bb
index e54f94919c..98c410a736 100644
--- a/packages/libmimedir/libmimedir_0.0-20040307.bb
+++ b/packages/libmimedir/libmimedir_0.0-20040307.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/libmimedir-snapshot-20040307.tar.gz"
 S = "${WORKDIR}/libmimedir"
diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index 97dbaa3b82..2429b798c2 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-FILE_PR = "r4"
+PR = "r4"
 
 # 0.3.1 has at least 2 known bugs which may lead to data corruption/loss:
 # 1. Arbitrary cutting off of NOTE field during parsing.
diff --git a/packages/libmimedir/libmimedir_0.4.2.bb b/packages/libmimedir/libmimedir_0.4.2.bb
index bc7a28cbd8..2f7cc4c3e8 100644
--- a/packages/libmimedir/libmimedir_0.4.2.bb
+++ b/packages/libmimedir/libmimedir_0.4.2.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig gpe
 
diff --git a/packages/libmimedir/libmimedir_svn.bb b/packages/libmimedir/libmimedir_svn.bb
index c238bcb26c..8bd7cc47ca 100644
--- a/packages/libmimedir/libmimedir_svn.bb
+++ b/packages/libmimedir/libmimedir_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "intltool-native"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.4.1+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN}"
 
diff --git a/packages/libmpcdec/libmpcdec_1.2.6.bb b/packages/libmpcdec/libmpcdec_1.2.6.bb
index 7faf0c8690..43249248a2 100644
--- a/packages/libmpcdec/libmpcdec_1.2.6.bb
+++ b/packages/libmpcdec/libmpcdec_1.2.6.bb
@@ -3,7 +3,7 @@ AUTHOR = "Meni Berman <musepack@gmail.com>"
 HOMEPAGE = "http://www.musepack.net"
 SECTION = "libs"
 LICENSE = "BSD GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://files.musepack.net/source/libmpcdec-${PV}.tar.bz2"
 
diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb
index 9fc3212847..c633327181 100644
--- a/packages/libnet/libnet_1.0.2a.bb
+++ b/packages/libnet/libnet_1.0.2a.bb
@@ -4,7 +4,7 @@ portable framework for low-level network packet shaping, \
 handling, and injection."
 SECTION = "libs/network"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 # There are major API changes beween libnet v1.0 and libnet v1.1
 PROVIDES = "libnet-1.0"
diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb
index a9712517db..cb7700ac93 100644
--- a/packages/libnet/libnet_1.1.2.1.bb
+++ b/packages/libnet/libnet_1.1.2.1.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 DEPENDS = "libpcap"
 # There are major API changes beween libnet v1.0 and libnet v1.1
 PROVIDES = "libnet-1.1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \
            file://support-uclibc.patch;patch=1 \
diff --git a/packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb b/packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
index cebf0bc765..97af3a7da5 100644
--- a/packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
+++ b/packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
@@ -5,7 +5,7 @@ system that deprecates the old ip_queue / libipq mechanism."
 SECTION = "devel/libs"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html"
-FILE_PR = "r0"
+PR = "r0"
 
 
 # This package requires libtool-cross-1.5.24 which is not the default libtool
diff --git a/packages/libnfnetlink/libnfnetlink_0.0.30.bb b/packages/libnfnetlink/libnfnetlink_0.0.30.bb
index d743aa93ea..d3e3cabdc7 100644
--- a/packages/libnfnetlink/libnfnetlink_0.0.30.bb
+++ b/packages/libnfnetlink/libnfnetlink_0.0.30.bb
@@ -7,7 +7,7 @@ management tools in userspace."
 SECTION = "devel/libs"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2"
 
diff --git a/packages/libnids/libnids_1.18.bb b/packages/libnids/libnids_1.18.bb
index 24fa9f32a7..cf887457a2 100644
--- a/packages/libnids/libnids_1.18.bb
+++ b/packages/libnids/libnids_1.18.bb
@@ -4,7 +4,7 @@ scan detection."
 LICENSE = "GPL"
 SECTION = "libs"
 DEPENDS = "libnet-1.0 libpcap"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
diff --git a/packages/libnotify/libnotify_0.4.4.bb b/packages/libnotify/libnotify_0.4.4.bb
index 3376c4bcac..9152133b4d 100644
--- a/packages/libnotify/libnotify_0.4.4.bb
+++ b/packages/libnotify/libnotify_0.4.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.galago-project.org/"
 SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "dbus gtk+"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
 
diff --git a/packages/libnss-mdns/libnss-mdns_0.9.bb b/packages/libnss-mdns/libnss-mdns_0.9.bb
index 6e522a774b..171ff5113b 100644
--- a/packages/libnss-mdns/libnss-mdns_0.9.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.9.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 
 RRECOMMENDS_${PN} = "zeroconf"
-FILE_PR = "r0"
+PR = "r0"
 
 EXTRA_OECONF = "--libdir=/lib"
 S = "${WORKDIR}/nss-mdns-${PV}"
diff --git a/packages/libogg/libogg_1.0.bb b/packages/libogg/libogg_1.0.bb
index 96a28af32e..7af1468004 100644
--- a/packages/libogg/libogg_1.0.bb
+++ b/packages/libogg/libogg_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "libogg is the bitstream and framing library \
 for the Ogg project. It provides functions which are \
 necessary to codec libraries like libvorbis."
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libogg-${PV}.tar.gz"
 
diff --git a/packages/libogg/libogg_1.1.bb b/packages/libogg/libogg_1.1.bb
index d5b7b0283a..687b4decec 100644
--- a/packages/libogg/libogg_1.1.bb
+++ b/packages/libogg/libogg_1.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "libogg is the bitstream and framing library \
 for the Ogg project. It provides functions which are \
 necessary to codec libraries like libvorbis."
 LICENSE = "BSD"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \
 file://m4.patch;patch=1"
diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb
index 84ab2d78c2..44b4b5e088 100644
--- a/packages/liboil/liboil_0.3.11.bb
+++ b/packages/liboil/liboil_0.3.11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
 HOMEPAGE = "http://liboil.freedesktop.org/"
 LICENSE = "various"
-FILE_PR ="r2"
+PR ="r2"
 
 DEPENDS = "glib-2.0"
 
diff --git a/packages/liboil/liboil_0.3.15.bb b/packages/liboil/liboil_0.3.15.bb
index 0610cb4ecf..338121ac66 100644
--- a/packages/liboil/liboil_0.3.15.bb
+++ b/packages/liboil/liboil_0.3.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
 HOMEPAGE = "http://liboil.freedesktop.org/"
 LICENSE = "various"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "glib-2.0"
 
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb
index 17ded2f138..7dc48f92df 100644
--- a/packages/libol/libol_0.3.18.bb
+++ b/packages/libol/libol_0.3.18.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A tiny C support library"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
 
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 78306bfaf3..8409e4c523 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 80df824781..d0f9e9e17a 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_1.2.4.bb b/packages/libopie/libopie2_1.2.4.bb
index d36ae21da9..ef1a4fb360 100644
--- a/packages/libopie/libopie2_1.2.4.bb
+++ b/packages/libopie/libopie2_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index fb81c9a2d4..c9f11b23e2 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r12"
+PR = "r12"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libopieobex/libopieobex0_1.2.3.bb b/packages/libopieobex/libopieobex0_1.2.3.bb
index 3e7fce5f9f..047dcee6e6 100644
--- a/packages/libopieobex/libopieobex0_1.2.3.bb
+++ b/packages/libopieobex/libopieobex0_1.2.3.bb
@@ -1,5 +1,5 @@
 require libopieobex0.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/libopieobex/libopieobex0_1.2.4.bb b/packages/libopieobex/libopieobex0_1.2.4.bb
index 1e18be0f8c..5e02c8860d 100644
--- a/packages/libopieobex/libopieobex0_1.2.4.bb
+++ b/packages/libopieobex/libopieobex0_1.2.4.bb
@@ -1,5 +1,5 @@
 require libopieobex0.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index a4fc4a7c16..50c36686a9 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,6 +1,6 @@
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/libopietooth/libopietooth1_1.2.3.bb b/packages/libopietooth/libopietooth1_1.2.3.bb
index a17fcebe7f..cb625ff687 100644
--- a/packages/libopietooth/libopietooth1_1.2.3.bb
+++ b/packages/libopietooth/libopietooth1_1.2.3.bb
@@ -1,4 +1,4 @@
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
-FILE_PR = "r0"
+PR = "r0"
 
 require libopietooth1.inc
diff --git a/packages/libopietooth/libopietooth1_1.2.4.bb b/packages/libopietooth/libopietooth1_1.2.4.bb
index a17fcebe7f..cb625ff687 100644
--- a/packages/libopietooth/libopietooth1_1.2.4.bb
+++ b/packages/libopietooth/libopietooth1_1.2.4.bb
@@ -1,4 +1,4 @@
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
-FILE_PR = "r0"
+PR = "r0"
 
 require libopietooth1.inc
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index 31af3dcc0f..d58832315e 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,5 +1,5 @@
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 require libopietooth1.inc
diff --git a/packages/libosip/libosip_0.9.7.bb b/packages/libosip/libosip_0.9.7.bb
index d3647be0a1..578c8f38a5 100644
--- a/packages/libosip/libosip_0.9.7.bb
+++ b/packages/libosip/libosip_0.9.7.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 SRC_URI = "http://handhelds.org/packages/libosip/libosip-0.9.7-hh2.tar.gz"
 DESCRIPTION = "Session Initiation Protocol (SIP) library"
 LEAD_SONAME = "libosip\..*"
-FILE_PR = "hh2r0"
+PR = "hh2r0"
 LICENSE = "LGPL"
 S = "${WORKDIR}/libosip-0.9.7-hh2"
 
diff --git a/packages/libosip2/libosip2_2.2.2.bb b/packages/libosip2/libosip2_2.2.2.bb
index 74a99211a8..2258309db9 100644
--- a/packages/libosip2/libosip2_2.2.2.bb
+++ b/packages/libosip2/libosip2_2.2.2.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DESCRIPTION = "Session Initiation Protocol (SIP) library"
 LEAD_SONAME = "libosip2\..*"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "LGPL"
 SRC_URI = "${GNU_MIRROR}/osip/libosip2-${PV}.tar.gz"
 
diff --git a/packages/libosip2/libosip2_3.1.0.bb b/packages/libosip2/libosip2_3.1.0.bb
index 8d3b5c258a..0c6e23ce17 100644
--- a/packages/libosip2/libosip2_3.1.0.bb
+++ b/packages/libosip2/libosip2_3.1.0.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DESCRIPTION = "Session Initiation Protocol (SIP) library"
 LEAD_SONAME = "libosip2\..*"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "LGPL"
 SRC_URI = "${GNU_MIRROR}/osip/libosip2-${PV}.tar.gz"
 
diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb
index 251a2341b7..d5042b78a1 100644
--- a/packages/libowl/libowl_svn.bb
+++ b/packages/libowl/libowl_svn.bb
@@ -13,7 +13,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "gtk+"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 PACKAGES = ""
 
diff --git a/packages/libpcap/libpcap_0.9.3.bb b/packages/libpcap/libpcap_0.9.3.bb
index 675b8b594b..865e57ab93 100644
--- a/packages/libpcap/libpcap_0.9.3.bb
+++ b/packages/libpcap/libpcap_0.9.3.bb
@@ -1,3 +1,3 @@
 require libpcap.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/libpcap/libpcap_0.9.5.bb b/packages/libpcap/libpcap_0.9.5.bb
index 675b8b594b..865e57ab93 100644
--- a/packages/libpcap/libpcap_0.9.5.bb
+++ b/packages/libpcap/libpcap_0.9.5.bb
@@ -1,3 +1,3 @@
 require libpcap.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/libpcap/libpcap_0.9.8.bb b/packages/libpcap/libpcap_0.9.8.bb
index 5bedea446b..8003d4491f 100644
--- a/packages/libpcap/libpcap_0.9.8.bb
+++ b/packages/libpcap/libpcap_0.9.8.bb
@@ -1,5 +1,5 @@
 require libpcap.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://aclocal.patch;patch=1"
diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb
index 2304218ad8..eb5af03db0 100644
--- a/packages/libpcre/libpcre_7.6.bb
+++ b/packages/libpcre/libpcre_7.6.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch;patch=1"
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index df06e4a94a..ac0fd43379 100644
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -1,6 +1,6 @@
 require libpng.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://makefile_fix.patch;patch=1"
 
diff --git a/packages/libpng/libpng_1.2.20.bb b/packages/libpng/libpng_1.2.20.bb
index 020b6e7688..aee9ff14ec 100644
--- a/packages/libpng/libpng_1.2.20.bb
+++ b/packages/libpng/libpng_1.2.20.bb
@@ -1,6 +1,6 @@
 require libpng.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://makefile_fix.patch;patch=1"
 
diff --git a/packages/libpng/libpng_1.2.31.bb b/packages/libpng/libpng_1.2.31.bb
index 020b6e7688..aee9ff14ec 100644
--- a/packages/libpng/libpng_1.2.31.bb
+++ b/packages/libpng/libpng_1.2.31.bb
@@ -1,6 +1,6 @@
 require libpng.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://makefile_fix.patch;patch=1"
 
diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb
index b576e2bc88..3b0dd2d3bf 100644
--- a/packages/libqanava/libqanava_0.0.7.bb
+++ b/packages/libqanava/libqanava_0.0.7.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
 HOMEPAGE = "http://www.libqanava.org/"
 # LGPL after 0.0.7
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz"
 S = "${WORKDIR}/qanava-${PV}"
diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
index 23ff95e15a..009a075091 100644
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ b/packages/libqpe/libqpe-opie_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r3"
+PR = "r3"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb
index be3897cd47..0822385b9d 100644
--- a/packages/libqpe/libqpe-opie_1.2.3.bb
+++ b/packages/libqpe/libqpe-opie_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r3"
+PR = "r3"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/packages/libqpe/libqpe-opie_1.2.4.bb b/packages/libqpe/libqpe-opie_1.2.4.bb
index 234f2d3a14..8c2abc7af6 100644
--- a/packages/libqpe/libqpe-opie_1.2.4.bb
+++ b/packages/libqpe/libqpe-opie_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 5e2f75d67e..d3b17ac7ee 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
diff --git a/packages/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb
index 307fef6ac9..f2123ea24f 100644
--- a/packages/librsvg/librsvg_2.11.1.bb
+++ b/packages/librsvg/librsvg_2.11.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/packages/librsvg/librsvg_2.16.1.bb b/packages/librsvg/librsvg_2.16.1.bb
index fd5df10830..c7154e7157 100644
--- a/packages/librsvg/librsvg_2.16.1.bb
+++ b/packages/librsvg/librsvg_2.16.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
diff --git a/packages/librsync/librsync_0.9.7.bb b/packages/librsync/librsync_0.9.7.bb
index 15b8ae3f33..eb8bb2671c 100644
--- a/packages/librsync/librsync_0.9.7.bb
+++ b/packages/librsync/librsync_0.9.7.bb
@@ -5,7 +5,7 @@ sending end."
 HOMEPAGE = "http://librsync.sourceforge.net/"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/librsync/librsync-${PV}.tar.gz"
 
diff --git a/packages/libsamplerate/libsamplerate0_0.1.2.bb b/packages/libsamplerate/libsamplerate0_0.1.2.bb
index 32c33ff782..78a7f403d4 100644
--- a/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ b/packages/libsamplerate/libsamplerate0_0.1.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An audio Sample Rate Conversion library"
 SECTION = "libs"
 LICENSE = "GPL libsamplerate"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
 S = "${WORKDIR}/libsamplerate-${PV}"
diff --git a/packages/libschedule/libschedule_0.14.bb b/packages/libschedule/libschedule_0.14.bb
index 88f35bb604..11729b095e 100644
--- a/packages/libschedule/libschedule_0.14.bb
+++ b/packages/libschedule/libschedule_0.14.bb
@@ -1,5 +1,5 @@
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
diff --git a/packages/libschedule/libschedule_0.15.bb b/packages/libschedule/libschedule_0.15.bb
index 4574578c24..77c6a97f81 100644
--- a/packages/libschedule/libschedule_0.15.bb
+++ b/packages/libschedule/libschedule_0.15.bb
@@ -1,5 +1,5 @@
 LICENSE = "LGPL"
-FILE_PR = "r3"
+PR = "r3"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
diff --git a/packages/libschedule/libschedule_0.16.bb b/packages/libschedule/libschedule_0.16.bb
index 7dc3300673..ad8cb72712 100644
--- a/packages/libschedule/libschedule_0.16.bb
+++ b/packages/libschedule/libschedule_0.16.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 sqlite libgpewidget"
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libschedule/libschedule_0.17.bb b/packages/libschedule/libschedule_0.17.bb
index 7dc3300673..ad8cb72712 100644
--- a/packages/libschedule/libschedule_0.17.bb
+++ b/packages/libschedule/libschedule_0.17.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 sqlite libgpewidget"
-FILE_PR = "r0"
+PR = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
diff --git a/packages/libschedule/libschedule_svn.bb b/packages/libschedule/libschedule_svn.bb
index 3838d81558..1095c2de32 100644
--- a/packages/libschedule/libschedule_svn.bb
+++ b/packages/libschedule/libschedule_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 sqlite libgpewidget"
 PV = "0.16+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools pkgconfig gpe
 
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 199945e4bc..2da8fce1b6 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -1,6 +1,6 @@
 require libsdl-image.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "\
   file://autotools.patch;patch=1 \
diff --git a/packages/libsdl/libsdl-image_1.2.6.bb b/packages/libsdl/libsdl-image_1.2.6.bb
index b458e19dba..99fd98f508 100644
--- a/packages/libsdl/libsdl-image_1.2.6.bb
+++ b/packages/libsdl/libsdl-image_1.2.6.bb
@@ -1,5 +1,5 @@
 require libsdl-image.inc
-FILE_PR= "r1"
+PR = "r1"
 
 DEPENDS += "tiff"
 
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index c1ebbbc974..84841d9741 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libmikmod"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_mixer-${PV}"
diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb
index 144adf68c2..fb8e12a4c9 100644
--- a/packages/libsdl/libsdl-native_1.2.11.bb
+++ b/packages/libsdl/libsdl-native_1.2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple DirectMedia Layer - native Edition"
 HOMEPAGE = "http://www.libsdl.org"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://acinclude.m4 \
diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb
index 1346b5695a..8cbea5bd01 100644
--- a/packages/libsdl/libsdl-net_1.2.7.bb
+++ b/packages/libsdl/libsdl-net_1.2.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
 	   file://libtool2.patch;patch=1 \
diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb
index 658444ec22..250fb698ce 100644
--- a/packages/libsdl/libsdl-ttf_2.0.3.bb
+++ b/packages/libsdl/libsdl-ttf_2.0.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl freetype"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
            file://new-freetype-includes.patch;patch=1"
diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb
index e9628d9e07..ab349d6306 100644
--- a/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@ -3,7 +3,7 @@ require libsdl.inc
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
diff --git a/packages/libsexy/libsexy_0.1.10.bb b/packages/libsexy/libsexy_0.1.10.bb
index f2a16f91ea..042ea757e9 100644
--- a/packages/libsexy/libsexy_0.1.10.bb
+++ b/packages/libsexy/libsexy_0.1.10.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb
index 5bf01ad8c7..91784ffb49 100644
--- a/packages/libsexy/libsexy_0.1.11.bb
+++ b/packages/libsexy/libsexy_0.1.11.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb
index f2a16f91ea..042ea757e9 100644
--- a/packages/libsexy/libsexy_0.1.6.bb
+++ b/packages/libsexy/libsexy_0.1.6.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
index 5bf01ad8c7..91784ffb49 100644
--- a/packages/libsexy/libsexy_0.1.8.bb
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/libsidplay/libsidplay_1.36.59.bb b/packages/libsidplay/libsidplay_1.36.59.bb
index d04dd5ea69..9ca4ee13c4 100644
--- a/packages/libsidplay/libsidplay_1.36.59.bb
+++ b/packages/libsidplay/libsidplay_1.36.59.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz \
            http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
index 50c6589c4e..072492da80 100644
--- a/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
+++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A library for loose coupling of C++ method calls"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1 \
diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
index 33ae48b26b..75e830fd2b 100644
--- a/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
+++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A library for loose coupling of C++ method calls"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1 \
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
index 879698e2cb..222c5bd86a 100644
--- a/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A library for loose coupling of C++ method calls"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
            file://define_sigc_api.patch;patch=1 "
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
index b3465fb377..0009990d79 100644
--- a/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.0.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A library for loose coupling of C++ method calls"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL LGPL"
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
 	   file://define_sigc_api.patch;patch=1"
diff --git a/packages/libsigcx/libsigcx0_0.6.4.bb b/packages/libsigcx/libsigcx0_0.6.4.bb
index 4a14fe9c59..1f070fc1d7 100644
--- a/packages/libsigcx/libsigcx0_0.6.4.bb
+++ b/packages/libsigcx/libsigcx0_0.6.4.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libsigc++-1.2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libsigcx/libsigcx-${PV}.tar.gz \
   file://libsigcx-0.6.4-add-missing-autogen-sh-swb.patch;patch=1 \
diff --git a/packages/libsndfile/libsndfile1_1.0.16.bb b/packages/libsndfile/libsndfile1_1.0.16.bb
index d9efbad04b..165ef6d38f 100644
--- a/packages/libsndfile/libsndfile1_1.0.16.bb
+++ b/packages/libsndfile/libsndfile1_1.0.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
 AUTHOR = "Erik de Castro Lopo"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz"
 S = "${WORKDIR}/libsndfile-${PV}"
diff --git a/packages/libsndfile/libsndfile1_1.0.17.bb b/packages/libsndfile/libsndfile1_1.0.17.bb
index 87fcbe95cc..670f75b3fc 100644
--- a/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
 AUTHOR = "Erik de Castro Lopo"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1"
diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb
index e40a876c57..1f28e718bc 100644
--- a/packages/libtiff/tiff_3.7.2.bb
+++ b/packages/libtiff/tiff_3.7.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This software provides support for the Tag Image File Format (TIF
 LICENSE = ""
 HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 DEPENDS = "zlib jpeg lzo"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz \
 	  file://configure.patch;patch=1"
diff --git a/packages/libtododb/libtododb_svn.bb b/packages/libtododb/libtododb_svn.bb
index 682eb2add6..a0263f27ac 100644
--- a/packages/libtododb/libtododb_svn.bb
+++ b/packages/libtododb/libtododb_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libgpewidget libgpepimc sqlite"
 PV = "0.10+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit pkgconfig gpe autotools
 
diff --git a/packages/libtomcrypt/libtomcrypt_1.17.bb b/packages/libtomcrypt/libtomcrypt_1.17.bb
index 9dcc2847ff..1d0c664464 100644
--- a/packages/libtomcrypt/libtomcrypt_1.17.bb
+++ b/packages/libtomcrypt/libtomcrypt_1.17.bb
@@ -7,7 +7,7 @@ routines."
 SECTION = "libs/network"
 PRIORITY = "optional"
 LICENSE = "PD"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://libtom.org/files/crypt-${PV}.tar.bz2"
 
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 95403b7f9f..7374f107de 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r10"
+PR = "r10"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://rpath-control.patch;patch=1 \
diff --git a/packages/libtool/libtool-cross_1.5.22.bb b/packages/libtool/libtool-cross_1.5.22.bb
index d99db88135..c44b0512ee 100644
--- a/packages/libtool/libtool-cross_1.5.22.bb
+++ b/packages/libtool/libtool-cross_1.5.22.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
diff --git a/packages/libtool/libtool-cross_1.5.24.bb b/packages/libtool/libtool-cross_1.5.24.bb
index 61ea95fac8..cf6cc18ef6 100644
--- a/packages/libtool/libtool-cross_1.5.24.bb
+++ b/packages/libtool/libtool-cross_1.5.24.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
diff --git a/packages/libtool/libtool-cross_2.2.4.bb b/packages/libtool/libtool-cross_2.2.4.bb
index 6e6e29bec2..9b3c6d78ea 100644
--- a/packages/libtool/libtool-cross_2.2.4.bb
+++ b/packages/libtool/libtool-cross_2.2.4.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r23"
+PR = "r23"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index b240ca0e7c..59b323d8ff 100644
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r10"
+PR = "r10"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \
diff --git a/packages/libtool/libtool-native_1.5.22.bb b/packages/libtool/libtool-native_1.5.22.bb
index 6210339990..16db0bb65b 100644
--- a/packages/libtool/libtool-native_1.5.22.bb
+++ b/packages/libtool/libtool-native_1.5.22.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
diff --git a/packages/libtool/libtool-native_1.5.24.bb b/packages/libtool/libtool-native_1.5.24.bb
index 14cdafd5de..1b0cb90a1e 100644
--- a/packages/libtool/libtool-native_1.5.24.bb
+++ b/packages/libtool/libtool-native_1.5.24.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
diff --git a/packages/libtool/libtool-native_2.2.4.bb b/packages/libtool/libtool-native_2.2.4.bb
index 29da1e4cd1..a4f76c69dc 100644
--- a/packages/libtool/libtool-native_2.2.4.bb
+++ b/packages/libtool/libtool-native_2.2.4.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r20"
+PR = "r20"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
diff --git a/packages/libtool/libtool-sdk_2.2.4.bb b/packages/libtool/libtool-sdk_2.2.4.bb
index 1fb4540e0b..e92c4dbfaf 100644
--- a/packages/libtool/libtool-sdk_2.2.4.bb
+++ b/packages/libtool/libtool-sdk_2.2.4.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb
index 2ec69105e0..428a06a0e7 100644
--- a/packages/libtool/libtool_1.5.10.bb
+++ b/packages/libtool/libtool_1.5.10.bb
@@ -1,5 +1,5 @@
 require libtool.inc
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
diff --git a/packages/libtool/libtool_1.5.22.bb b/packages/libtool/libtool_1.5.22.bb
index 9dc639cf8a..4bed7842b4 100644
--- a/packages/libtool/libtool_1.5.22.bb
+++ b/packages/libtool/libtool_1.5.22.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 
 require libtool.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
diff --git a/packages/libtool/libtool_1.5.24.bb b/packages/libtool/libtool_1.5.24.bb
index 609e6f491a..7bdad1bed4 100644
--- a/packages/libtool/libtool_1.5.24.bb
+++ b/packages/libtool/libtool_1.5.24.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 
 require libtool.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
diff --git a/packages/libtool/libtool_1.5.6.bb b/packages/libtool/libtool_1.5.6.bb
index a4176caa28..7fd9b81a3d 100644
--- a/packages/libtool/libtool_1.5.6.bb
+++ b/packages/libtool/libtool_1.5.6.bb
@@ -1,7 +1,7 @@
 # Exists for compatibility with certain distributions (e.g. Maemo).
 
 require libtool.inc
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libtool/libtool_2.2.4.bb b/packages/libtool/libtool_2.2.4.bb
index 1562d6a54c..c8380d161c 100644
--- a/packages/libtool/libtool_2.2.4.bb
+++ b/packages/libtool/libtool_2.2.4.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-FILE_PR = "r14"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libungif/libungif_4.1.3.bb b/packages/libungif/libungif_4.1.3.bb
index f4f4e3ce28..caf0427551 100644
--- a/packages/libungif/libungif_4.1.3.bb
+++ b/packages/libungif/libungif_4.1.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DESCRIPTION = "shared library for GIF images"
 SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES += "${PN}-utils"
 
diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
index 2fa792100f..34cc1ac50d 100644
--- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
+++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 
 PE = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libusb1"
 
diff --git a/packages/libusb/libusb1_0.9.2.bb b/packages/libusb/libusb1_0.9.2.bb
index e4e3055597..2c144f053d 100644
--- a/packages/libusb/libusb1_0.9.2.bb
+++ b/packages/libusb/libusb1_0.9.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb
index b1468395be..8648f96571 100644
--- a/packages/libusb/libusb_0.1.10a.bb
+++ b/packages/libusb/libusb_0.1.10a.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libusb is a library to provide userspace \
 access to USB devices."
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
            file://debian-changes.patch;patch=1"
diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb
index 28d5b617d8..3d6a213b45 100644
--- a/packages/libusb/libusb_0.1.12.bb
+++ b/packages/libusb/libusb_0.1.12.bb
@@ -3,7 +3,7 @@ access to USB devices."
 HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
 	   file://configure_fix.patch;patch=1"
diff --git a/packages/libvorbis/libvorbis_1.0.1.bb b/packages/libvorbis/libvorbis_1.0.1.bb
index 1ab3b70822..8a2d17a0ad 100644
--- a/packages/libvorbis/libvorbis_1.0.1.bb
+++ b/packages/libvorbis/libvorbis_1.0.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
 that is free of intellectual property restrictions. libvorbis \
 is the main vorbis codec library."
 LICENSE = "BSD"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
 file://m4.patch;patch=1"
diff --git a/packages/libvorbis/libvorbis_1.2.0.bb b/packages/libvorbis/libvorbis_1.2.0.bb
index b8824d771c..30031ad5e8 100644
--- a/packages/libvorbis/libvorbis_1.2.0.bb
+++ b/packages/libvorbis/libvorbis_1.2.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
 that is free of intellectual property restrictions. libvorbis \
 is the main vorbis codec library."
 LICENSE = "BSD"
-FILE_PR = "1"
+PR = "1"
 
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
 	   file://r14598-CVE-2008-1420.patch;patch=1 \
diff --git a/packages/libxcomp/libxcomp_3.2.0-7.bb b/packages/libxcomp/libxcomp_3.2.0-7.bb
index 910a76f16b..84ab8d2396 100644
--- a/packages/libxcomp/libxcomp_3.2.0-7.bb
+++ b/packages/libxcomp/libxcomp_3.2.0-7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Compression library for x-protocol from nomachine"
 HOMEPAGE = "http://www.nomachine.com/"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "virtual/libx11 zlib jpeg libpng"
 
diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index 1f803aa4cc..a51dc83896 100644
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib libogg tremor libmad libmodplug libpng"
 PROVIDES = "virtual/libxine"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig gettext
 
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index 31e8df401b..806f8fd4b7 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index ca1769eaf8..9219e5fdcd 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/packages/libxml/libxml2-native.inc b/packages/libxml/libxml2-native.inc
index c6965f81c6..5672792db3 100644
--- a/packages/libxml/libxml2-native.inc
+++ b/packages/libxml/libxml2-native.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME XML library"
 DEPENDS = "python-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
diff --git a/packages/libxml/libxml2-native_2.7.2.bb b/packages/libxml/libxml2-native_2.7.2.bb
index 009732e8dd..48e35986f6 100644
--- a/packages/libxml/libxml2-native_2.7.2.bb
+++ b/packages/libxml/libxml2-native_2.7.2.bb
@@ -1,2 +1,2 @@
 require libxml2-native.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/libxml/libxml2_2.7.2.bb b/packages/libxml/libxml2_2.7.2.bb
index e730f0f450..555a436a63 100644
--- a/packages/libxml/libxml2_2.7.2.bb
+++ b/packages/libxml/libxml2_2.7.2.bb
@@ -1,4 +1,4 @@
 require libxml2.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb
index 9b426dac0b..377f55dc2a 100644
--- a/packages/libxosd/libxosd_svn.bb
+++ b/packages/libxosd/libxosd_svn.bb
@@ -3,7 +3,7 @@ SECTION = "libs/x11"
 DEPENDS = "virtual/libx11 libxext"
 LICENSE = "LGPL"
 PV = "2.2.15+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
            file://autofoo.patch;patch=1 \
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index c3e4e9d03b..35a2e5ec33 100644
--- a/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,5 +1,5 @@
 require libxsettings-client.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 23085f24a7..c7904ba088 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -3,4 +3,4 @@ require libxsettings-client.inc
 SRC_URI += "        file://Makefile-am.patch;patch=1"
 
 
-FILE_PR ="r2"
+PR ="r2"
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index b109a75f8e..87d65473f0 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -1,6 +1,6 @@
 require libxsettings-client.inc
 
 DEPENDS += "gtk-doc"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI += "file://no-host-includes.patch;patch=1 "
diff --git a/packages/libxsettings-client/libxsettings-client_svn.bb b/packages/libxsettings-client/libxsettings-client_svn.bb
index 0b54e50cb3..c9705b5673 100644
--- a/packages/libxsettings-client/libxsettings-client_svn.bb
+++ b/packages/libxsettings-client/libxsettings-client_svn.bb
@@ -2,7 +2,7 @@ require libxsettings-client.inc
 
 DEPENDS += "gtk-doc"
 PV = "0.17+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/libxsettings/libxsettings_svn.bb b/packages/libxsettings/libxsettings_svn.bb
index 3771b94502..dd1e7fcadf 100644
--- a/packages/libxsettings/libxsettings_svn.bb
+++ b/packages/libxsettings/libxsettings_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11"
 PV = "0.11+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe
 
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
index 856ab70b45..d4fadc401b 100644
--- a/packages/libxslt/libxslt_1.1.17.bb
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxml2"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
            file://destdir.patch;patch=1"
diff --git a/packages/libxslt/libxslt_1.1.21.bb b/packages/libxslt/libxslt_1.1.21.bb
index 47999943c4..282918e83e 100644
--- a/packages/libxslt/libxslt_1.1.21.bb
+++ b/packages/libxslt/libxslt_1.1.21.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxml2 (>=2.6.27)"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
 S = "${WORKDIR}/libxslt-${PV}"
diff --git a/packages/libxslt/libxslt_1.1.22.bb b/packages/libxslt/libxslt_1.1.22.bb
index 7c9c0d3eef..86fe70dff2 100644
--- a/packages/libxslt/libxslt_1.1.22.bb
+++ b/packages/libxslt/libxslt_1.1.22.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxml2 (>=2.6.27)"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch;patch=1"
diff --git a/packages/libzvbi/libzvbi_0.2.22.bb b/packages/libzvbi/libzvbi_0.2.22.bb
index d029c3c3b8..a4ce1e55d5 100644
--- a/packages/libzvbi/libzvbi_0.2.22.bb
+++ b/packages/libzvbi/libzvbi_0.2.22.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html"
 LICENSE = "GPL"
 SECTION = "libs/multimedia"
 DEPENDS = "libpng"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
 S = "${WORKDIR}/zvbi-${PV}"
diff --git a/packages/libzvbi/libzvbi_0.2.25.bb b/packages/libzvbi/libzvbi_0.2.25.bb
index 6ae6e0c895..9be7a7d42e 100644
--- a/packages/libzvbi/libzvbi_0.2.25.bb
+++ b/packages/libzvbi/libzvbi_0.2.25.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html"
 LICENSE = "GPL"
 SECTION = "libs/multimedia"
 DEPENDS = "libpng"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
 S = "${WORKDIR}/zvbi-${PV}"
diff --git a/packages/lighttpd/lighttpd_1.4.18.bb b/packages/lighttpd/lighttpd_1.4.18.bb
index a5a483a252..d5870ba5af 100644
--- a/packages/lighttpd/lighttpd_1.4.18.bb
+++ b/packages/lighttpd/lighttpd_1.4.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Web server"
 SECTION = "net"
 LICENSE = "BSD"
 DEPENDS = "libpcre"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
 	   file://configure.in.patch;patch=1 \
diff --git a/packages/lilo-sh/lilo-sh_21.bb b/packages/lilo-sh/lilo-sh_21.bb
index a28dbdb72f..cc4fbac8a7 100644
--- a/packages/lilo-sh/lilo-sh_21.bb
+++ b/packages/lilo-sh/lilo-sh_21.bb
@@ -12,7 +12,7 @@ the kernel. LILO can also boot other operating systems. LILO-sh is a \
 port of LILO to the SH processor."
 SECTION = "bootloaders"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz \
            file://lilo-0.21-include.patch;patch=1 \
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
index f4c95832c1..d26ef7bb56 100644
--- a/packages/lineak/lineak_0.8.3.bb
+++ b/packages/lineak/lineak_0.8.3.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/multimedia"
 HOMEPAGE = "http://lineak.sourceforge.net"
 LICENSE = "GPLv2"
 DEPENDS = "virtual/libx11 libxext"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \
            file://add-zaurus-remote-support.patch;patch=1"
diff --git a/packages/links/links-x11_2.0+2.1pre30.bb b/packages/links/links-x11_2.0+2.1pre30.bb
index 9360c769f9..9ee70d9ad4 100644
--- a/packages/links/links-x11_2.0+2.1pre30.bb
+++ b/packages/links/links-x11_2.0+2.1pre30.bb
@@ -2,7 +2,7 @@ require links.inc
 
 DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += " file://links2.desktop \
              http://www.xora.org.uk/oe/links2.png"
diff --git a/packages/links/links_2.0+2.1pre30.bb b/packages/links/links_2.0+2.1pre30.bb
index 3ac1021292..c46a64f380 100644
--- a/packages/links/links_2.0+2.1pre30.bb
+++ b/packages/links/links_2.0+2.1pre30.bb
@@ -2,7 +2,7 @@ require links.inc
 
 DEPENDS += "gpm"
 RCONFLICTS = "links-x11"
-FILE_PR = "r1"
+PR = "r1"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/packages/linphone/linphone-hh_0.12.2.hh1.bb b/packages/linphone/linphone-hh_0.12.2.hh1.bb
index 8666cac01a..54a79390a7 100644
--- a/packages/linphone/linphone-hh_0.12.2.hh1.bb
+++ b/packages/linphone/linphone-hh_0.12.2.hh1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r4"
+PR = "r4"
 
 DESCRIPTION = "SIP-based IP phone (GPE edition)"
 DEPENDS = "libosip gtk+ libogg alsa-lib"
diff --git a/packages/linphone/linphone_0.12.2.bb b/packages/linphone/linphone_0.12.2.bb
index 28f740958d..7a5e17a981 100644
--- a/packages/linphone/linphone_0.12.2.bb
+++ b/packages/linphone/linphone_0.12.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
-FILE_PR = "r2"
+PR = "r2"
 
 DESCRIPTION = "SIP-based IP phone (GPE edition)"
 DEPENDS = "libosip gtk+ libogg libgnomeui"
diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb
index 490e0ee7f6..f96bd66b82 100644
--- a/packages/linphone/linphone_1.3.99.8.bb
+++ b/packages/linphone/linphone_1.3.99.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "SIP-based IP phone (Console edition)"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
 LICENSE = "GPL-2"
 DEPENDS = "libosip2 speex libogg alsa-lib readline"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \
            file://conf.patch;patch=1"
diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb
index 40e2c86dcc..fe40b6a270 100644
--- a/packages/linphone/linphone_1.6.0.bb
+++ b/packages/linphone/linphone_1.6.0.bb
@@ -18,7 +18,7 @@ RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
 
 PROVIDES += "linphone linphonec liblinphone"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
            http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
diff --git a/packages/linux-atm/linux-atm_2.4.1.bb b/packages/linux-atm/linux-atm_2.4.1.bb
index dfe3c355fd..2643c742d5 100644
--- a/packages/linux-atm/linux-atm_2.4.1.bb
+++ b/packages/linux-atm/linux-atm_2.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://linux-atm.sourceforge.net/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/linux-atm/linux-atm-${PV}.tar.gz \
diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb
index 6fc11dcabd..80d6eca339 100644
--- a/packages/linux-hotplug/linux-hotplug_20040329.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040329.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RPROVIDES_${PN} = "hotplug"
 RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
 	   file://busybox.patch;patch=1 \
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index 954b2096bb..6209504c20 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
 SECTION = "base"
 RSUGGESTS = "pciutils usbutils"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
 	file://dash.patch;patch=1 \
diff --git a/packages/linux-input/linux-input_cvs.bb b/packages/linux-input/linux-input_cvs.bb
index b603c4b9f0..d90322356c 100644
--- a/packages/linux-input/linux-input_cvs.bb
+++ b/packages/linux-input/linux-input_cvs.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 PV = "0.0+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@linuxconsole.cvs.sourceforge.net/cvsroot/linuxconsole;module=ruby \
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 460c334c35..e316a2c6c1 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
 #   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
 	file://keyboard.patch;patch=1"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
index 3d5bf19725..0c61d2acc4 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -13,7 +13,7 @@ require linux-libc-headers.inc
 # since we assume GPL for linux i think we can also assume it here
 DEFAULT_PREFERENCE = "-1"
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \
 	file://keyboard.patch;patch=1 \
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index 26fb0171c4..d71b68a930 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index e316bc8725..587d21e1e4 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
index 1153820f3b..0e5debcfa3 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 51c699342b..13579f9349 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
index 794e25e65e..0d4163693c 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   file://reinstate-a.out.h.patch;patch=1 \
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
index dec2ca7356..1c7a5885d2 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
@@ -1,7 +1,7 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r4"
+PR = "r4"
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""
 
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
index 23fe9020b9..5e1c71ef1f 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
 #   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r8"
+PR = "r8"
 
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""
diff --git a/packages/linux-uml/linux-uml_2.4.26.bb b/packages/linux-uml/linux-uml_2.4.26.bb
index b773801341..11b2a2261c 100644
--- a/packages/linux-uml/linux-uml_2.4.26.bb
+++ b/packages/linux-uml/linux-uml_2.4.26.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "User Mode Linux Kernel"
 LICENSE = "GPL"
 UMLR = "2"
-FILE_PR = "1"
+PR = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1 \
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index 2132ce90b2..915378cb56 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -5,7 +5,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 RCV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 LV = "2.6.10"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \
diff --git a/packages/linux/c7x0-kernels-2.4-embedix.bb b/packages/linux/c7x0-kernels-2.4-embedix.bb
index 0fa5e2a0e0..3a2c3b1205 100644
--- a/packages/linux/c7x0-kernels-2.4-embedix.bb
+++ b/packages/linux/c7x0-kernels-2.4-embedix.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Build all c7x0 kernels in one go"
 SECTION = "kernel"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_HOST = "arm.*-linux"
 
diff --git a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
index a2f115a5fd..b6cdf48144 100644
--- a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
+++ b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
@@ -3,7 +3,7 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Chumby"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \
            http://files.chumby.com/source/ironforge/build396/align.pl \
diff --git a/packages/linux/collie-kernels-2.4-embedix.bb b/packages/linux/collie-kernels-2.4-embedix.bb
index 21168aff26..022aca9ff8 100644
--- a/packages/linux/collie-kernels-2.4-embedix.bb
+++ b/packages/linux/collie-kernels-2.4-embedix.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Build all collie kernels in one go"
 SECTION = "kernel"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_HOST = "arm.*-linux"
 
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 5c0d70cf11..fe72df8213 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 # Note, the compulab package contains a binary NAND driver that is not
 # EABI compatible
diff --git a/packages/linux/devkitidp-pxa255_2.6.19.bb b/packages/linux/devkitidp-pxa255_2.6.19.bb
index 357e8ced27..f9eb6a7777 100644
--- a/packages/linux/devkitidp-pxa255_2.6.19.bb
+++ b/packages/linux/devkitidp-pxa255_2.6.19.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 DEPENDS = "u-boot"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
diff --git a/packages/linux/em-x270_2.6.23.bb b/packages/linux/em-x270_2.6.23.bb
index 8d0aae78d0..fcef7280d0 100644
--- a/packages/linux/em-x270_2.6.23.bb
+++ b/packages/linux/em-x270_2.6.23.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab EM-X270 system"
 LICENSE = "GPL"
 DEPENDS = "u-boot-utils-native"
-FILE_PR = "r1"
+PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 567a1d83d8..79d90bc4c7 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "ep93xx"
 
diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index 3bc3fb6e2d..642b13f607 100644
--- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "ep93xx"
 
diff --git a/packages/linux/fsg3-kernel_2.6.18.bb b/packages/linux/fsg3-kernel_2.6.18.bb
index 8740adb953..5c6688a0af 100644
--- a/packages/linux/fsg3-kernel_2.6.18.bb
+++ b/packages/linux/fsg3-kernel_2.6.18.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.18-fsg3"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/gumstix-linux.inc b/packages/linux/gumstix-linux.inc
index b6f79ff355..50111cb545 100644
--- a/packages/linux/gumstix-linux.inc
+++ b/packages/linux/gumstix-linux.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux kernel for custom configurations"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit kernel
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index 628883d44e..3b1c1a073d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 
 KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
index b86781626f..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
index b86781626f..adca8740de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index 335cf67f32..96fe2b2f64 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.18"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index b711a68a6d..d83a0ed0d8 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.19"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index ef793841c1..8e6f1b27df 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r4.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r4.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index f108a3b4c6..e943cb47be 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.21"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel_2.6.23.8.bb b/packages/linux/ixp4xx-kernel_2.6.23.8.bb
index bab68232d3..081195855d 100644
--- a/packages/linux/ixp4xx-kernel_2.6.23.8.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.23.8.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.23"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-FILE_PR = "r0.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r0.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 2304241c91..05ceb28ee5 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "N/A"
 LICENSE = "GPL"
 DEPENDS += "u-boot-utils-native"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \
diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
index 56c57f13f7..6560fc9fbb 100644
--- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb
+++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
@@ -8,7 +8,7 @@ SRCREV = "${DAVINCI_SRCREV}"
 
 PV = "2.6.25"
 #PV = "2.6.25+2.6.26-rc0+git${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
 
diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index 929ce5be89..61836ac204 100644
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -4,7 +4,7 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
 
-FILE_PR = "r4"
+PR = "r4"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "dht-walnut"
diff --git a/packages/linux/linux-dht-walnut_2.6.23.bb b/packages/linux/linux-dht-walnut_2.6.23.bb
index 29f3e78c49..181488190e 100644
--- a/packages/linux/linux-dht-walnut_2.6.23.bb
+++ b/packages/linux/linux-dht-walnut_2.6.23.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "dht-walnut"
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index a22ab3352a..1907b09f75 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "efika"
 
diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb
index 6f505725c3..2f707a17e3 100644
--- a/packages/linux/linux-efika_2.6.20.20.bb
+++ b/packages/linux/linux-efika_2.6.20.20.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "efika"
 
diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb
index 803676fd6d..839d206cd1 100644
--- a/packages/linux/linux-efika_2.6.20.bb
+++ b/packages/linux/linux-efika_2.6.20.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "efika"
 
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index 6edc71406e..20b5bf86b6 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 PV = "2.6.21+git${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb
index 31546294db..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.11.bb
+++ b/packages/linux/linux-epia_2.6.11.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 
diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb
index 31546294db..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.12.bb
+++ b/packages/linux/linux-epia_2.6.12.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 
diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb
index a8e540c776..29f53a4dae 100644
--- a/packages/linux/linux-epia_2.6.19.2.bb
+++ b/packages/linux/linux-epia_2.6.19.2.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 
diff --git a/packages/linux/linux-epia_2.6.8.1.bb b/packages/linux/linux-epia_2.6.8.1.bb
index 1bd2ea03da..315ff118e8 100644
--- a/packages/linux/linux-epia_2.6.8.1.bb
+++ b/packages/linux/linux-epia_2.6.8.1.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-FILE_PR = "r15"
+PR = "r15"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 4520833c45..150a4a153c 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-FILE_PR = "${EZX}-r24"
+PR = "${EZX}-r24"
 
 require linux.inc
 
diff --git a/packages/linux/linux-ezx_2.6.23.bb b/packages/linux/linux-ezx_2.6.23.bb
index 36c3d4a80a..42624dd5a8 100644
--- a/packages/linux/linux-ezx_2.6.23.bb
+++ b/packages/linux/linux-ezx_2.6.23.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-FILE_PR = "${EZX}-r2"
+PR = "${EZX}-r2"
 
 # unstable branch, use 2.6.21 if you want something working
 DEFAULT_PREFERENCE = "-99"
diff --git a/packages/linux/linux-ezx_2.6.24.bb b/packages/linux/linux-ezx_2.6.24.bb
index 16e2c90dc3..093ee1e94a 100644
--- a/packages/linux/linux-ezx_2.6.24.bb
+++ b/packages/linux/linux-ezx_2.6.24.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-FILE_PR = "${EZX}-r0"
+PR = "${EZX}-r0"
 
 # unstable branch, use 2.6.21 if you want something working
 DEFAULT_PREFERENCE = "-99"
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index 0712fc5a77..adfd7475bb 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536"
 HOMEPAGE = "http://www.amd.com/embedded"
 LICENSE = "GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 AMD_DRIVER_VERSION = "02.03.0100"
 AMD_DRIVER_LABEL = "Patches_Linux2.6.11_Common_${AMD_DRIVER_VERSION}"
 
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index c2423f5cf4..1812148f6e 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the Gumstix"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "u-boot-utils-native"
 
diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb
index 3a08b66c31..f7ad0185f3 100644
--- a/packages/linux/linux-h1940_2.6.17-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.17-h1940.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for h1940 devices."
 SECTION = "kernel"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "h1940"
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 510c199ac9..387a1da89c 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r14"
+PR = "r14"
 
 COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
index 4fc37555fd..8b1f153f11 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh9.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 # Override where to look for defconfigs and patches,
 # we have per-kernel-release sets.
diff --git a/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
index 5e9466a743..c19678efe2 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.17-hh4.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
index 704de3059d..724971cacb 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.18-hh2.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
index ac8acadf26..77f55415ba 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh13.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
index f9f2afa801..8e760267f4 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index 7fe7448418..a9dd604d8f 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index 2baa457fd7..cb6e7efc13 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 645632f50d..3df1102761 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-FILE_PR = "r20"
+PR = "r20"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index bae606ac2a..89cb68548f 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-ixp4xx_2.6.18.bb b/packages/linux/linux-ixp4xx_2.6.18.bb
index 7b2a006ad4..1fb86f15eb 100644
--- a/packages/linux/linux-ixp4xx_2.6.18.bb
+++ b/packages/linux/linux-ixp4xx_2.6.18.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
 KERNEL_RELEASE = "2.6.18"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.19.bb b/packages/linux/linux-ixp4xx_2.6.19.bb
index 0ac9efb2d4..550313ca94 100644
--- a/packages/linux/linux-ixp4xx_2.6.19.bb
+++ b/packages/linux/linux-ixp4xx_2.6.19.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
 KERNEL_RELEASE = "2.6.19"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.20.bb b/packages/linux/linux-ixp4xx_2.6.20.bb
index f9751ca189..f70992ea86 100644
--- a/packages/linux/linux-ixp4xx_2.6.20.bb
+++ b/packages/linux/linux-ixp4xx_2.6.20.bb
@@ -4,7 +4,7 @@ require linux-ixp4xx.inc
 KERNEL_RELEASE = "2.6.20"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${KERNEL_RELEASE};proto=http \
diff --git a/packages/linux/linux-ixp4xx_2.6.21.7.bb b/packages/linux/linux-ixp4xx_2.6.21.7.bb
index 00d798c554..4d26621241 100644
--- a/packages/linux/linux-ixp4xx_2.6.21.7.bb
+++ b/packages/linux/linux-ixp4xx_2.6.21.7.bb
@@ -5,7 +5,7 @@ VANILLA_VERSION = "2.6.21"
 KERNEL_RELEASE = "2.6.21.7"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-ixp4xx_2.6.23.14.bb b/packages/linux/linux-ixp4xx_2.6.23.14.bb
index 294c43896a..b7c7682370 100644
--- a/packages/linux/linux-ixp4xx_2.6.23.14.bb
+++ b/packages/linux/linux-ixp4xx_2.6.23.14.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.23.14"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-jlime-current.bb b/packages/linux/linux-jlime-current.bb
index 2090c7de60..21cf1a224b 100644
--- a/packages/linux/linux-jlime-current.bb
+++ b/packages/linux/linux-jlime-current.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "fillmein"
 
 inherit kernel
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://filip.eu.org/jlime-current.git;protocol=git \
            git://filip.eu.org/jlime.git;protocol=git"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
index 661b0963bd..654b02788c 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 
 COMPATIBLE_HOST = "sh.*-linux"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index dc4d38123f..86a5f6083f 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "sh.*-linux"
 #COMPATIBLE_MACHINE = "jornada6xx"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
index 37725199cc..c7ebe829c4 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "sh.*-linux"
 #COMPATIBLE_MACHINE = "jornada6xx"
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.25.bb b/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
index ae46863515..c55cf1578f 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.25.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRCREV = "${AUTOREV}"
 
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index e675624fbc..0d95972010 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index 7c623574ad..789dddf9b8 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index d27fb77b02..f756d4f259 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "jornada7xx"
diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb
index db7deef21e..73eb1e3b46 100644
--- a/packages/linux/linux-kaiser_2.6.24+git.bb
+++ b/packages/linux/linux-kaiser_2.6.24+git.bb
@@ -1,7 +1,7 @@
 require linux.inc
 
 PV = "2.6.24+git${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris"
 
diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb
index 712d83ee4d..a357443fdb 100644
--- a/packages/linux/linux-ks8695_2.6.16.bb
+++ b/packages/linux/linux-ks8695_2.6.16.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux kernel for Micrel KS8695(P) based devices"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://ks8695-headers-r0.patch;patch=1 \
diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb
index 36d9a608fb..df984a02c3 100644
--- a/packages/linux/linux-linkstationarm_2.6.12.bb
+++ b/packages/linux/linux-linkstationarm_2.6.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS += "u-boot-utils-native"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "lsarm"
 
diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
index dcb94f799b..f04e1f591c 100644
--- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
+++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "dtc-native u-boot-utils-native"
 COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb
index 757b6324dc..bd9a1c4060 100644
--- a/packages/linux/linux-magicbox_2.6.18.6.bb
+++ b/packages/linux/linux-magicbox_2.6.18.6.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "magicbox"
diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb
index 8ab96c1c14..2c79a94e10 100644
--- a/packages/linux/linux-magicbox_2.6.19.2.bb
+++ b/packages/linux/linux-magicbox_2.6.19.2.bb
@@ -3,7 +3,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "magicbox"
diff --git a/packages/linux/linux-mainstone_2.6.25.bb b/packages/linux/linux-mainstone_2.6.25.bb
index 6abfbe1e2c..d9599ef76c 100644
--- a/packages/linux/linux-mainstone_2.6.25.bb
+++ b/packages/linux/linux-mainstone_2.6.25.bb
@@ -3,7 +3,7 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2;patch=1 \
diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
index cf5cef8ae8..59bcff431e 100644
--- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
 LICENSE = "GPL"
 DEPENDS = "git-native"
-FILE_PR = "r1"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 COMPATIBLE_MACHINE = "xilinx-ml403"
 SRC_URI = "git://source.mvista.com/git/linux-xilinx-26;protocol=git \
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index fa063fa936..5815a570ee 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
 inherit module-base kernel
 
 PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-mtx-1u_2.4.27.bb b/packages/linux/linux-mtx-1u_2.4.27.bb
index 05c6f3b9bc..00132f54cd 100644
--- a/packages/linux/linux-mtx-1u_2.4.27.bb
+++ b/packages/linux/linux-mtx-1u_2.4.27.bb
@@ -2,7 +2,7 @@ include linux-mtx-1_2.4.27.bb
 
 COMPATIBLE_MACHINE = "mtx-1u"
 
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI += "\
 	file://22-umts.diff;patch=1 \
diff --git a/packages/linux/linux-mtx-2_2.4.27.bb b/packages/linux/linux-mtx-2_2.4.27.bb
index 91ab09f923..66ce06c6ca 100644
--- a/packages/linux/linux-mtx-2_2.4.27.bb
+++ b/packages/linux/linux-mtx-2_2.4.27.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
 inherit module-base kernel
 
 PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index a6274f6561..e3b23b1968 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
 
 inherit kernel
 # therefore
diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb
index 49cb4403d0..e1613d6f60 100644
--- a/packages/linux/linux-mtx-3_2.6.15.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
-FILE_PR = "r11"
+PR = "r11"
 inherit module-base kernel
 
 PROVIDES = "virtual/kernel"
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index 41e0e0c564..b37b68e8c9 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 #DEPENDS = "u-boot"
 
-FILE_PR = "r0"
+PR = "r0"
 
 COMPATIBLE_MACHINE = "navman-icn330"
 
diff --git a/packages/linux/linux-neuros_2.6.15.bb b/packages/linux/linux-neuros_2.6.15.bb
index c419a424ed..f103d2c35f 100644
--- a/packages/linux/linux-neuros_2.6.15.bb
+++ b/packages/linux/linux-neuros_2.6.15.bb
@@ -1,7 +1,7 @@
 #require linux-omap.inc
 
 PV = "2.6.15-torfu"
-FILE_PR = "r5"
+PR = "r5"
 
 COMPATIBLE_MACHINE = "(neuros-osd)"
 
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 19967fbce6..883bb69a2a 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices"
 SRCREV = "2eaa4a30d599203ceed1b5a42d713b29151a39eb"
 
 PV = "2.6.23-${PR}+git${SRCREV}"
-FILE_PR = "r13"
+PR = "r13"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/linux/linux-nokia800_2.6.18-osso40.bb b/packages/linux/linux-nokia800_2.6.18-osso40.bb
index b57e28af6d..3ffa1d838a 100644
--- a/packages/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/packages/linux/linux-nokia800_2.6.18-osso40.bb
@@ -1,6 +1,6 @@
 require linux-nokia800.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
            http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
diff --git a/packages/linux/linux-nokia800_2.6.21-osso71.bb b/packages/linux/linux-nokia800_2.6.21-osso71.bb
index 108019764e..904d2021c1 100644
--- a/packages/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/packages/linux/linux-nokia800_2.6.21-osso71.bb
@@ -1,5 +1,5 @@
 require linux-nokia800.inc
-FILE_PR = "r4"
+PR = "r4"
 
 DEFAULT_PREFERENCE_nokia770 = "-1"
 
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 0be1bb8c94..91f82575ce 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -1,6 +1,6 @@
 require linux-omap.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 COMPATIBLE_MACHINE = "omap5912osk"
 
diff --git a/packages/linux/linux-omap1_2.6.18+git.bb b/packages/linux/linux-omap1_2.6.18+git.bb
index d317c83d74..7fac38a77b 100644
--- a/packages/linux/linux-omap1_2.6.18+git.bb
+++ b/packages/linux/linux-omap1_2.6.18+git.bb
@@ -1,6 +1,6 @@
 require linux-omap.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "omap5912osk"
 
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index e40a9c9fc6..dcb8139486 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848"
 
 PV = "2.6.26"
 #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
-FILE_PR = "r64"
+PR = "r64"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 7c54292c17..14de954e7c 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
 
 PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-FILE_PR = "r14"
+PR = "r14"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
diff --git a/packages/linux/linux-openezx-devel_svn.bb b/packages/linux/linux-openezx-devel_svn.bb
index 2e95555c11..17156535ea 100644
--- a/packages/linux/linux-openezx-devel_svn.bb
+++ b/packages/linux/linux-openezx-devel_svn.bb
@@ -11,7 +11,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 KERNEL_RELEASE = "2.6.25"
 KERNEL_PATCHES = "kernel-${KERNEL_RELEASE}.x-patches"
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 8df15bb5b8..dac670abf9 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.26"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 524b22a311..9133688bf8 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
index ac02cbf322..786e4901c3 100644
--- a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
+++ b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
 
 S = "${WORKDIR}/linux-2.6.22"
 
-FILE_PR = "r2"
+PR = "r2"
 
 do_configure() {
 
diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index 8cf6c15a24..ebc969f1bf 100644
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-FILE_PR = "r34"
+PR = "r34"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 1ef479678f..b19111ebcb 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-FILE_PR = "r15"
+PR = "r15"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index 22e4909fb0..3f9eac86a5 100644
--- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "1"
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 47932fdf0d..dd126285ea 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index fb1f4d2038..eefe72f1e5 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
diff --git a/packages/linux/linux-rt_2.6.25.bb b/packages/linux/linux-rt_2.6.25.bb
index 9848a8859d..998fc13685 100644
--- a/packages/linux/linux-rt_2.6.25.bb
+++ b/packages/linux/linux-rt_2.6.25.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
 DEFAULT_PREFERENCE_efika = "1"
 
-FILE_PR = "r4"
+PR = "r4"
 
 #KERNEL_IMAGETYPE_efika = "Image"
 
diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb
index 5a02aed052..006fd3a51d 100644
--- a/packages/linux/linux-sequoia_2.6.21.bb
+++ b/packages/linux/linux-sequoia_2.6.21.bb
@@ -3,7 +3,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for AMCC's Sequoia dev board"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 #DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "sequoia"
diff --git a/packages/linux/linux-smdk2440_2.6.20+git.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb
index 6c7c26e6c8..b86d970e50 100644
--- a/packages/linux/linux-smdk2440_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2440_2.6.20+git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for smdk2440 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 GGSRC = "http://www.xora.org.uk/oe/patches/"
 
diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb
index e14cc23f90..034137e89c 100644
--- a/packages/linux/linux-smdk2443_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2443_2.6.20+git.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS += "u-boot-mkimage-openmoko-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 GGSRC = "http://www.xora.org.uk/oe/patches/"
 
diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index 1da4ea5fe1..b0e8c4d61c 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the Iomega storcenter platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "uboot-utils"
-FILE_PR = "r0"
+PR = "r0"
 
 # notes on iom def kernel:
 #
diff --git a/packages/linux/linux-storcenter_2.6.15.7.bb b/packages/linux/linux-storcenter_2.6.15.7.bb
index 4acfa836ea..74dfd8fb3a 100644
--- a/packages/linux/linux-storcenter_2.6.15.7.bb
+++ b/packages/linux/linux-storcenter_2.6.15.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the Iomega storcenter platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "u-boot-utils-native"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "storcenter"
 
diff --git a/packages/linux/linux-sun4cdm_2.4.26.bb b/packages/linux/linux-sun4cdm_2.4.26.bb
index ee5daef12c..52b3ecb26c 100644
--- a/packages/linux/linux-sun4cdm_2.4.26.bb
+++ b/packages/linux/linux-sun4cdm_2.4.26.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for sparc32/sun4c"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS += "elftoaout-native"
 
 KERNEL_CCSUFFIX = "-3.3.4"
diff --git a/packages/linux/linux-sun4cdm_2.6.8.1.bb b/packages/linux/linux-sun4cdm_2.6.8.1.bb
index f810497336..40583903d8 100644
--- a/packages/linux/linux-sun4cdm_2.6.8.1.bb
+++ b/packages/linux/linux-sun4cdm_2.6.8.1.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for sparc32/sun4c"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://sun4c_defconfig"
diff --git a/packages/linux/linux-titan-sh4_2.6.21.bb b/packages/linux/linux-titan-sh4_2.6.21.bb
index afee97160f..c760669bde 100644
--- a/packages/linux/linux-titan-sh4_2.6.21.bb
+++ b/packages/linux/linux-titan-sh4_2.6.21.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for SH4 based TITAN (NP51R/LinkGear Series 100) router appliance"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   file://titan-flash.patch;patch=1 \
diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
index 7146656a3c..a9ebee14cd 100644
--- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones."
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 	   http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index e7f2229117..308c5e7a46 100644
--- a/packages/linux/linux-turbostation_2.6.20.2.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "u-boot-utils-native"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "turbostation"
 
diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb
index 4b5a53f9d5..3d9b81a936 100644
--- a/packages/linux/linux-wrap-geode_2.6.17.bb
+++ b/packages/linux/linux-wrap-geode_2.6.17.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \
 Geode SC1100 (i486) based wirless router appliance boards"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   file://defconfig"
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index f43496c334..23a5d4f203 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \
 	   file://linux-2.4.20-mipscvs.patch;patch=1 \
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 20466f73c6..db285710b2 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Linksys WRT54 devices"
 HOMEPAGE = "http://openwrt.org"
 DEPENDS = "lzma-native"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \
 	cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \
diff --git a/packages/linux/linux-x86_2.6.17.9.bb b/packages/linux/linux-x86_2.6.17.9.bb
index b609e38b11..829c884560 100644
--- a/packages/linux/linux-x86_2.6.17.9.bb
+++ b/packages/linux/linux-x86_2.6.17.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for x86 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 161929ceb9..3872c50cba 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for x86 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " 
 
diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb
index c7e531d040..df71fee865 100644
--- a/packages/linux/linux-xilinx-slab_git.bb
+++ b/packages/linux/linux-xilinx-slab_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 
 SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
 
-FILE_PR = "r3"
+PR = "r3"
 PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"
diff --git a/packages/linux/linux_2.6.18.bb b/packages/linux/linux_2.6.18.bb
index 9588fde11d..91a89c31f1 100644
--- a/packages/linux/linux_2.6.18.bb
+++ b/packages/linux/linux_2.6.18.bb
@@ -5,7 +5,7 @@ require linux.inc
 
 DEFAULT_PREFERENCE_avr32 = "1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 PARALLEL_MAKE=""
 
diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb
index 7efcaca203..81033e09ee 100644
--- a/packages/linux/linux_2.6.20.bb
+++ b/packages/linux/linux_2.6.20.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "20"
 DEFAULT_PREFERENCE_at91sam9261ek = "20"
 DEFAULT_PREFERENCE_at91sam9260ek = "20"
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
diff --git a/packages/linux/linux_2.6.21+2.6.22-rc1.bb b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
index 3ea4fb008c..35b2efe74a 100644
--- a/packages/linux/linux_2.6.21+2.6.22-rc1.bb
+++ b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 KERNEL_VERSION = "2.6.22-rc1"
 KERNEL_RELEASE = "2.6.22-rc1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc1.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb
index 177b7e19c9..265a35a4b3 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_gumstix-connex = "1"
 DEFAULT_PREFERENCE_gumstix-verdex = "1"
 
-FILE_PR = "r12"
+PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://tsc2003.c \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc3.bb b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
index 54e5a82328..47c3564087 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc3.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
@@ -7,7 +7,7 @@ BASE_KERNEL_VERSION = "2.6.22"
 KERNEL_VERSION = "2.6.23-rc3"
 KERNEL_RELEASE = "2.6.23-rc3"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc5.bb b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
index 2b94f8f1ab..3165c39a11 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc5.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
@@ -3,7 +3,7 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_ts72xx = "-1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 BASE_KERNEL_VERSION = "2.6.22"
 KERNEL_VERSION = "2.6.23-rc5"
diff --git a/packages/linux/linux_2.6.22.6.bb b/packages/linux/linux_2.6.22.6.bb
index 496f178c89..69b988e332 100644
--- a/packages/linux/linux_2.6.22.6.bb
+++ b/packages/linux/linux_2.6.22.6.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 DEFAULT_PREFERENCE_mx31moboard = "1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb
index b7b584b21e..bb8749f0d6 100644
--- a/packages/linux/linux_2.6.22.bb
+++ b/packages/linux/linux_2.6.22.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_cm-x270 = "-1"
 DEFAULT_PREFERENCE_bd-neon = "0"
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            file://defconfig \
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 1f485a0117..d22d5e8f27 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -3,7 +3,7 @@ require linux.inc
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc6.bb b/packages/linux/linux_2.6.23+2.6.24-rc6.bb
index f35899045f..73100b62c3 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc6.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc6.bb
@@ -3,7 +3,7 @@ require linux.inc
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc6.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index ff3dc83569..76ebbbe917 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-FILE_PR = "r12"
+PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   file://binutils-buildid-arm.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 0870561414..e787663bc7 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 DEFAULT_PREFERENCE_cs-e9302 = "1"
 
-FILE_PR = "r17"
+PR = "r17"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index c9db598b81..c095e5c3a2 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux_2.6.26.bb b/packages/linux/linux_2.6.26.bb
index e87cb9df73..5b6cd14fba 100644
--- a/packages/linux/linux_2.6.26.bb
+++ b/packages/linux/linux_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
index ee6bb06c8a..e7ab462c0b 100644
--- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \
            file://linux-2.6.17-rc5.patch;pnum=0;patch=1 \
diff --git a/packages/linux/logicpd-pxa270_2.6.19.2.bb b/packages/linux/logicpd-pxa270_2.6.19.2.bb
index d042c8d98c..7a4eaae99b 100644
--- a/packages/linux/logicpd-pxa270_2.6.19.2.bb
+++ b/packages/linux/logicpd-pxa270_2.6.19.2.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \
 	   file://asoc-v0.12.4.patch;patch=1 \
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index f960771919..cae3bf799c 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
            file://mainstone_defconfig"
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index 09257e57ef..290bb5911d 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -3,7 +3,7 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://flash-unlock.patch;patch=1;pnum=0 \
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index ee40cd688e..b001763710 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "mnci"
 KV = "2.4.21"
 RMKV = "2"
 PXAV = "1"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 	   http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \
diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
index 7a218f3d75..47f363d7df 100644
--- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the MX21ADS"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 PV = "2.6.18+2.6.19-rc6"
 
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
index 33bbd07d03..90463936d8 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the MX31ADS"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 PV = "2.6.18+2.6.19-rc6"
 
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 74f3de2d8b..1d24646b3b 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro  compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "netbook-pro"
 
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index 04d275cc19..547010996d 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -5,7 +5,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
-FILE_PR = "r22"
+PR = "r22"
 
 COMPATIBLE_MACHINE = 'simpad'
 
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 08b11bdef9..d9324e9883 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -6,7 +6,7 @@ VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
 PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
 USBV= "usb20040610"
-FILE_PR = "r4"
+PR = "r4"
 
 COMPATIBLE_MACHINE = 'simpad'
 
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index babeff3503..5a90d415fb 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -4,7 +4,7 @@ SECTION = "kernel"
 PV = "2.4.20-rmk2-embedix"
 LICENSE = "GPL"
 KV = "2.4.20"
-FILE_PR = "r18"
+PR = "r18"
 COMPATIBLE_MACHINE = "(akita|spitz)"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 32346ff16d..7e7548491f 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
 SECTION = "kernel"
 LICENSE = "GPL"
 PV = "2.4.18-rmk7-pxa3-embedix"
-FILE_PR = "r46"
+PR = "r46"
 KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index fa32c07ddf..b21a0c9328 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -6,7 +6,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-FILE_PR = "r23"
+PR = "r23"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 COMPATIBLE_MACHINE = "collie"
 
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index b2e438a29e..c580706b25 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 1915d278a2..cf9ef31c95 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-FILE_PR = "r22"
+PR = "r22"
 
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/linux/xanadux-ba-2.6_2.6.12.bb b/packages/linux/xanadux-ba-2.6_2.6.12.bb
index 10e09b1401..1e8274fa11 100644
--- a/packages/linux/xanadux-ba-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-ba-2.6_2.6.12.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Xanadux Blueangel kernel based on the hh 2.6.12"
 LICENSE = "GPL"
-FILE_PR ="r0"
+PR ="r0"
 
 SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-ba0"
 S = "${WORKDIR}/linux-2.6-xda"
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
index 699be7a830..1cc983aa77 100644
--- a/packages/linux/xanadux-un-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12"
 LICENSE = "GPL"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-un0"
 S = "${WORKDIR}/linux-2.6-xda"
diff --git a/packages/lirc/lirc-modules_0.8.0.bb b/packages/lirc/lirc-modules_0.8.0.bb
index 8cae17668c..2689bcf26b 100644
--- a/packages/lirc/lirc-modules_0.8.0.bb
+++ b/packages/lirc/lirc-modules_0.8.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
 RDEPENDS_nslu2 = "setserial"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
 S = "${WORKDIR}/lirc-${PV}"
diff --git a/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb b/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb
index 2bfb69d9c5..3ecfb76b3c 100644
--- a/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb
+++ b/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
 RDEPENDS_nslu2 = "setserial"
-FILE_PR = "r0"
+PR = "r0"
 
 # enable this bb file until the other packages compile again
 #DEFAULT_PREFERENCE = "-1"
diff --git a/packages/lirc/lirc-modules_0.8.1.bb b/packages/lirc/lirc-modules_0.8.1.bb
index 3e0b2072d6..0ef3713276 100644
--- a/packages/lirc/lirc-modules_0.8.1.bb
+++ b/packages/lirc/lirc-modules_0.8.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
 RDEPENDS_nslu2 = "setserial"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
 S = "${WORKDIR}/lirc-${PV}"
diff --git a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
index 2df14dd1df..7dfba0d789 100644
--- a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
+++ b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.lirc.org"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native setserial"
-FILE_PR = "r0"
+PR = "r0"
 
 SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]}
 
diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb
index 502a60ce24..f24d63a21c 100644
--- a/packages/lirc/lirc_0.8.0.bb
+++ b/packages/lirc/lirc_0.8.0.bb
@@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc"
 RDEPENDS_lirc-exec = "lirc"
 RDEPENDS_lirc-nslu2example = "lirc lirc-exec"
 RRECOMMENDS_lirc = "lirc-exec"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
            file://lircd.init file://lircmd.init file://lircexec.init"
diff --git a/packages/lirc/lirc_0.8.1+cvs20070307.bb b/packages/lirc/lirc_0.8.1+cvs20070307.bb
index 03397f46bd..cf484b6dd3 100644
--- a/packages/lirc/lirc_0.8.1+cvs20070307.bb
+++ b/packages/lirc/lirc_0.8.1+cvs20070307.bb
@@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc"
 RDEPENDS_lirc-exec = "lirc"
 RDEPENDS_lirc-nslu2example = "lirc lirc-exec"
 RRECOMMENDS_lirc = "lirc-exec"
-FILE_PR = "r2"
+PR = "r2"
 
 # enable cvs version since until compilation issues for other packages have been fixed (cf. bug 2284 et al).
 #DEFAULT_PREFERENCE = "-1"
diff --git a/packages/litestream/litestream_1.3RC3.bb b/packages/litestream/litestream_1.3RC3.bb
index f6e1ed3aae..022edd368e 100644
--- a/packages/litestream/litestream_1.3RC3.bb
+++ b/packages/litestream/litestream_1.3RC3.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DESCRIPTION = "ShoutCast-compatible streamer"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.litestream.org/litestream/${P}.tar.gz"
 
diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
index e849b4a188..9d5a8af9fb 100644
--- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb
+++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Hardware health monitoring applications"
 HOMEPAGE = "http://www.lm-sensors.org/"
 DEPENDS = "sysfsutils virtual/libiconv"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
            file://prefix-fix.patch;patch=1 \
diff --git a/packages/logic-analyzer/logic-analyzer_0.8.bb b/packages/logic-analyzer/logic-analyzer_0.8.bb
index 31237bbd21..73e8f8ba84 100644
--- a/packages/logic-analyzer/logic-analyzer_0.8.bb
+++ b/packages/logic-analyzer/logic-analyzer_0.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A Java-based logical analyzer for home use."
 LICENSE = "GPL"
 HOMEPAGE = "http://sump.org/projects/analyzer/"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit java
 
diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb
index fb9188c4db..ada7c364e7 100644
--- a/packages/login-manager/login-manager.bb
+++ b/packages/login-manager/login-manager.bb
@@ -4,7 +4,7 @@ inherit update-rc.d
 DESCRIPTION = "Initscript for login-managers"
 SECTION = "base"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 
 INITSCRIPT_NAME = "login-manager"
 INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
diff --git a/packages/logrotate/logrotate_3.7.1.bb b/packages/logrotate/logrotate_3.7.1.bb
index a5b5d5ae82..0a1647e81d 100644
--- a/packages/logrotate/logrotate_3.7.1.bb
+++ b/packages/logrotate/logrotate_3.7.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "popt"
 RDEPENDS = "cron"
 SECTION = "admin"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \
 	   file://logrotate-3.7.1.patch;patch=1 \
diff --git a/packages/lrzsz/lrzsz_0.12.20.bb b/packages/lrzsz/lrzsz_0.12.20.bb
index f2863fb3ce..b44945e35f 100644
--- a/packages/lrzsz/lrzsz_0.12.20.bb
+++ b/packages/lrzsz/lrzsz_0.12.20.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "standard"
 DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
 DEPENDS = ""
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
 	   file://autotools.patch;patch=1 \
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index db467c613b..19a0d43e33 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
 SECTION = "devel"
 DEPENDS = "binutils libelf"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
            ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
diff --git a/packages/lttng/lttng-viewer_0.8.41-20060512.bb b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
index 4f532d5d95..3251c2fcd3 100644
--- a/packages/lttng/lttng-viewer_0.8.41-20060512.bb
+++ b/packages/lttng/lttng-viewer_0.8.41-20060512.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
 extract program execution details from the Linux operating system and  \
 interpret them."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "gtk+ pango popt"
 
 ALTNAME = "LinuxTraceToolkitViewer-0.8.41-12052006"
diff --git a/packages/lua/lua-native_5.0.2.bb b/packages/lua/lua-native_5.0.2.bb
index 61d9e58496..bf70f84ac0 100644
--- a/packages/lua/lua-native_5.0.2.bb
+++ b/packages/lua/lua-native_5.0.2.bb
@@ -1,6 +1,6 @@
 require lua.inc
 
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS += "readline-native"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
diff --git a/packages/lua/lua5.1_5.1.4.bb b/packages/lua/lua5.1_5.1.4.bb
index faf7676f84..b9d26518b2 100644
--- a/packages/lua/lua5.1_5.1.4.bb
+++ b/packages/lua/lua5.1_5.1.4.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 HOMEPAGE = "http://www.lua.org/"
 
 DEPENDS += "readline"
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
            file://makefile.patch;patch=1 \
            file://lua5.1.pc"
diff --git a/packages/lua/lua_5.0.2.bb b/packages/lua/lua_5.0.2.bb
index 6b7885ac12..bb989c04d9 100644
--- a/packages/lua/lua_5.0.2.bb
+++ b/packages/lua/lua_5.0.2.bb
@@ -1,7 +1,7 @@
 require lua.inc
 
 DEPENDS += "readline"
-FILE_PR = "r4"
+PR = "r4"
 SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
 	   file://make.patch;patch=1 \
diff --git a/packages/lvm2/lvm2_2.01.09.bb b/packages/lvm2/lvm2_2.01.09.bb
index 650d374f5d..bc8386f2ce 100644
--- a/packages/lvm2/lvm2_2.01.09.bb
+++ b/packages/lvm2/lvm2_2.01.09.bb
@@ -1,7 +1,7 @@
 SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "device-mapper"
 
 S = "${WORKDIR}/LVM2.${PV}"
diff --git a/packages/lvm2/lvm2_2.01.15.bb b/packages/lvm2/lvm2_2.01.15.bb
index 80dc278cf8..61a18ab87e 100644
--- a/packages/lvm2/lvm2_2.01.15.bb
+++ b/packages/lvm2/lvm2_2.01.15.bb
@@ -1,7 +1,7 @@
 SECTION = "utils"
 DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "device-mapper"
 
 S = "${WORKDIR}/LVM2.${PV}"
diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb
index bb5ea1048f..1a89a4275c 100644
--- a/packages/lyx/lyx_1.4.1.bb
+++ b/packages/lyx/lyx_1.4.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 DEPENDS = "boost"
 RRECOMMENDS = "tetex"
-FILE_PR = "r1"
+PR = "r1"
 
 # we're checking out from svn because the tarball doesn't contain the necessary stuff to run autoreconf
 SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_1;rev=13847"
diff --git a/packages/lyx/lyx_1.4.4.bb b/packages/lyx/lyx_1.4.4.bb
index aaeacf835f..26970a3ed0 100644
--- a/packages/lyx/lyx_1.4.4.bb
+++ b/packages/lyx/lyx_1.4.4.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 DEPENDS = "boost"
 RRECOMMENDS = "tetex"
-FILE_PR = "r0"
+PR = "r0"
 
 # we're checking out from svn because the tarball doesn't contain the necessary stuff to run autoreconf
 SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_4;rev=17185"
diff --git a/packages/lyx/lyx_1.5.1.bb b/packages/lyx/lyx_1.5.1.bb
index df5b89b03f..32e3096dbe 100644
--- a/packages/lyx/lyx_1.5.1.bb
+++ b/packages/lyx/lyx_1.5.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.lyx.org"
 DEPENDS = "boost qt4-x11-free"
 RSUGGESTS = "tetex"
 RDEPENDS = "python-shell python-textutils"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://lyx.cybermirror.org/stable/lyx-${PV}.tar.bz2"
 
diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index e93516b425..24664b32e4 100644
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 DEPENDS = "zlib-native"
-FILE_PR = "r3"
+PR = "r3"
 
 PVNODOT = "${@bb.data.getVar('PV',d,1).split('.')[0]}${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${SOURCEFORGE_MIRROR}/sevenzip/lzma${PVNODOT}.tar.bz2 \
diff --git a/packages/lzma/lzma_4.17.bb b/packages/lzma/lzma_4.17.bb
index c50a34627d..f83ddd587e 100644
--- a/packages/lzma/lzma_4.17.bb
+++ b/packages/lzma/lzma_4.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
 DEPENDS = "zlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
            file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb
index be75a33bdd..a01912da0f 100644
--- a/packages/lzo/lzo_1.08.bb
+++ b/packages/lzo/lzo_1.08.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/"
 LICENSE = "GPLv2"
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r14"
+PR = "r14"
 
 SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
 
diff --git a/packages/madfu/madfu_1.2.bb b/packages/madfu/madfu_1.2.bb
index 374b79382c..354e65aced 100644
--- a/packages/madfu/madfu_1.2.bb
+++ b/packages/madfu/madfu_1.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Firmware loader for m-audio devices"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \
            file://autofoo.patch;patch=1"
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc
index 9ec0a042c1..ddb1e6a50b 100644
--- a/packages/madwifi/madwifi-ng_r.inc
+++ b/packages/madwifi/madwifi-ng_r.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-FILE_PR ="r5"
+PR ="r5"
 
 WACKELF_SRC_URI = ""
 WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
diff --git a/packages/madwifi/madwifi-ng_r2826-20071105.bb b/packages/madwifi/madwifi-ng_r2826-20071105.bb
index 97ad1e5f47..5301e3bd42 100644
--- a/packages/madwifi/madwifi-ng_r2826-20071105.bb
+++ b/packages/madwifi/madwifi-ng_r2826-20071105.bb
@@ -11,4 +11,4 @@ INHIBIT_PACKAGE_STRIP = "1"
 require madwifi-ng_r.inc
 
 # PR set after the include, to override what's set in the included file.
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb
index 3dc1ac4334..fb5cde036f 100644
--- a/packages/madwifi/madwifi-ng_r3314-20080131.bb
+++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb
@@ -11,4 +11,4 @@ SRC_URI += " \
 	"
 
 # PR set after the include, to override what's set in the included file.
-FILE_PR = "r6"
+PR = "r6"
diff --git a/packages/madwifi/madwifi-ng_r3837-20080802.bb b/packages/madwifi/madwifi-ng_r3837-20080802.bb
index 84f4c6d1fa..bf14c33f83 100644
--- a/packages/madwifi/madwifi-ng_r3837-20080802.bb
+++ b/packages/madwifi/madwifi-ng_r3837-20080802.bb
@@ -15,4 +15,4 @@ WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=
 SRCNAME = "madwifi-trunk"
 
 # PR set after the include, to override what's set in the included file.
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
index 72f7f3518c..ceda4ff811 100644
--- a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
 RDEPENDS = "bluez-utils"
 PV = "1.2.4+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 # Only works with SRCDATE_maemo-mapper-nohildon = "20061114"
 SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
diff --git a/packages/maemo-mapper/maemo-mapper_svn.bb b/packages/maemo-mapper/maemo-mapper_svn.bb
index dc02e67154..39e89fcc98 100644
--- a/packages/maemo-mapper/maemo-mapper_svn.bb
+++ b/packages/maemo-mapper/maemo-mapper_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "gdbm libconic sqlite3 gtk+ libhildonfm libosso osso-ic-oss libosso-he
 RDEPENDS = "bluez-utils"
 RRECOMMENDS = "gpsd flite"
 PV = "2.0.3+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
            file://mapper-hildon1.diff;patch=1;maxrev=108" 
diff --git a/packages/maemo/audiofile_0.2.6-3osso4.bb b/packages/maemo/audiofile_0.2.6-3osso4.bb
index 3bec9a7cf6..7b9e0c1cbe 100644
--- a/packages/maemo/audiofile_0.2.6-3osso4.bb
+++ b/packages/maemo/audiofile_0.2.6-3osso4.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r0"
+PR = "r0"
 SECTION = "libs"
 LICENSE = "LGPL GPL"
 DESCRIPTION = "The Audio File Library provides a uniform and elegant \
diff --git a/packages/maemo/libosso-help_1.0.01.bb b/packages/maemo/libosso-help_1.0.01.bb
index d0b0753469..867cc66b7d 100644
--- a/packages/maemo/libosso-help_1.0.01.bb
+++ b/packages/maemo/libosso-help_1.0.01.bb
@@ -1,5 +1,5 @@
 LICENSE = 	"LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = 	"libosso hildon-lgpl hildon-base-lib hildon-libs"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/libo/${PN}/libosso-help_${PV}.tar.gz \
diff --git a/packages/maemo/libosso_0.8.9.bb b/packages/maemo/libosso_0.8.9.bb
index 196ce448f8..90767d78d1 100644
--- a/packages/maemo/libosso_0.8.9.bb
+++ b/packages/maemo/libosso_0.8.9.bb
@@ -1,5 +1,5 @@
 LICENSE = 	"LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = 	"glib-2.0 dbus outo"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso/libosso_${PV}-1.tar.gz"
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index 7f626a4068..71fcad27cf 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/packages/maemo/xpext_1.0-5.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index da658d098a..f4f872e57f 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
diff --git a/packages/maemo4/hildon-thumbnail_0.14.bb b/packages/maemo4/hildon-thumbnail_0.14.bb
index d3c7f8a80d..4098e465b1 100644
--- a/packages/maemo4/hildon-thumbnail_0.14.bb
+++ b/packages/maemo4/hildon-thumbnail_0.14.bb
@@ -2,7 +2,7 @@ require hildon-thumbnail.inc
 
 DEPENDS = "libhildon libosso osso-gnome-vfs2"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/h/${PN}/${PN}_${PV}.tar.gz \
           "
diff --git a/packages/maemo4/libconic_0.13.bb b/packages/maemo4/libconic_0.13.bb
index 4d17935988..5f57cf77b1 100644
--- a/packages/maemo4/libconic_0.13.bb
+++ b/packages/maemo4/libconic_0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Internet connection library"
 LICENSE = "LGPL"
 DEPENDS = "dbus gconf osso-ic-oss"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libc/${PN}/${PN}_${PV}-0.8.tar.gz"
 
diff --git a/packages/maemo4/libhildonfm_1.9.46.bb b/packages/maemo4/libhildonfm_1.9.46.bb
index 22b3163191..67816fb496 100644
--- a/packages/maemo4/libhildonfm_1.9.46.bb
+++ b/packages/maemo4/libhildonfm_1.9.46.bb
@@ -1,6 +1,6 @@
 require libhildonfm.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "\
 	http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}.tar.gz \
diff --git a/packages/maemo4/libhildonhelp_1.9.6.bb b/packages/maemo4/libhildonhelp_1.9.6.bb
index f6a2a34987..6b6e23d951 100644
--- a/packages/maemo4/libhildonhelp_1.9.6.bb
+++ b/packages/maemo4/libhildonhelp_1.9.6.bb
@@ -1,6 +1,6 @@
 require libhildonhelp.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
 
diff --git a/packages/maemo4/libhildonmime_1.10.0.bb b/packages/maemo4/libhildonmime_1.10.0.bb
index 150b91671f..2198f6b2ee 100644
--- a/packages/maemo4/libhildonmime_1.10.0.bb
+++ b/packages/maemo4/libhildonmime_1.10.0.bb
@@ -2,7 +2,7 @@ require libhildonmime.inc
 
 DEPENDS += "osso-gnome-vfs2"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
 
diff --git a/packages/maemo4/libhildonmime_1.9.5.bb b/packages/maemo4/libhildonmime_1.9.5.bb
index 4793230ea9..1a06284314 100644
--- a/packages/maemo4/libhildonmime_1.9.5.bb
+++ b/packages/maemo4/libhildonmime_1.9.5.bb
@@ -1,6 +1,6 @@
 require libhildonmime.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_${PV}-1ubuntu1.tar.gz"
 
diff --git a/packages/maemo4/libosso-gsf_1.11.10.4.bb b/packages/maemo4/libosso-gsf_1.11.10.4.bb
index 7ba8181a3e..6adbc0f6e3 100644
--- a/packages/maemo4/libosso-gsf_1.11.10.4.bb
+++ b/packages/maemo4/libosso-gsf_1.11.10.4.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 zlib"
 
diff --git a/packages/maemo4/libosso-help_2.1.2.bb b/packages/maemo4/libosso-help_2.1.2.bb
index 1a063cbbfb..8a35e1a4f0 100644
--- a/packages/maemo4/libosso-help_2.1.2.bb
+++ b/packages/maemo4/libosso-help_2.1.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Nokia osso help library"
 
 DEPENDS = "libhildonhelp libosso gtkhtml-3.8 libxml2 "
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_${PV}-2.tar.gz"
 
diff --git a/packages/maemo4/libosso_2.13.bb b/packages/maemo4/libosso_2.13.bb
index 61bf51f276..1920e29d3a 100644
--- a/packages/maemo4/libosso_2.13.bb
+++ b/packages/maemo4/libosso_2.13.bb
@@ -1,6 +1,6 @@
 require libosso.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \
diff --git a/packages/maemo4/mce-dev_1.6.3.bb b/packages/maemo4/mce-dev_1.6.3.bb
index 77850b1dab..66e238c109 100644
--- a/packages/maemo4/mce-dev_1.6.3.bb
+++ b/packages/maemo4/mce-dev_1.6.3.bb
@@ -1,6 +1,6 @@
 require mce-dev.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/m/mce-dev/mce-dev_${PV}.tar.gz"
 
diff --git a/packages/maemo4/osso-gnome-vfs2_2.16.3.bb b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb
index 0b42e294a7..4a0be7a9be 100644
--- a/packages/maemo4/osso-gnome-vfs2_2.16.3.bb
+++ b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb
@@ -4,7 +4,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
 DESCRIPTION = "gnomevfs - osso variant"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/maemo4/osso-gwconnect_1.0.12.bb b/packages/maemo4/osso-gwconnect_1.0.12.bb
index b2d12aa322..1a499687f8 100644
--- a/packages/maemo4/osso-gwconnect_1.0.12.bb
+++ b/packages/maemo4/osso-gwconnect_1.0.12.bb
@@ -2,7 +2,7 @@ require osso-gwconnect.inc
 
 DEPENDS += "libhildon bluez-libs"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/o/${PN}/${PN}_${PV}.tar.gz"
 
diff --git a/packages/maemo4/osso-ic-oss_1.0.4.bb b/packages/maemo4/osso-ic-oss_1.0.4.bb
index ac8f381a26..04ec84e4e2 100644
--- a/packages/maemo4/osso-ic-oss_1.0.4.bb
+++ b/packages/maemo4/osso-ic-oss_1.0.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Nokia osso-ic library"
 
 DEPENDS = "dbus-glib glib-2.0 libosso"
 
-FILE_PR = "r1"
+PR = "r1"
 
 # No sources for that Maemo revision any more.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
diff --git a/packages/mailx/mailx_8.1.2-0.20050715cvs.bb b/packages/mailx/mailx_8.1.2-0.20050715cvs.bb
index fd56594e40..3a473e57be 100644
--- a/packages/mailx/mailx_8.1.2-0.20050715cvs.bb
+++ b/packages/mailx/mailx_8.1.2-0.20050715cvs.bb
@@ -3,7 +3,7 @@ DEPENDS = "liblockfile"
 RRECOMMENDS = "ssmtp"
 DESCRIPTION = "mailx is the traditional command-line-mode \
 mail user agent."
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz \
 	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1 \
diff --git a/packages/make/make-native_3.80.bb b/packages/make/make-native_3.80.bb
index 7aa219b109..509558c405 100644
--- a/packages/make/make-native_3.80.bb
+++ b/packages/make/make-native_3.80.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/make-${PV}"
 
diff --git a/packages/make/make-native_3.81.bb b/packages/make/make-native_3.81.bb
index 7aa219b109..509558c405 100644
--- a/packages/make/make-native_3.81.bb
+++ b/packages/make/make-native_3.81.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/make-${PV}"
 
diff --git a/packages/make/make_3.80.bb b/packages/make/make_3.80.bb
index 29820f2383..797d26b3be 100644
--- a/packages/make/make_3.80.bb
+++ b/packages/make/make_3.80.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require make.inc
diff --git a/packages/make/make_3.81.bb b/packages/make/make_3.81.bb
index 29820f2383..797d26b3be 100644
--- a/packages/make/make_3.81.bb
+++ b/packages/make/make_3.81.bb
@@ -1,3 +1,3 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require make.inc
diff --git a/packages/makedev/makedev_2.3.1.bb b/packages/makedev/makedev_2.3.1.bb
index f54fc8155a..317840f8ed 100644
--- a/packages/makedev/makedev_2.3.1.bb
+++ b/packages/makedev/makedev_2.3.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "makedev"
-FILE_PR = "r1"
+PR = "r1"
 SECTION = "base"
 DESCRIPTION = "The MAKEDEV executable is used to create \
 device files, often in /dev."
diff --git a/packages/makedevs/makedevs_1.0.0.bb b/packages/makedevs/makedevs_1.0.0.bb
index 62709a84ff..249e1a47c4 100644
--- a/packages/makedevs/makedevs_1.0.0.bb
+++ b/packages/makedevs/makedevs_1.0.0.bb
@@ -6,7 +6,7 @@ PRIORITY = "required"
 SRC_URI = "file://makedevs.c"
 S = "${WORKDIR}/makedevs-${PV}"
 
-FILE_PR = "r6"
+PR = "r6"
 
 inherit update-alternatives
 
diff --git a/packages/mamona/bash-noemu_3.2.bb b/packages/mamona/bash-noemu_3.2.bb
index 53c330620f..c638b038fc 100644
--- a/packages/mamona/bash-noemu_3.2.bb
+++ b/packages/mamona/bash-noemu_3.2.bb
@@ -1,5 +1,5 @@
 require ../bash/bash.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
            file://001-005.patch;patch=1"
diff --git a/packages/mamona/binutils-noemu_2.17.50.0.5.bb b/packages/mamona/binutils-noemu_2.17.50.0.5.bb
index bde5488aa2..cefc2af1c4 100644
--- a/packages/mamona/binutils-noemu_2.17.50.0.5.bb
+++ b/packages/mamona/binutils-noemu_2.17.50.0.5.bb
@@ -1,6 +1,6 @@
 require ../binutils/binutils.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/mamona/gcc-noemu_4.1.1.bb b/packages/mamona/gcc-noemu_4.1.1.bb
index 95e767490c..fbf1b0dd46 100644
--- a/packages/mamona/gcc-noemu_4.1.1.bb
+++ b/packages/mamona/gcc-noemu_4.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r14"
+PR = "r14"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/mamona/mamona-sound-n800_0.1.0.bb b/packages/mamona/mamona-sound-n800_0.1.0.bb
index b94f140701..c1c66720bc 100644
--- a/packages/mamona/mamona-sound-n800_0.1.0.bb
+++ b/packages/mamona/mamona-sound-n800_0.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 #SECTION = "console/utils"
 LICENSE = "GPL"
 RDEPENDS = "dspgw-utils udev alsa-lib alsa-utils-alsactl alsa-state"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/mamona/usbnet_0.1.0.bb b/packages/mamona/usbnet_0.1.0.bb
index b1144f6e9e..37c4189082 100644
--- a/packages/mamona/usbnet_0.1.0.bb
+++ b/packages/mamona/usbnet_0.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 SECTION = "utils"
 LICENSE = "GPL"
 RDEPENDS = "module-init-tools busybox"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb
index 7849ad51a5..e46b5b03cc 100644
--- a/packages/man/man_1.5p.bb
+++ b/packages/man/man_1.5p.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DESCRIPTION = "The man page suite, including man, apropos, \
 and whatis consists of programs that are used to read most \
 of the documentation available on a Linux system."
-FILE_PR = "r3"
+PR = "r3"
 RDEPENDS_${PN} = "less groff"
 
 # Note: The default man.conf uses wrong names for GNU eqn and troff,
diff --git a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
index a162bd74db..8fbf5e3578 100644
--- a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
+++ b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Panel applet to eject cards (from PdaXrom project)"
 LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-${PV}.tar.bz2 \
 	file://oz-gpe.patch;patch=1 \
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 9fe3cb288f..09f2a7d999 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \
 	   file://update-to-svn.diff;patch=1 \
diff --git a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
index fbde8d63ee..0f32409333 100644
--- a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
+++ b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz \
     file://85mb-applet-startup-monitor"
diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
index 83fee18d65..6193067bfa 100644
--- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
+++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks applet switcher for matchbox"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ libwnck libmatchbox"
 
-FILE_PR = "r1"
+PR = "r1"
 
 CFLAGS += "-I${STAGING_INCDIR} \
 	   -I${STAGING_INCDIR}/gtk-2.0 \
diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb
index 2114e86f49..6ec38cfbef 100644
--- a/packages/matchbox-common/matchbox-common_0.9.1.bb
+++ b/packages/matchbox-common/matchbox-common_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox window manager common files"
 SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://no-utilities-category.patch;patch=1 \
diff --git a/packages/matchbox-common/matchbox-common_svn.bb b/packages/matchbox-common/matchbox-common_svn.bb
index a342154bfa..eff0642970 100644
--- a/packages/matchbox-common/matchbox-common_svn.bb
+++ b/packages/matchbox-common/matchbox-common_svn.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
 PV = "0.9.1+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/matchbox-common/matchbox_0.9.1.bb b/packages/matchbox-common/matchbox_0.9.1.bb
index 07b77697c3..0821b03bcc 100644
--- a/packages/matchbox-common/matchbox_0.9.1.bb
+++ b/packages/matchbox-common/matchbox_0.9.1.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Metapackage for Matchbox suite"
 LICENSE = "GPL"
 RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 SECTION = "x11/wm"
-FILE_PR = "r1"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.8.bb b/packages/matchbox-desktop/matchbox-desktop_0.8.bb
index 4e369a38a5..853f2cb4e9 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.8.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.8.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/wm"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 1626a6772d..d3be3b166e 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 96a2b941b7..1dea200225 100644
--- a/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -5,7 +5,7 @@ SECTION = "x11/wm"
 PV = "0.9.1+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 5e85a7f5d7..03123d9b8b 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -5,7 +5,7 @@ RCONFLICTS_${PN} = "matchbox-keyboard"
 RPROVIDES_${PN} = "matchbox-keyboard"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	    file://smallscreen-fontsize.patch;patch=1 \
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 7a6721de66..96a621fe75 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -5,7 +5,7 @@ RCONFLICTS = matchbox-keyboard-inputmethod
 RPROVIDES_${PN} = matchbox-keyboard-inputmethod
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR ="r7"
+PR ="r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://smallscreen-fontsize.patch;patch=1 \
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
index b61a70b112..6a466a1e9a 100644
--- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
@@ -3,7 +3,7 @@ AUTHOR = "Sergey Lapin"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-FILE_PR = "r5"
+PR = "r5"
 
 PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f"
 
diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
index ad867e9c16..2fd7926707 100644
--- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
+++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 
 DEPENDS = "matchbox xmodmap"
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "file://xrandr-panelapp.sh \
 	   file://xrandr-panelapp.desktop \
diff --git a/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb b/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
index ce057c0e20..b10f6c3479 100644
--- a/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
+++ b/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+"
 SECTION = "x11/wm"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 6198e47371..d81d38b285 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools pkgconfig gettext
 
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 3aa2b0155f..f6600bdbcd 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-FILE_PR = "r4"
+PR = "r4"
 DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
index 16cf3b0cdc..f15d16f39a 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
 	file://make-batteryapp-less-strict.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index 44f0e3a4dc..3a10e1938d 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://allow-100-per-cent-battery.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 03aa4ccc88..42957a4fa8 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -1,6 +1,6 @@
 require matchbox-panel.inc
 
-FILE_PR ="r12"
+PR ="r12"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://add_hostap.patch;patch=1 \
            http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
index 2b1021f9a8..b7b12edc63 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
@@ -1,4 +1,4 @@
 require matchbox-panel.inc
-FILE_PR ="r3"
+PR ="r3"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
 	   file://mb-applet-battery-repaint-093.patch;patch=1"
diff --git a/packages/matchbox-sato/matchbox-sato_0.1.bb b/packages/matchbox-sato/matchbox-sato_0.1.bb
index 1233931448..b622f24586 100644
--- a/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
 RCONFLICTS = "matchbox-common"
-FILE_PR = "r17"
+PR = "r17"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}
diff --git a/packages/matchbox-stroke/matchbox-stroke_svn.bb b/packages/matchbox-stroke/matchbox-stroke_svn.bb
index ed7cb76051..d9f17e9f9d 100644
--- a/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
 PV = "0.0+svnr${SRCREV}"
 
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
index 3b6470f3a3..4972444211 100644
--- a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
+++ b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
@@ -6,7 +6,7 @@ SECTION = "x11/wm"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index fc1089986f..592ffa50a2 100644
--- a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -6,7 +6,7 @@ SECTION = "x11/wm"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-themes-extra-${PV}"
 
-FILE_PR = "r1"
+PR = "r1"
 PACKAGE_ARCH = "all"
 
 inherit autotools  pkgconfig
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 5bb4efba6a..209eff2268 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -2,7 +2,7 @@ require matchbox-wm.inc
 
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
 RDEPENDS = ""
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
 	   file://kbdconfig"
diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb
index dc3dd2994f..27d6fb5c26 100644
--- a/packages/matchbox-wm/matchbox-wm_1.0.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.0.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
 RDEPENDS = ""
 
-FILE_PR ="r3"
+PR ="r3"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \
diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb
index 21e00122a3..ab93e51723 100644
--- a/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
 RDEPENDS = ""
 
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \
 	   file://kbdconfig"
diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb
index 7ae87367da..a44104fc59 100644
--- a/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.2.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native "
 RDEPENDS = ""
 
-FILE_PR ="r4"
+PR ="r4"
 
 SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
            file://configure_fix.patch;patch=1 \
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index fceea9e405..554811d597 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf "
 RDEPENDS = ""
 PV = "1.1+svn${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
diff --git a/packages/matchbox2/matchbox-desktop-2_svn.bb b/packages/matchbox2/matchbox-desktop-2_svn.bb
index 27302094f1..8dc74ef509 100644
--- a/packages/matchbox2/matchbox-desktop-2_svn.bb
+++ b/packages/matchbox2/matchbox-desktop-2_svn.bb
@@ -4,7 +4,7 @@ SECTION = "x11/panels"
 DEPENDS = "gtk+ startup-notification"
 
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index d72e75ebe1..79fafff202 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+ apmd startup-notification"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
index 53b2fe6a1c..e7a933ee0c 100644
--- a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
+++ b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb
@@ -25,7 +25,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \
             libxine-plugin-dmx-avi \
 	    libxine-plugin-ao-out-oss \
 	    matchbox-desktop	"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2"
 
diff --git a/packages/mbmerlin/mbmerlin_0.8.1-2.bb b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
index 3a7b345120..4842aac7ff 100644
--- a/packages/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/packages/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit pkgconfig gpe
 
diff --git a/packages/mc/mc_4.6.0.bb b/packages/mc/mc_4.6.0.bb
index 5a817507b3..e5c18784be 100644
--- a/packages/mc/mc_4.6.0.bb
+++ b/packages/mc/mc_4.6.0.bb
@@ -1,2 +1,2 @@
 require mc.inc
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/mc/mc_4.6.1.bb b/packages/mc/mc_4.6.1.bb
index 5a817507b3..e5c18784be 100644
--- a/packages/mc/mc_4.6.1.bb
+++ b/packages/mc/mc_4.6.1.bb
@@ -1,2 +1,2 @@
 require mc.inc
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb
index 49728c551e..3519f91c37 100644
--- a/packages/mdadm/mdadm_1.12.0.bb
+++ b/packages/mdadm/mdadm_1.12.0.bb
@@ -1,4 +1,4 @@
 require mdadm.inc
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += " file://build_flags.patch;patch=1 "
diff --git a/packages/mdadm/mdadm_2.5.5.bb b/packages/mdadm/mdadm_2.5.5.bb
index 9b2de012e5..0219b12f61 100644
--- a/packages/mdadm/mdadm_2.5.5.bb
+++ b/packages/mdadm/mdadm_2.5.5.bb
@@ -1,3 +1,3 @@
 require mdadm.inc
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb
index 336b445df8..9391263d00 100644
--- a/packages/mdev/mdev_1.2.1.bb
+++ b/packages/mdev/mdev_1.2.1.bb
@@ -4,7 +4,7 @@ busybox. This adds a very small extra overhead in rootfs size      \
 (approx 4kB) but allows greater flexibility."
 HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 S = "${WORKDIR}/busybox-${PV}"
 
diff --git a/packages/mdk/mdk2_v33.bb b/packages/mdk/mdk2_v33.bb
index 29629225d0..e167be347c 100644
--- a/packages/mdk/mdk2_v33.bb
+++ b/packages/mdk/mdk2_v33.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
 LICENSE = "GPLv2"
 DEPENDS = ""
 RDEPENDS = ""
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-${PV}.tar.bz2 \
 	   file://mdk2-ppcfix.patch"
diff --git a/packages/mediatomb/mediatomb_0.11.0.bb b/packages/mediatomb/mediatomb_0.11.0.bb
index 50f66cf419..f529a55065 100644
--- a/packages/mediatomb/mediatomb_0.11.0.bb
+++ b/packages/mediatomb/mediatomb_0.11.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
 HOMEPAGE = "http://mediatomb.cc/"
 LICENSE = "GPLv2"
 DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file id3lib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \
            file://curl.diff;patch=1 \
diff --git a/packages/mediatomb/mediatomb_0.8+0.9.0-pre.bb b/packages/mediatomb/mediatomb_0.8+0.9.0-pre.bb
index 045877a4d8..c903321b70 100644
--- a/packages/mediatomb/mediatomb_0.8+0.9.0-pre.bb
+++ b/packages/mediatomb/mediatomb_0.8+0.9.0-pre.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
 HOMEPAGE = "http://mediatomb.cc/"
 LICENSE = "GPLv2"
 DEPENDS = "sqlite3 libexif js zlib file id3lib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-0.9.0-pre.tar.gz"
 
diff --git a/packages/mediatomb/mediatomb_0.9.0.bb b/packages/mediatomb/mediatomb_0.9.0.bb
index d109fd80b1..f3ea9f54dd 100644
--- a/packages/mediatomb/mediatomb_0.9.0.bb
+++ b/packages/mediatomb/mediatomb_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
 HOMEPAGE = "http://mediatomb.cc/"
 LICENSE = "GPLv2"
 DEPENDS = "sqlite3 libexif js zlib file id3lib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz"
 
diff --git a/packages/mediatomb/mediatomb_0.9.1.bb b/packages/mediatomb/mediatomb_0.9.1.bb
index d109fd80b1..f3ea9f54dd 100644
--- a/packages/mediatomb/mediatomb_0.9.1.bb
+++ b/packages/mediatomb/mediatomb_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
 HOMEPAGE = "http://mediatomb.cc/"
 LICENSE = "GPLv2"
 DEPENDS = "sqlite3 libexif js zlib file id3lib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz"
 
diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb
index 940a184952..0283eb6ae7 100644
--- a/packages/mediatomb/mediatomb_svn.bb
+++ b/packages/mediatomb/mediatomb_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://mediatomb.org/"
 LICENSE = "GPLv2"
 DEPENDS = "sqlite3 libexif js zlib file id3lib"
 PV = "0.8+0.9pre1+svn${SRCDATE}-sqlite"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://mediatomb.svn.sourceforge.net/svnroot/mediatomb/trunk;proto=https;module=mediatomb"
 
diff --git a/packages/memedit/memedit_0.7.bb b/packages/memedit/memedit_0.7.bb
index 5e8d1551cf..75fb676df8 100644
--- a/packages/memedit/memedit_0.7.bb
+++ b/packages/memedit/memedit_0.7.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 SECTION = "devel"
 DEPENDS = "readline"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.pengutronix.de/software/memedit/downloads/memedit-${PV}.tar.gz"
 
diff --git a/packages/memtester/memtester_4.0.5.bb b/packages/memtester/memtester_4.0.5.bb
index 046d4015f0..6a84471cee 100644
--- a/packages/memtester/memtester_4.0.5.bb
+++ b/packages/memtester/memtester_4.0.5.bb
@@ -1,7 +1,7 @@
 SECTION = "console/utils"
 DESCRIPTION = "Utility to test for faulty memory subsystem"
 LICENSE = "GPLv2"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz"
 SRC_URI += "file://Makefile.patch;patch=1"
diff --git a/packages/memtester/memtester_4.0.6.bb b/packages/memtester/memtester_4.0.6.bb
index db8e5537f8..1fb4541eb6 100644
--- a/packages/memtester/memtester_4.0.6.bb
+++ b/packages/memtester/memtester_4.0.6.bb
@@ -1,7 +1,7 @@
 SECTION = "console/utils"
 DESCRIPTION = "Utility to test for faulty memory subsystem"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/memtester-${PV}.tar.gz"
 SRC_URI += "file://Makefile.patch;patch=1"
diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb
index 1a4631026d..f94ea8b3d2 100644
--- a/packages/mesa/mesa-dri_6.5.2.bb
+++ b/packages/mesa/mesa-dri_6.5.2.bb
@@ -6,7 +6,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
diff --git a/packages/mesa/mesa-dri_7.0.3.bb b/packages/mesa/mesa-dri_7.0.3.bb
index 27e33148df..330efb23af 100644
--- a/packages/mesa/mesa-dri_7.0.3.bb
+++ b/packages/mesa/mesa-dri_7.0.3.bb
@@ -7,7 +7,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
diff --git a/packages/mesa/mesa-dri_7.2.bb b/packages/mesa/mesa-dri_7.2.bb
index c3dbbbfcaf..8dfc7f83d3 100644
--- a/packages/mesa/mesa-dri_7.2.bb
+++ b/packages/mesa/mesa-dri_7.2.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/mesa/mesa-dri_git.bb b/packages/mesa/mesa-dri_git.bb
index 6c04b74933..d9e61d8a5c 100644
--- a/packages/mesa/mesa-dri_git.bb
+++ b/packages/mesa/mesa-dri_git.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.2+git${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/mesa/mesa-xlib_7.2.bb b/packages/mesa/mesa-xlib_7.2.bb
index 2240a3c58c..069446904c 100644
--- a/packages/mesa/mesa-xlib_7.2.bb
+++ b/packages/mesa/mesa-xlib_7.2.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 EXTRA_OECONF += "--with-driver=xlib"
 
diff --git a/packages/mesa/mesa_6.5.2.bb b/packages/mesa/mesa_6.5.2.bb
index 74f96e8b5d..79993cc1f1 100644
--- a/packages/mesa/mesa_6.5.2.bb
+++ b/packages/mesa/mesa_6.5.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 include mesa-mesa.inc
 
diff --git a/packages/meta/cross-linkage_1.0.bb b/packages/meta/cross-linkage_1.0.bb
index bfb7aa9ee8..9be09aa6f8 100644
--- a/packages/meta/cross-linkage_1.0.bb
+++ b/packages/meta/cross-linkage_1.0.bb
@@ -4,7 +4,7 @@ PACKAGES = ""
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = ""
 
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
index eaa422dcff..5884f85c21 100644
--- a/packages/meta/distro-feed-configs.bb
+++ b/packages/meta/distro-feed-configs.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
-FILE_PR = "r0"
+PR = "r0"
 
 DISTRO_FEED_PREFIX ?= "remote"
 DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index 6e3050598f..e1dae5a2fe 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -16,7 +16,7 @@ PROVIDES = "\
 
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit sdk
 
diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb
index 5bbf10ca43..2bd8437f13 100644
--- a/packages/meta/foonas-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are compatible with FooNAS"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 CONFLICTS = "db3"
 PROVIDES += "${FOONAS_IMAGENAME}-packages"
 
diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index 33d3dd8cd3..cdc76402e1 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 180385366e..1182b0cf42 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 91af42be9c..24be1295e4 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
 LICENSE = "MIT"
-FILE_PR ="r3"
+PR ="r3"
 
 RDEPENDS = "\
     task-gpe-apps \
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index c1e1fe3dd3..15e9fd1911 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 LICENSE = "MIT"
-FILE_PR = "r43"
+PR = "r43"
 
 RDEPENDS = "\
     task-gpe-base \
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 9926b71d57..72216a6304 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for maemo environment"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "\
     maemo-task-base \
diff --git a/packages/meta/meta-mamona-light.bb b/packages/meta/meta-mamona-light.bb
index f04a118390..562ba5b639 100644
--- a/packages/meta/meta-mamona-light.bb
+++ b/packages/meta/meta-mamona-light.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for Mamona"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit meta
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/meta-mamona.bb b/packages/meta/meta-mamona.bb
index b750f508d7..e4fb4bdfb7 100644
--- a/packages/meta/meta-mamona.bb
+++ b/packages/meta/meta-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for Mamona"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit meta
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/meta-nas-server.bb b/packages/meta/meta-nas-server.bb
index 83ed4f0ee8..3deb44c2bd 100644
--- a/packages/meta/meta-nas-server.bb
+++ b/packages/meta/meta-nas-server.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for a network attached storage server"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "\
 	task-nas-server-everything \
diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index e40f038d84..ccdbbe973d 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for QPE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 RDEPENDS = " \
     task-qpe-applets \
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 7f499a3a9c..6a9c35c5e3 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
-FILE_PR = "r34"
+PR = "r34"
 LICENSE = "MIT"
 
 RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index aeb863c84f..a1ab3918b7 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for SDL"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
 
diff --git a/packages/meta/meta-toolchain-neuros.bb b/packages/meta/meta-toolchain-neuros.bb
index 794fbf90b1..f60fbf0063 100644
--- a/packages/meta/meta-toolchain-neuros.bb
+++ b/packages/meta/meta-toolchain-neuros.bb
@@ -1,6 +1,6 @@
 # Toolchain for neuros-osd devices
 
-FILE_PR = "r3"
+PR = "r3"
 
 TOOLCHAIN_HOST_TASK = "task-sdk-host \
                        qmake2-sdk uicmoc4-sdk"
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 375e89e51b..b7e5626f61 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
 TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
diff --git a/packages/meta/meta-toolchain-slugos.bb b/packages/meta/meta-toolchain-slugos.bb
index 7461a0377a..60326c0bc1 100644
--- a/packages/meta/meta-toolchain-slugos.bb
+++ b/packages/meta/meta-toolchain-slugos.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 TOOLCHAIN_HOST_TASK = "task-slugos-toolchain-host"
 
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index b966d9e635..7d66ee5d61 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
 HOMEPAGE = "http://www.openprotium.org"
 LICENSE = "MIT"
-FILE_PR = "r4"
+PR = "r4"
 CONFLICTS = "db3"
 PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb
index e37a2cf0d8..190f323838 100644
--- a/packages/meta/oplinux-packages.bb
+++ b/packages/meta/oplinux-packages.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb
index a42ee71218..1e60e8c8af 100644
--- a/packages/meta/slugos-native-packages.bb
+++ b/packages/meta/slugos-native-packages.bb
@@ -1,7 +1,7 @@
 # Only list packages which will not build 'cross' in here.
 DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index ca004734df..9dae7e8df3 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-FILE_PR = "r7"
+PR = "r7"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 4fb7f6ddb6..b01c96b189 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-FILE_PR = "r59"
+PR = "r59"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
diff --git a/packages/meta/staging-linkage_1.0.bb b/packages/meta/staging-linkage_1.0.bb
index f02ff6bd17..95d82d3273 100644
--- a/packages/meta/staging-linkage_1.0.bb
+++ b/packages/meta/staging-linkage_1.0.bb
@@ -4,7 +4,7 @@ PACKAGES = ""
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = ""
 
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 28550ad1e3..ca194979e7 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are compatible with the Unslung firmware"
 LICENSE = "MIT"
-FILE_PR = "r5"
+PR = "r5"
 COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index ff59e3e30e..5f3c640f00 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Basic X clients (meta package)"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/metalog/metalog_0.7.bb b/packages/metalog/metalog_0.7.bb
index 85633febda..ac24694001 100644
--- a/packages/metalog/metalog_0.7.bb
+++ b/packages/metalog/metalog_0.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Metalog is a replacement for syslogd."
 DEPENDS = "libpcre"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/metalog/metalog-${PV}.tar.gz \
            file://crosscompile.patch;patch=1"
diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb
index bf67def242..375ea90f0d 100644
--- a/packages/mgetty/mgetty_1.1.30.bb
+++ b/packages/mgetty/mgetty_1.1.30.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The mgetty package contains an intelligent \
 getty for allowing logins over a serial line (such as \
 through a modem) and receiving incoming faxes."
 LICENSE = "GPL"
-FILE_PR ="r3"
+PR ="r3"
 
 # The source can no longer be found at ${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz
 # so the nslu2-linux project has mirrored it until someone updates this package to a newer version.
diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb
index 3da4e457af..38faec8448 100644
--- a/packages/miau/miau_0.5.3.bb
+++ b/packages/miau/miau_0.5.3.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://sf.net/project/miau/"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/miau/miau-${PV}.tar.gz \
            file://paths.patch;patch=1 \
diff --git a/packages/miconapl/miconapl_0.0.1.bb b/packages/miconapl/miconapl_0.0.1.bb
index 21b070049f..c5e27ee004 100644
--- a/packages/miconapl/miconapl_0.0.1.bb
+++ b/packages/miconapl/miconapl_0.0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "miconapl daemon for ARM Linkstations"
 SECTION = "console/network"
 DEPENDS = ""
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "GPL"
 COMPATIBLE_MACHINE = "lsarm"
 
diff --git a/packages/micro-evtd/micro-evtd_0.0.1.bb b/packages/micro-evtd/micro-evtd_0.0.1.bb
index 149e17de63..c66975c6ae 100644
--- a/packages/micro-evtd/micro-evtd_0.0.1.bb
+++ b/packages/micro-evtd/micro-evtd_0.0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "micro_evtd daemon for ARM Linkstations"
 SECTION = "console/network"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "GPL"
 COMPATIBLE_MACHINE = "(lsarm)"
 
diff --git a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
index a3436c499c..664fb242e1 100644
--- a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
index 2b3798c145..18f448c1ec 100644
--- a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
index a5da02cce4..79994d1395 100644
--- a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
index 78819c890e..c2fd6376a3 100644
--- a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
index 0c724190f2..2e7c8bb53b 100644
--- a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-backend-gtk_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
index 9d66223a80..619f56ffa7 100644
--- a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
index a6ecbac7d7..9f169c652e 100644
--- a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
index 5d728f8967..1d79379863 100644
--- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
index 0c3643c8be..f26ea4eac5 100644
--- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
index 569cfd5e3a..6d7cb9dba7 100644
--- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
index 67364cc794..723fd41e43 100644
--- a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
index a22f1b4df6..f8dd8e6e22 100644
--- a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-core_0.2+0.3rc1.bb b/packages/midpath/midpath-core_0.2+0.3rc1.bb
index 4a9d2c465a..d0ba53bfbd 100644
--- a/packages/midpath/midpath-core_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-core_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-demos_0.2+0.3rc1.bb b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
index bdc402222e..1a2f690bf1 100644
--- a/packages/midpath/midpath-demos_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
index ccb338d360..e003fe9bdb 100644
--- a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-location_0.2+0.3rc1.bb b/packages/midpath/midpath-location_0.2+0.3rc1.bb
index 821a8f3720..349356fa65 100644
--- a/packages/midpath/midpath-location_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-location_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
index b9984e3e33..a0a1c42dd4 100644
--- a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
index c00c46aedc..10fcf6681d 100644
--- a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 # The patch fixes the system_properties file only deployed in this recipe.
 SRC_URI = "\
@@ -10,7 +10,7 @@ SRC_URI = "\
 
 S = "${WORKDIR}/midpath-0.3rc1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://configuration_maemo.cfg"
 
diff --git a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
index 4fe2160c2e..554f864491 100644
--- a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
index 964b7aa9cb..b5b7d67954 100644
--- a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
index 2ed8c4c8c1..edb20af441 100644
--- a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 # The patch fixes the system_properties file only deployed in this recipe.
 SRC_URI = "\
@@ -10,7 +10,7 @@ SRC_URI = "\
 
 S = "${WORKDIR}/midpath-0.3rc1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://configuration_openmoko.cfg"
 
diff --git a/packages/midpath/midpath-svg_0.2+0.3rc1.bb b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
index 6ba7b8ec12..d63caa5363 100644
--- a/packages/midpath/midpath-svg_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
index 102897071b..7f2f197cc1 100644
--- a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
@@ -1,6 +1,6 @@
 require midpath-common.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
 
diff --git a/packages/mii-diag/mii-diag_2.11.bb b/packages/mii-diag/mii-diag_2.11.bb
index 7eaf98ac56..8f664e9efe 100644
--- a/packages/mii-diag/mii-diag_2.11.bb
+++ b/packages/mii-diag/mii-diag_2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Examines and sets the MII registers of network cards."
 LICENSE = "GPL"
 SECTION = "console/network"
 PRIORITY = "optional"
-FILE_PR = "r3"
+PR = "r3"
 
 S = "${WORKDIR}/"
 
diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb
index 66c9916f79..d9d4595c2e 100644
--- a/packages/mikmod/mikmod_3.2.2-beta1.bb
+++ b/packages/mikmod/mikmod_3.2.2-beta1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod."
 SECTION = "console/multimedia"
 HOMEPAGE = "http://mikmod.raphnet.net"
 DEPENDS = "ncurses libmikmod"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
            file://m4.patch;patch=1"
diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb
index 92f5871a0f..a917f76d05 100644
--- a/packages/mileage/mileage_cvs.bb
+++ b/packages/mileage/mileage_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 #Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV
 PV = "4.2.0-cvs-${SRCDATE}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@mileage.cvs.sourceforge.net/cvsroot/mileage;module=mileage"
 S = "${WORKDIR}/mileage"
diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb
index 9c14012239..f5ebfb650d 100644
--- a/packages/mime-support/mime-support_3.28.bb
+++ b/packages/mime-support/mime-support_3.28.bb
@@ -5,7 +5,7 @@ DEPENDS = "file"
 RRECOMMENDS = "file"
 LICENSE = "PD"
 PACKAGE_ARCH = "all"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb
index 1812926e74..ff343561df 100644
--- a/packages/miniclipboard/miniclipboard_0.3.bb
+++ b/packages/miniclipboard/miniclipboard_0.3.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Clipboard management application"
 DEPENDS = "virtual/libx11 libxpm"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://miniclipboard.desktop \
             file://makefile.patch;patch=1;pnum=0"
diff --git a/packages/minifo/minifo-modules_0.6.1-pre1.bb b/packages/minifo/minifo-modules_0.6.1-pre1.bb
index dc61584f68..ae6e5ebb4c 100644
--- a/packages/minifo/minifo-modules_0.6.1-pre1.bb
+++ b/packages/minifo/minifo-modules_0.6.1-pre1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The mini fanout overlay file system"
 HOMEPAGE = "http://www.denx.de/twiki/bin/view/Know/MiniFOHome"
 LICENSE = "GPL"
 SECTION = "kernel/modules"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2"
 S = "${WORKDIR}/mini_fo"
diff --git a/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb b/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
index 905f68b5b0..0f3dec1912 100644
--- a/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
+++ b/packages/mipl-mipv6/mipv6_1.1-v2.4.26.bb
@@ -8,7 +8,7 @@ CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
 
 PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 
-FILE_PR ="r3"
+PR ="r3"
 
 inherit autotools module-base
 
diff --git a/packages/misc-binary-only/acx-firmware_1.0.bb b/packages/misc-binary-only/acx-firmware_1.0.bb
index 138d67571d..bfeaae773f 100644
--- a/packages/misc-binary-only/acx-firmware_1.0.bb
+++ b/packages/misc-binary-only/acx-firmware_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ACX (iPAQ HX4700/HTC Universal) wireless firmware."
 SECTION = "base"
 LICENSE = "Unknown"
-FILE_PR = "r2"
+PR = "r2"
 RRECOMMENDS = "kernel-module-firmware-class"
 
 SRC_URI = "http://sdgsystems.com/pub/ipaq/hx4700/src/RADIO0d.BIN \
diff --git a/packages/misc-binary-only/prism-firmware.bb b/packages/misc-binary-only/prism-firmware.bb
index 9177b0f1df..3e2cf4531c 100644
--- a/packages/misc-binary-only/prism-firmware.bb
+++ b/packages/misc-binary-only/prism-firmware.bb
@@ -5,7 +5,7 @@ RDEPENDS = "hostap-utils"
 RREPLACES = "prism3-firmware prism3-support"
 RCONFLICTS = "prism3-firmware prism3-support"
 PACKAGE_ARCH = "all"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2 \
            http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2 \
diff --git a/packages/misc-binary-only/tiinit_3.2.26.bb b/packages/misc-binary-only/tiinit_3.2.26.bb
index 70b3f04ad2..c97f216f6d 100644
--- a/packages/misc-binary-only/tiinit_3.2.26.bb
+++ b/packages/misc-binary-only/tiinit_3.2.26.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "TI Bluetooth init bits."
 SECTION = "base"
 LICENSE = "Unknown"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://sdgsystems.com/pub/ipaq/hx4700/src/TIInit_${PV}.bts"
 
diff --git a/packages/mobilemesh/mobilemesh_1.2.bb b/packages/mobilemesh/mobilemesh_1.2.bb
index ca54d85953..df8f2f98bb 100644
--- a/packages/mobilemesh/mobilemesh_1.2.bb
+++ b/packages/mobilemesh/mobilemesh_1.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mitre.org/work/tech_transfer/mobilemesh/"
 LICENSE = "GPL"
 DEPENDS = "openssl"
 SRC_URI = "http://meshcube.org/download/mobilemesh_1.2.tgz"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/mobilemesh"
 
diff --git a/packages/modphp/modphp_5.1.6.bb b/packages/modphp/modphp_5.1.6.bb
index 9486fadf72..7c421c1d0f 100644
--- a/packages/modphp/modphp_5.1.6.bb
+++ b/packages/modphp/modphp_5.1.6.bb
@@ -1,2 +1,2 @@
 include modphp5.inc
-FILE_PR ='r2'
+PR ='r2'
diff --git a/packages/modplugplay/modplugplay_1.0.bb b/packages/modplugplay/modplugplay_1.0.bb
index f697f0619a..d91e2b3a97 100644
--- a/packages/modplugplay/modplugplay_1.0.bb
+++ b/packages/modplugplay/modplugplay_1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/"
 LICENSE = "GPL"
 SECTION = "console/multimedia"
 DEPENDS = "libmodplug"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz"
 
diff --git a/packages/module-init-tools/module-init-tools_3.2.1.bb b/packages/module-init-tools/module-init-tools_3.2.1.bb
index a8bd8cc74b..91c0efcd64 100644
--- a/packages/module-init-tools/module-init-tools_3.2.1.bb
+++ b/packages/module-init-tools/module-init-tools_3.2.1.bb
@@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb
index 6f49e56004..a56bac7a82 100644
--- a/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-FILE_PR = "r5"
+PR = "r5"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
diff --git a/packages/modutils/modutils-collateral.bb b/packages/modutils/modutils-collateral.bb
index 7de145d88d..6d010a5754 100644
--- a/packages/modutils/modutils-collateral.bb
+++ b/packages/modutils/modutils-collateral.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 DESCRIPTION = "modutils configuration files"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "MIT"
 
 SRC_URI = "file://modules \
diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb
index 2e84c0d413..3bd1ae2b84 100644
--- a/packages/modutils/modutils-cross_2.4.27.bb
+++ b/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 require modutils_${PV}.bb
-FILE_PR = "r9"
+PR = "r9"
 inherit cross
 S = "${WORKDIR}/modutils-${PV}"
 DEPENDS = ""
diff --git a/packages/modutils/modutils-initscripts.bb b/packages/modutils/modutils-initscripts.bb
index 185ccda907..bf51ca87f6 100644
--- a/packages/modutils/modutils-initscripts.bb
+++ b/packages/modutils/modutils-initscripts.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "modutils configuration files"
 LICENSE = "PD"
 SRC_URI = "file://modutils.sh"
-FILE_PR = "r2"
+PR = "r2"
 
 INITSCRIPT_NAME = "modutils.sh"
 INITSCRIPT_PARAMS = "start 20 S ."
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index af81bcf0f7..9cedecaa9a 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -4,7 +4,7 @@ manageable for all users, administrators and distribution maintainers."
 LICENSE = "GPLv2"
 DEPENDS = "bison-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
            file://lex.l.diff;patch=1 \
diff --git a/packages/moin/moin_1.5.8.bb b/packages/moin/moin_1.5.8.bb
index de7b3f9a50..7efe66eb14 100644
--- a/packages/moin/moin_1.5.8.bb
+++ b/packages/moin/moin_1.5.8.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "network"
 HOMEPAGE = "http://moinmoin.wikiwikiweb.de/"
 PRIORITY = "optional"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/moin/moin-${PV}.tar.gz"
 
diff --git a/packages/mono-xsp/mono-xsp_1.2.5.bb b/packages/mono-xsp/mono-xsp_1.2.5.bb
index e95b316105..0b54ee332a 100644
--- a/packages/mono-xsp/mono-xsp_1.2.5.bb
+++ b/packages/mono-xsp/mono-xsp_1.2.5.bb
@@ -8,7 +8,7 @@ SECTION = "devel/mono"
 #
 
 
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "mono"
 RDEPENDS = "mono"
diff --git a/packages/mono/mono-mcs-intermediate.inc b/packages/mono/mono-mcs-intermediate.inc
index f8cccfea24..f54ce46045 100644
--- a/packages/mono/mono-mcs-intermediate.inc
+++ b/packages/mono/mono-mcs-intermediate.inc
@@ -5,7 +5,7 @@
 # package in step 2.
 # See http://www.mono-project.com/Mono:ARM
 
-FILE_PR = "r0"
+PR = "r0"
 DEPENDS = "mono-native glib-2.0-native perl-native"
 
 PARALLEL_MAKE = ""
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
index 2840b229de..8506a20867 100644
--- a/packages/mono/mono-native_1.2.5.1.bb
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -1,5 +1,5 @@
 require mono_1.2.5.inc
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "glib-2.0-native perl-native"
 
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
diff --git a/packages/mono/mono-native_1.9.1.bb b/packages/mono/mono-native_1.9.1.bb
index caa9b9847a..3c18cf7601 100644
--- a/packages/mono/mono-native_1.9.1.bb
+++ b/packages/mono/mono-native_1.9.1.bb
@@ -1,5 +1,5 @@
 require mono_1.9.1.inc
-FILE_PR = "r3"
+PR = "r3"
 DEPENDS = "glib-2.0-native perl-native"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index 49992d5eb8..d073aa7d98 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -2,7 +2,7 @@ require mono_1.2.5.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "file://configure.patch;patch=1 \
 	file://genmdesc-cpp.patch;patch=1 \
diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb
index cac7312098..f436a67df5 100644
--- a/packages/mono/mono_1.2.6.bb
+++ b/packages/mono/mono_1.2.6.bb
@@ -2,7 +2,7 @@ require mono_1.2.6.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://configure.patch;patch=1"
 
diff --git a/packages/mono/mono_1.9.1.bb b/packages/mono/mono_1.9.1.bb
index ea57bf12b6..4be75d99a7 100644
--- a/packages/mono/mono_1.9.1.bb
+++ b/packages/mono/mono_1.9.1.bb
@@ -4,7 +4,7 @@ DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://configure.patch;patch=1"
 
diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb
index 1d8318187e..a42ddd8231 100644
--- a/packages/mono/mono_svn.bb
+++ b/packages/mono/mono_svn.bb
@@ -2,7 +2,7 @@ require mono_svn.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += "file://configure-svnr87352.patch;patch=1"
diff --git a/packages/monotone/monotone-4_0.19.bb b/packages/monotone/monotone-4_0.19.bb
index fc92aa3b10..402d57db37 100644
--- a/packages/monotone/monotone-4_0.19.bb
+++ b/packages/monotone/monotone-4_0.19.bb
@@ -1,7 +1,7 @@
 require monotone.inc
 
 SUBV = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \
            file://txt2c-cross.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.20.bb b/packages/monotone/monotone-5_0.20.bb
index b344e26323..bee2269767 100644
--- a/packages/monotone/monotone-5_0.20.bb
+++ b/packages/monotone/monotone-5_0.20.bb
@@ -1,6 +1,6 @@
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.21.bb b/packages/monotone/monotone-5_0.21.bb
index d42fab2618..447614b92f 100644
--- a/packages/monotone/monotone-5_0.21.bb
+++ b/packages/monotone/monotone-5_0.21.bb
@@ -1,6 +1,6 @@
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.22.bb b/packages/monotone/monotone-5_0.22.bb
index 53dc83abe5..9ce745d04f 100644
--- a/packages/monotone/monotone-5_0.22.bb
+++ b/packages/monotone/monotone-5_0.22.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.23.bb b/packages/monotone/monotone-5_0.23.bb
index 86a216a5dd..2f0aab1077 100644
--- a/packages/monotone/monotone-5_0.23.bb
+++ b/packages/monotone/monotone-5_0.23.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.24.bb b/packages/monotone/monotone-5_0.24.bb
index 86a216a5dd..2f0aab1077 100644
--- a/packages/monotone/monotone-5_0.24.bb
+++ b/packages/monotone/monotone-5_0.24.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-5_0.25.2.bb b/packages/monotone/monotone-5_0.25.2.bb
index 5b33d80ef4..b5d6a376c1 100644
--- a/packages/monotone/monotone-5_0.25.2.bb
+++ b/packages/monotone/monotone-5_0.25.2.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 require monotone.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.26.bb b/packages/monotone/monotone-6_0.26.bb
index 4f9f641913..afbe65fada 100644
--- a/packages/monotone/monotone-6_0.26.bb
+++ b/packages/monotone/monotone-6_0.26.bb
@@ -22,7 +22,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.27.bb b/packages/monotone/monotone-6_0.27.bb
index 4f9f641913..afbe65fada 100644
--- a/packages/monotone/monotone-6_0.27.bb
+++ b/packages/monotone/monotone-6_0.27.bb
@@ -22,7 +22,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.31.bb b/packages/monotone/monotone-6_0.31.bb
index 23731abe45..5be156f2be 100644
--- a/packages/monotone/monotone-6_0.31.bb
+++ b/packages/monotone/monotone-6_0.31.bb
@@ -22,7 +22,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.33.bb b/packages/monotone/monotone-6_0.33.bb
index d7a42d2c3a..e58477ddd1 100644
--- a/packages/monotone/monotone-6_0.33.bb
+++ b/packages/monotone/monotone-6_0.33.bb
@@ -25,7 +25,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.34.bb b/packages/monotone/monotone-6_0.34.bb
index 4c11a12a47..6a5dcb5d9c 100644
--- a/packages/monotone/monotone-6_0.34.bb
+++ b/packages/monotone/monotone-6_0.34.bb
@@ -25,7 +25,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/monotone/monotone-6_0.37.bb b/packages/monotone/monotone-6_0.37.bb
index a5e455d894..7d65982e3d 100644
--- a/packages/monotone/monotone-6_0.37.bb
+++ b/packages/monotone/monotone-6_0.37.bb
@@ -25,7 +25,7 @@ inherit autotools
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
diff --git a/packages/motion/motion_3.2.11.bb b/packages/motion/motion_3.2.11.bb
index 089c2cdba5..dc7c0ecdbb 100644
--- a/packages/motion/motion_3.2.11.bb
+++ b/packages/motion/motion_3.2.11.bb
@@ -7,7 +7,7 @@ DEPENDS = "jpeg ffmpeg mysql postgresql"
 
 RSUGGESTS = "mysql-client postgresql-client"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 
diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb
index b3cf0fd326..8c6f326f73 100644
--- a/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@ -3,7 +3,7 @@ DEPENDS += "cairo alsa-lib "
 
 PV = "0.9+1.0a1"
 MOZPV = "1.0a1"
-FILE_PR = "r0"
+PR = "r0"
 PE = "1"
 
 SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=6c2f8bd79cbc \
diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb
index a3fd97342a..1b091bef64 100644
--- a/packages/mozilla/firefox_1.0.7.bb
+++ b/packages/mozilla/firefox_1.0.7.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb
index 51274d7ad4..72c42bc074 100644
--- a/packages/mozilla/firefox_2.0.0.3.bb
+++ b/packages/mozilla/firefox_2.0.0.3.bb
@@ -1,5 +1,5 @@
 DEPENDS += "cairo"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb
index efe341ca6c..5d09bb4375 100644
--- a/packages/mozilla/firefox_3.0.1.bb
+++ b/packages/mozilla/firefox_3.0.1.bb
@@ -1,5 +1,5 @@
 DEPENDS += "cairo"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/packages/mozilla/firefox_3.1b1.bb b/packages/mozilla/firefox_3.1b1.bb
index bd620a8cb2..eac4adcb75 100644
--- a/packages/mozilla/firefox_3.1b1.bb
+++ b/packages/mozilla/firefox_3.1b1.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PV = "3.0.1+3.1b1"
 MOZPV = "3.1b1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build2/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/packages/mozilla/thunderbird_1.0.7.bb b/packages/mozilla/thunderbird_1.0.7.bb
index d67529db34..c0893068bf 100644
--- a/packages/mozilla/thunderbird_1.0.7.bb
+++ b/packages/mozilla/thunderbird_1.0.7.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/utils"
 DEPENDS += "gnupg"
 RRECOMMENDS += "gnupg"
-FILE_PR = "r1"
+PR = "r1"
 
 EMVER="0.92.0"
 IPCVER="1.1.3"
diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index 81fd16bbe3..3f1ef9e877 100644
--- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libsdl"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz"
 S = "${WORKDIR}/mpeg2dec-0.4.0"
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 8b3b4ca51b..1a60ab17a2 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -1,7 +1,7 @@
 require mpfr.inc
 
 DEPENDS = "gmp"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
diff --git a/packages/mpfr/mpfr_2.3.1.bb b/packages/mpfr/mpfr_2.3.1.bb
index dbaa199d31..db04ce002b 100644
--- a/packages/mpfr/mpfr_2.3.1.bb
+++ b/packages/mpfr/mpfr_2.3.1.bb
@@ -1,7 +1,7 @@
 require mpfr.inc
 
 DEPENDS = "gmp"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
diff --git a/packages/mpfr/mpfr_2.3.2.bb b/packages/mpfr/mpfr_2.3.2.bb
index 235de4bafc..2d8cc960f7 100644
--- a/packages/mpfr/mpfr_2.3.2.bb
+++ b/packages/mpfr/mpfr_2.3.2.bb
@@ -1,7 +1,7 @@
 require mpfr.inc
 
 DEPENDS = "gmp"
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
diff --git a/packages/mpfr/mpfr_svn.bb b/packages/mpfr/mpfr_svn.bb
index 7f2425a808..f1e9273a65 100644
--- a/packages/mpfr/mpfr_svn.bb
+++ b/packages/mpfr/mpfr_svn.bb
@@ -2,7 +2,7 @@ require mpfr.inc
 
 DEPENDS = "gmp"
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk"
 S = "${WORKDIR}/trunk"
diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb
index 3c0d50d536..cf1ced294f 100644
--- a/packages/mplayer/mplayer-common.bb
+++ b/packages/mplayer/mplayer-common.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 ######################################################################################
 
 PV = "0.0.1"
-FILE_PR = "r0"
+PR = "r0"
 
 ######################################################################################
 
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index 3176428cd9..f89364335c 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -38,7 +38,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-FILE_PR = "r16"
+PR = "r16"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index 5bb8a994d6..d086e9bcc1 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -42,7 +42,7 @@ PACKAGE_ARCH_hx4700 = "hx4700"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-FILE_PR = "r8"
+PR = "r8"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 86c047dba6..923c9abf68 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -39,7 +39,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc2+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
diff --git a/packages/mrxvt/mrxvt_0.5.2.bb b/packages/mrxvt/mrxvt_0.5.2.bb
index 94702c73e0..c1811cb167 100644
--- a/packages/mrxvt/mrxvt_0.5.2.bb
+++ b/packages/mrxvt/mrxvt_0.5.2.bb
@@ -4,7 +4,7 @@ AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS = "freetype fontconfig libxft virtual/libx11"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
            ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;pnum=0;patch=1 \
diff --git a/packages/msmtp/msmtp_1.4.10.bb b/packages/msmtp/msmtp_1.4.10.bb
index db129fd18c..6fe33c707a 100644
--- a/packages/msmtp/msmtp_1.4.10.bb
+++ b/packages/msmtp/msmtp_1.4.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://msmtp.sourceforge.net/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "zlib gnutls"
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/msmtp/msmtp-${PV}.tar.bz2"
 
 inherit autotools
diff --git a/packages/mt-daapd/mt-daapd_0.2.1.1.bb b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
index 17c555e6a1..45256799aa 100644
--- a/packages/mt-daapd/mt-daapd_0.2.1.1.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
-FILE_PR = "r3"
+PR = "r3"
 SRC_URI += "file://itunes-5-fix.patch;patch=1"
diff --git a/packages/mt-daapd/mt-daapd_0.2.2.bb b/packages/mt-daapd/mt-daapd_0.2.2.bb
index 9b96c81157..dd2da24e65 100644
--- a/packages/mt-daapd/mt-daapd_0.2.2.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.2.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 # This has not been released yet!
 DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/mt-daapd/mt-daapd_0.2.3.bb b/packages/mt-daapd/mt-daapd_0.2.3.bb
index 1051130778..a376c76229 100644
--- a/packages/mt-daapd/mt-daapd_0.2.3.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.3.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 # This has not been released yet!
 #DEFAULT_PREFERENCE = -1
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/mtd/mtd-utils-tests_1.0.0+git.bb b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
index 1c2cda8af0..b5240009a7 100644
--- a/packages/mtd/mtd-utils-tests_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
@@ -6,7 +6,7 @@ require mtd-utils_1.0.0+git.bb
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}"
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/git/tests/fs-tests"
 
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 0d4cb835d9..b325bb03d3 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-FILE_PR = "r8"
+PR = "r8"
 
 # This is the default package, thus we lock to a specific git version so 
 # upstream changes will not break builds.
diff --git a/packages/mtd/mtd-utils_1.0.0.bb b/packages/mtd/mtd-utils_1.0.0.bb
index 66e3e9a91e..0ebb47fb22 100644
--- a/packages/mtd/mtd-utils_1.0.0.bb
+++ b/packages/mtd/mtd-utils_1.0.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 # RP/kergoth: Builds seem to break with recent mtd-utils
 # Can't pin down the exact problems
diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb
index 0f31e70799..e585cf5ab8 100644
--- a/packages/mtd/mtd-utils_1.1.0.bb
+++ b/packages/mtd/mtd-utils_1.1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2 \
            file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
diff --git a/packages/mtools/mtools_3.9.11.bb b/packages/mtools/mtools_3.9.11.bb
index c41caedd35..eca9909e8f 100644
--- a/packages/mtools/mtools_3.9.11.bb
+++ b/packages/mtools/mtools_3.9.11.bb
@@ -5,7 +5,7 @@
 DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
 HOMEPAGE="http://mtools.linux.lu"
 LICENSE="GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
 	file://mtools-makeinfo.patch;patch=1 \
diff --git a/packages/mtpaint/mtpaint_3.02.bb b/packages/mtpaint/mtpaint_3.02.bb
index 25cddd8fa9..fea8299534 100644
--- a/packages/mtpaint/mtpaint_3.02.bb
+++ b/packages/mtpaint/mtpaint_3.02.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "mtPaint is a simple painting program"
 SECTION = "x11/graphics"
 DEPENDS = "gtk+ jpeg"
 HOMEPAGE = "http://mtpaint.sf.net"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mtpaint/mtpaint-3.02.tar.bz2"
 
diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb
index 3289d5cacb..6ed2ada569 100644
--- a/packages/musicpd/gmpc_0.11.2.bb
+++ b/packages/musicpd/gmpc_0.11.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
 SECTION = "x11/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ libglade gnome-vfs"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://mercury.chem.pitt.edu/~shank/gmpc-${PV}.tar.gz"
 
diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb
index d473b1e3ba..f8c99efb36 100644
--- a/packages/musicpd/gmpc_0.13.0.bb
+++ b/packages/musicpd/gmpc_0.13.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
 SECTION = "x11/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "libmpd gtk+ libglade gnome-vfs"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://download.qballcow.nl/programs/gmpc-0.13/gmpc-${PV}.tar.gz"
 
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index 17f98e1a3b..939ecec836 100644
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -4,7 +4,7 @@ SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
 RDEPENDS = "libao-alsa"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
diff --git a/packages/musicpd/mpd-alsa_svn.bb b/packages/musicpd/mpd-alsa_svn.bb
index f2c89ac8d4..f86ae6a337 100644
--- a/packages/musicpd/mpd-alsa_svn.bb
+++ b/packages/musicpd/mpd-alsa_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmad flac audiofile virtual/libiconv faad2"
 RDEPENDS = "libao-alsa"
 PV = "0.11.5+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
 		file://mpd/mpd.init"
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 433029b152..673ff03b98 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -4,7 +4,7 @@ SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
 PV = "0.12.1+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
            file://mpd/mpd.init"
diff --git a/packages/mutt/mutt_1.5.15.bb b/packages/mutt/mutt_1.5.15.bb
index 9a7a911451..83d8d770d7 100644
--- a/packages/mutt/mutt_1.5.15.bb
+++ b/packages/mutt/mutt_1.5.15.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
            http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;patch=1 \
            http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;patch=1 \
diff --git a/packages/mutt/mutt_1.5.4i.bb b/packages/mutt/mutt_1.5.4i.bb
index 4286284a66..50c6019e21 100644
--- a/packages/mutt/mutt_1.5.4i.bb
+++ b/packages/mutt/mutt_1.5.4i.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1 \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1 \
diff --git a/packages/mutt/mutt_1.5.9i.bb b/packages/mutt/mutt_1.5.9i.bb
index b155dfcf4c..ba30ccb4ef 100644
--- a/packages/mutt/mutt_1.5.9i.bb
+++ b/packages/mutt/mutt_1.5.9i.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
 	   http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;patch=1 \
 	   http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;patch=1 \
diff --git a/packages/mysql/mysql-native_4.1.22.bb b/packages/mysql/mysql-native_4.1.22.bb
index a17a4ed0d3..d2c6413039 100644
--- a/packages/mysql/mysql-native_4.1.22.bb
+++ b/packages/mysql/mysql-native_4.1.22.bb
@@ -1,6 +1,6 @@
 require mysql_${PV}.bb
 inherit native
-FILE_PR ="r0"
+PR ="r0"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz"
 
diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb
index 73450f2238..8d7f4057f6 100644
--- a/packages/mysql/mysql_4.1.22.bb
+++ b/packages/mysql/mysql_4.1.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb
index 5f5e7fd382..b87e0be8ad 100644
--- a/packages/mythfront/mythfront-config.bb
+++ b/packages/mythfront/mythfront-config.bb
@@ -1,5 +1,5 @@
 PV = "1.10"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS_${PN} = "font-misc-misc"
 LICENSE = "MIT"
diff --git a/packages/mythtv/gmyth-upnp_0.7.0.bb b/packages/mythtv/gmyth-upnp_0.7.0.bb
index 2ea26a8c0a..84657de93e 100644
--- a/packages/mythtv/gmyth-upnp_0.7.0.bb
+++ b/packages/mythtv/gmyth-upnp_0.7.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GMyth is a library to access MythTV backend services."
 LICENSE = "LGPLv2""
 HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = "glib-2.0 mysql gmyth libupnp"
 
diff --git a/packages/mythtv/gmyth_0.7.1.bb b/packages/mythtv/gmyth_0.7.1.bb
index 21fa2de94b..71c5ddb143 100644
--- a/packages/mythtv/gmyth_0.7.1.bb
+++ b/packages/mythtv/gmyth_0.7.1.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2""
 HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
 DEPENDS = "mythtv curl libxml2 glib-2.0"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gmyth/${PN}-${PV}.tar.gz"
 
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index c35647c4ad..fd2c351845 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -2,7 +2,7 @@ require mythtv.inc
 
 inherit qmake2 qt3x11
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \
 	    file://settings.pro"
diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb
index 384e81efea..2ebebd3012 100644
--- a/packages/mythtv/mythtv_0.20.bb
+++ b/packages/mythtv/mythtv_0.20.bb
@@ -3,7 +3,7 @@ require mythtv.inc
 inherit qmake2 qt3x11
 
 DEPENDS += "openchrome"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://configure.patch;patch=1 \
             file://libmyth-libdir.patch;patch=1"
diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb
index 6013ace034..4f533b03e8 100644
--- a/packages/mythtv/mythtv_0.21.bb
+++ b/packages/mythtv/mythtv_0.21.bb
@@ -2,7 +2,7 @@ require mythtv.inc
 
 inherit qmake qt3x11
 
-FILE_PR = "${SRCREV}+r3"
+PR = "${SRCREV}+r3"
 REALPV = "0.21"
 
 SRCREV = "17789"
diff --git a/packages/mythtv/mythtv_svn.bb b/packages/mythtv/mythtv_svn.bb
index 3b9746ee60..83ce8252fa 100644
--- a/packages/mythtv/mythtv_svn.bb
+++ b/packages/mythtv/mythtv_svn.bb
@@ -5,7 +5,7 @@ inherit qmake2 qt4x11
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.21+0.22rc+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 REALPV = "0.22"
 
 SRCREV = "17892"
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
index 5253326cef..9fa59ada55 100644
--- a/packages/nail/nail_11.21.bb
+++ b/packages/nail/nail_11.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enhanced mailx client."
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "openssl"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \
diff --git a/packages/nandlogical/nandlogical_1.0.0.bb b/packages/nandlogical/nandlogical_1.0.0.bb
index 1e8df1c2d3..ba851bf513 100644
--- a/packages/nandlogical/nandlogical_1.0.0.bb
+++ b/packages/nandlogical/nandlogical_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Nandlogical for Sharp mtd1"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
 COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://nandlogical.c"
 
diff --git a/packages/navit/navit_0.0.4.bb b/packages/navit/navit_0.0.4.bb
index 320e3a1d8f..f22d35e5a8 100644
--- a/packages/navit/navit_0.0.4.bb
+++ b/packages/navit/navit_0.0.4.bb
@@ -1,6 +1,6 @@
 require navit.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
 
diff --git a/packages/navit/navit_svn.bb b/packages/navit/navit_svn.bb
index f0797b09d9..df712a0eb2 100644
--- a/packages/navit/navit_svn.bb
+++ b/packages/navit/navit_svn.bb
@@ -1,7 +1,7 @@
 require navit.inc
 
 PV = "0.1.0+svnrev${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 3780d59281..2cd0cf0de0 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r15"
+PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
            file://makefile_tweak.patch;patch=1 \
diff --git a/packages/ndisc6/ndisc6_0.6.7.bb b/packages/ndisc6/ndisc6_0.6.7.bb
index dfeebab4b0..1ce880136c 100644
--- a/packages/ndisc6/ndisc6_0.6.7.bb
+++ b/packages/ndisc6/ndisc6_0.6.7.bb
@@ -4,7 +4,7 @@ IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6."
 SECTION = "console/network"
 HOMEPAGE = "http://www.simphalempin.com/dev/ndisc6/"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 # The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to
 # perform the actual trace operation.
diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb
index 93961301b5..f935fdb222 100644
--- a/packages/neon/neon_0.25.5.bb
+++ b/packages/neon/neon_0.25.5.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "zlib libxml2 expat time gnutls"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
 	file://gnutls-force-and-detect.patch;patch=1"
diff --git a/packages/neon/neon_0.26.0.bb b/packages/neon/neon_0.26.0.bb
index 0cc428b733..3a234851aa 100644
--- a/packages/neon/neon_0.26.0.bb
+++ b/packages/neon/neon_0.26.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
 SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "zlib libxml2 expat time gnutls"
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb
index 9027d8ff98..330e13e0ef 100644
--- a/packages/net-snmp/net-snmp_5.1.2.bb
+++ b/packages/net-snmp/net-snmp_5.1.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Various tools relating to the Simple Network Management Protocol"
 HOMEPAGE = "http://www.net-snmp.org/"
 LICENSE = "BSD"
 DEPENDS = "openssl"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
 	file://uclibc-fix.patch;patch=1 \
diff --git a/packages/net-snmp/net-snmp_5.4.1.bb b/packages/net-snmp/net-snmp_5.4.1.bb
index 1c1cf34fe7..a5ef24869e 100644
--- a/packages/net-snmp/net-snmp_5.4.1.bb
+++ b/packages/net-snmp/net-snmp_5.4.1.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN}-client += "net-snmp-mibs"
 RDEPENDS_${PN}-dev = "net-snmp-client (= ${DEBPV}) net-snmp-server (= ${DEBPV})"
 RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${DEBPV}) net-snmp-server (= ${DEBPV})"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
         file://configure-tail.patch;patch=1 \
diff --git a/packages/net-tools/net-tools_1.60.bb b/packages/net-tools/net-tools_1.60.bb
index c0ca7d60ef..dddcedf00a 100644
--- a/packages/net-tools/net-tools_1.60.bb
+++ b/packages/net-tools/net-tools_1.60.bb
@@ -1,6 +1,6 @@
 SUMMARY="Basic networking tools"
 LICENSE="GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 #
 # NOTE:
diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb
index fd9496f01b..4f802dbcf6 100644
--- a/packages/netatalk/netatalk_2.0.3.bb
+++ b/packages/netatalk/netatalk_2.0.3.bb
@@ -1,5 +1,5 @@
 SECTION = "net"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 
 DEPENDS = "cups db openssl libpam"
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index e35b924ab8..2fc352f547 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-FILE_PR = "r28"
+PR = "r28"
 
 inherit update-rc.d
 
diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb
index d68e970eab..c7ceccddf2 100644
--- a/packages/netcat/netcat_0.7.1.bb
+++ b/packages/netcat/netcat_0.7.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Netcat"
 HOMEPAGE = "http://netcat.sourceforge.net"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
 
diff --git a/packages/netkit-base/netkit-base_0.17.bb b/packages/netkit-base/netkit-base_0.17.bb
index 4834812afd..88016ea746 100644
--- a/packages/netkit-base/netkit-base_0.17.bb
+++ b/packages/netkit-base/netkit-base_0.17.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "netkit-base includes the inetd daemon."
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/netkit-rpc/netkit-rpc_0.17.bb b/packages/netkit-rpc/netkit-rpc_0.17.bb
index debdfd387e..0e0287c041 100644
--- a/packages/netkit-rpc/netkit-rpc_0.17.bb
+++ b/packages/netkit-rpc/netkit-rpc_0.17.bb
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "netkit-rpc includes rpcgen and rpcinfo."
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rpc-${PV}.tar.gz \
 	   file://gcc4.patch;patch=1 \
diff --git a/packages/netkit-tftp/netkit-tftpd_0.17.bb b/packages/netkit-tftp/netkit-tftpd_0.17.bb
index 4a960ca706..537d2beb69 100644
--- a/packages/netkit-tftp/netkit-tftpd_0.17.bb
+++ b/packages/netkit-tftp/netkit-tftpd_0.17.bb
@@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${PV}.
 
 S = "${WORKDIR}/netkit-tftp-${PV}"
 
-FILE_PR = "r7"
+PR = "r7"
 
 EXTRA_OEMAKE = ""
 do_compile () {
diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb
index 1f5c26c25e..ff90310e1b 100644
--- a/packages/netpbm/netpbm_10.28.bb
+++ b/packages/netpbm/netpbm_10.28.bb
@@ -25,7 +25,7 @@ RDEPENDS = "perl\
 RDEPENDS += "perl-module-exporter-heavy"
 RDEPENDS += "perl-module-file-spec-unix"
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
 	   file://ppmtojpeg.patch;patch=42 \
diff --git a/packages/netpipes/netpipes_4.2.bb b/packages/netpipes/netpipes_4.2.bb
index 0a4543c815..aa3472f01d 100644
--- a/packages/netpipes/netpipes_4.2.bb
+++ b/packages/netpipes/netpipes_4.2.bb
@@ -2,7 +2,7 @@
 # Released under the MIT license (see packages/COPYING)
 DESCRIPTION = "A package to manipulate BSD TCP/IP stream sockets"
 SECTION = "console/network"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "GPL"
 
 SRC_URI = "http://web.purplefrog.com/~thoth/netpipes/ftp/${PN}-${PV}-export.tar.gz"
diff --git a/packages/netsurf/netsurf_svn.bb b/packages/netsurf/netsurf_svn.bb
index 303faaccf5..78f23991d3 100644
--- a/packages/netsurf/netsurf_svn.bb
+++ b/packages/netsurf/netsurf_svn.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.netsurf-browser.org/"
 SECTION = "x11/network"
 LICENSE = "GPLv2"
 PV = "1.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=netsurf \
            file://netsurf.desktop"
diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb
index c14537da1e..2e3c0c3fbe 100644
--- a/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/packages/network-suspend-scripts/network-suspend-scripts.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Network suspend/resume scripts"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "1.1"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "file://ifupdown \
            file://usbnet"
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
index 3aa80abdf7..2a0f28753f 100644
--- a/packages/networkmanager/networkmanager.inc
+++ b/packages/networkmanager/networkmanager.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gnome.org"
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
 	  file://NetworkManager \
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index 3fe0fa4b03..737d9544d0 100644
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
 	file://dbus-api-fix.patch;patch=1 \
diff --git a/packages/networkmanager/networkmanager_0.6.5.bb b/packages/networkmanager/networkmanager_0.6.5.bb
index 13bf14b0f3..2817124887 100644
--- a/packages/networkmanager/networkmanager_0.6.5.bb
+++ b/packages/networkmanager/networkmanager_0.6.5.bb
@@ -1,6 +1,6 @@
 require networkmanager.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \
 	  file://NetworkManager \
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index 22a6a303f4..e6bd318063 100644
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
 RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
 PV = "0.7+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
 	file://no-restarts.diff;patch=1;pnum=0 \
diff --git a/packages/neuros-pkggen/neuros-pkggen-native.bb b/packages/neuros-pkggen/neuros-pkggen-native.bb
index 5177f9d4cc..13625622d2 100644
--- a/packages/neuros-pkggen/neuros-pkggen-native.bb
+++ b/packages/neuros-pkggen/neuros-pkggen-native.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tool to generate ready to flash .pkg files for neuros machines"
 LICENSE = "GPLv2"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit native
 
diff --git a/packages/neuros-public/neuros-app-photoalbum_git.bb b/packages/neuros-public/neuros-app-photoalbum_git.bb
index 377cfb8b23..76bb4dc409 100644
--- a/packages/neuros-public/neuros-app-photoalbum_git.bb
+++ b/packages/neuros-public/neuros-app-photoalbum_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros photoalbum app"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-app-vplayer_git.bb b/packages/neuros-public/neuros-app-vplayer_git.bb
index 3a2b7a15a4..bf02226b43 100644
--- a/packages/neuros-public/neuros-app-vplayer_git.bb
+++ b/packages/neuros-public/neuros-app-vplayer_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros videoplayer app"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-lib-gui_git.bb b/packages/neuros-public/neuros-lib-gui_git.bb
index afa28c7e88..f599f00608 100644
--- a/packages/neuros-public/neuros-lib-gui_git.bb
+++ b/packages/neuros-public/neuros-lib-gui_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros lib-gui"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 0515e49530..6dcce2268e 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb
index aab18e794c..2ac04be8b2 100644
--- a/packages/neuros-public/neuros-mainmenu_git.bb
+++ b/packages/neuros-public/neuros-mainmenu_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros window manager"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
index 753f336448..2e5b7bdd15 100644
--- a/packages/neuros-public/neuros-nwm_git.bb
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros window manager"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r7"
+PR = "r7"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index 2818ebc987..f5b79f90bc 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
 PV = "0.0+${PR}+gitr${SRCREV}"
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 3bf15bf113..1febf057bf 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
-FILE_PR = "r13"
+PR = "r13"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \
diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
index b777f201eb..872a9bf8ff 100644
--- a/packages/nfs-utils/nfs-utils_1.1.2.bb
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
 
-FILE_PR = "2"
+PR = "2"
 
 DEPENDS = "e2fsprogs tcp-wrappers libevent"
 
diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb
index 57b97ca228..0e01e7e104 100644
--- a/packages/nis/pwdutils_2.6.bb
+++ b/packages/nis/pwdutils_2.6.bb
@@ -2,7 +2,7 @@
 # The source package is utils/net/NIS/pwdutils
 # The package requires -lpam
 #
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION="\
 NIS PAM password management tools.  \
 This is a collection of utilities to manage the passwd \
diff --git a/packages/nis/yp-tools_2.9.bb b/packages/nis/yp-tools_2.9.bb
index 22280b9d4d..ddf7ed2c8d 100644
--- a/packages/nis/yp-tools_2.9.bb
+++ b/packages/nis/yp-tools_2.9.bb
@@ -1,7 +1,7 @@
 # This package builds tools to manage NIS
 # The source package is utils/net/NIS/yp-tools
 #
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION="\
 Network Information Service tools.  \
 This package contains ypcat, ypmatch, ypset, \
diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb
index 5a08cc35f4..be37fb9c28 100644
--- a/packages/nis/ypbind-mt_1.18.bb
+++ b/packages/nis/ypbind-mt_1.18.bb
@@ -1,7 +1,7 @@
 # This package builds the NIS ypbind daemon
 # The source package is utils/net/NIS/ypbind-mt
 #
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION="\
 Multithreaded NIS bind service (ypbind-mt).  \
 ypbind-mt is a complete new implementation of a NIS \
diff --git a/packages/nis/ypbind-mt_1.19.bb b/packages/nis/ypbind-mt_1.19.bb
index aa5c3af6fb..aee0864937 100644
--- a/packages/nis/ypbind-mt_1.19.bb
+++ b/packages/nis/ypbind-mt_1.19.bb
@@ -1,7 +1,7 @@
 # This package builds the NIS ypbind daemon
 # The source package is utils/net/NIS/ypbind-mt
 #
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION="\
 Multithreaded NIS bind service (ypbind-mt).  \
 ypbind-mt is a complete new implementation of a NIS \
diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb
index 57521d4432..07d8aee5bb 100644
--- a/packages/nis/ypserv_2.17.bb
+++ b/packages/nis/ypserv_2.17.bb
@@ -1,7 +1,7 @@
 # This package builds the NIS server
 # The source package is utils/net/NIS/ypserv
 #
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION="NIS version 2 server for Linux."
 HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html"
 
diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb
index 9862bf43d3..7aa5928191 100644
--- a/packages/nmap/nmap_3.81.bb
+++ b/packages/nmap/nmap_3.81.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.insecure.org/nmap/"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "libpcap libpcre"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 
diff --git a/packages/nogravity/nogravity_2.0.bb b/packages/nogravity/nogravity_2.0.bb
index 36da749b3b..b8db04f639 100644
--- a/packages/nogravity/nogravity_2.0.bb
+++ b/packages/nogravity/nogravity_2.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.realtech-vr.com/nogravity/"
 LICENSE = "GPL"
 SECTION = "x11/games"
 DEPENDS = "libsdl-x11 zlib libpng libsdl-mixer libogg libvorbis"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://zaurus.vivaphp.net/nogravity.tar.bz2 \
 	   ${SOURCEFORGE_MIRROR}/nogravity/rt-nogravity-data.zip"
diff --git a/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index 8c82c3dec1..136f6ca42a 100644
--- a/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 	file://fix-kernel-version-test-for-hh.patch;patch=1"
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit module
 SECTION = "base"
diff --git a/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb b/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
index 3bf4153d03..94a1d4e00b 100644
--- a/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
+++ b/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Utilities for Ben's Own Graphics Library"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gd-native"
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
diff --git a/packages/nonworking/bogl/libbogl_0.1.9.bb b/packages/nonworking/bogl/libbogl_0.1.9.bb
index 5cbb14f88f..db18ee3160 100644
--- a/packages/nonworking/bogl/libbogl_0.1.9.bb
+++ b/packages/nonworking/bogl/libbogl_0.1.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Ben's Own Graphics Library"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "bogl-utils-native"
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
diff --git a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
index c78cdf1de3..e7eeaf0de0 100644
--- a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
+++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
@@ -1,6 +1,6 @@
 require gpe-contacts.inc
 
-FILE_PR ="r2"
+PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
diff --git a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
index c78cdf1de3..e7eeaf0de0 100644
--- a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
+++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
@@ -1,6 +1,6 @@
 require gpe-contacts.inc
 
-FILE_PR ="r2"
+PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
diff --git a/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb b/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
index bcd3d9f227..6fcaf299dc 100644
--- a/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb
index 93f9fb06d9..c0f500ac4a 100644
--- a/packages/nonworking/icecast/icecast_2.2.0.bb
+++ b/packages/nonworking/icecast/icecast_2.2.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "GPLv2"
 
 DEPENDS = "libvorbis libogg libxslt"
diff --git a/packages/nonworking/libconfig++/libconfig++_0.7a.bb b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
index 41acd78205..05e977d12b 100644
--- a/packages/nonworking/libconfig++/libconfig++_0.7a.bb
+++ b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libConfig++ is a portable and flexible C++ library for \
 reading configuration files which were written in C style syntax."
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/config-plus/config-plus-${PV}.tar.gz"
 S = "${WORKDIR}/config-plus-${PV}"
diff --git a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
index be3137330b..81c51ce6a4 100644
--- a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
+++ b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 LICENSE = "GPL"
 KV = "${PV}"
 RDEPENDS = "mtd-utils"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
 	file://01-mtd-2004-01-27.diff;patch=1 \
diff --git a/packages/nonworking/mISDN/misdn_cvs.bb b/packages/nonworking/mISDN/misdn_cvs.bb
index 6bfc1082da..865e41b2f9 100644
--- a/packages/nonworking/mISDN/misdn_cvs.bb
+++ b/packages/nonworking/mISDN/misdn_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "mISDN kernel packages"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
index 348d377e93..58d7f54a8b 100644
--- a/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
+++ b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = 	"LGPL"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 outo"
diff --git a/packages/nonworking/maemo/sapwood_1.20-1.bb b/packages/nonworking/maemo/sapwood_1.20-1.bb
index e5864e1f2a..8cd52fa602 100644
--- a/packages/nonworking/maemo/sapwood_1.20-1.bb
+++ b/packages/nonworking/maemo/sapwood_1.20-1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Sapwood"
diff --git a/packages/nonworking/meta/meta-gpephone.bb b/packages/nonworking/meta/meta-gpephone.bb
index 5d867e1002..9912ddbf30 100644
--- a/packages/nonworking/meta/meta-gpephone.bb
+++ b/packages/nonworking/meta/meta-gpephone.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 RDEPENDS = "\
     gpephone-task-base \
diff --git a/packages/nonworking/meta/meta-sectest-gpe.bb b/packages/nonworking/meta/meta-sectest-gpe.bb
index 32517c6c62..a73559ab1a 100644
--- a/packages/nonworking/meta/meta-sectest-gpe.bb
+++ b/packages/nonworking/meta/meta-sectest-gpe.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Security Testing Image"
 LICENSE = "MIT"
-FILE_PR = "r6"
+PR = "r6"
 
 RDEPENDS = "\
     gpe-task-base \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
index 905f9d2cef..88c009d775 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
index dca3898551..e7774e33df 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
index dca3898551..e7774e33df 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_cvs.bb b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
index 1ff157331a..10cca07fd6 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 PV = "${OPIE_CVS_PV}"
 
diff --git a/packages/nonworking/php/php-native_4.4.4.bb b/packages/nonworking/php/php-native_4.4.4.bb
index bd257e0cfc..84d1c667b5 100644
--- a/packages/nonworking/php/php-native_4.4.4.bb
+++ b/packages/nonworking/php/php-native_4.4.4.bb
@@ -3,6 +3,6 @@ require php_${PV}.bb
 inherit native
 FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
 DEPENDS = "zlib-native"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/php-${PV}"
diff --git a/packages/nonworking/php/php_4.4.4.bb b/packages/nonworking/php/php_4.4.4.bb
index 211a536840..3000ad1fb6 100644
--- a/packages/nonworking/php/php_4.4.4.bb
+++ b/packages/nonworking/php/php_4.4.4.bb
@@ -1,6 +1,6 @@
 require php.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \
            file://${FILESDIR}/autotools.patch;patch=1 \
diff --git a/packages/nonworking/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb
index aa30f284ef..4d683ff3d1 100644
--- a/packages/nonworking/tetex/tetex-native_3.0.bb
+++ b/packages/nonworking/tetex/tetex-native_3.0.bb
@@ -1,7 +1,7 @@
 require tetex_${PV}.bb
 inherit native
 DEPENDS = ""
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES=""
 RRECOMMENDS_${PN}=""
diff --git a/packages/nonworking/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb
index 35af440d31..80d6f779d8 100644
--- a/packages/nonworking/tetex/tetex-texmf_3.0.bb
+++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "teTeX data"
 LICENSE = "GPL"
 SECTION = "console/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz"
 S = "${WORKDIR}"
diff --git a/packages/nonworking/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb
index bebdb6b128..eedf8820b2 100644
--- a/packages/nonworking/tetex/tetex_3.0.bb
+++ b/packages/nonworking/tetex/tetex_3.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tug.org/tetex"
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
            file://configure.patch;patch=1"
diff --git a/packages/nonworking/zaurss/zaurss_0.4.2.bb b/packages/nonworking/zaurss/zaurss_0.4.2.bb
index f5b09aa389..7898eb437c 100644
--- a/packages/nonworking/zaurss/zaurss_0.4.2.bb
+++ b/packages/nonworking/zaurss/zaurss_0.4.2.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.daionet.gr.jp/~knok/software/zaurss/"
 APPNAME = "zaurss"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.daionet.gr.jp/~knok/software/zaurss/zaurss-${PV}.tar.gz"
 
diff --git a/packages/nonworking/zethereal/zethereal_1.0.0.bb b/packages/nonworking/zethereal/zethereal_1.0.0.bb
index 6eacf7d7e4..74913c1b01 100644
--- a/packages/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/packages/nonworking/zethereal/zethereal_1.0.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.cartel-info.fr/pbiondi/zaurus/"
 APPNAME = "zethereal"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools qmake_base
 
diff --git a/packages/notecase/notecase_1.6.9.bb b/packages/notecase/notecase_1.6.9.bb
index d61215cc03..73ea27b7db 100644
--- a/packages/notecase/notecase_1.6.9.bb
+++ b/packages/notecase/notecase_1.6.9.bb
@@ -1,6 +1,6 @@
 require notecase.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/packages/notecase/notecase_1.7.2.bb b/packages/notecase/notecase_1.7.2.bb
index d61215cc03..73ea27b7db 100644
--- a/packages/notecase/notecase_1.7.2.bb
+++ b/packages/notecase/notecase_1.7.2.bb
@@ -1,6 +1,6 @@
 require notecase.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/packages/notez/notez_1.1.0.bb b/packages/notez/notez_1.1.0.bb
index a785d3c8c5..9b82b1adad 100644
--- a/packages/notez/notez_1.1.0.bb
+++ b/packages/notez/notez_1.1.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.holtschneider.com/notez/"
 APPNAME = "notez"
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.holtschneider.com/notez/notez-${PV}.tar.gz \
 file://use-homedir.patch;patch=1 \
diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb
index e4a71a8005..5a76d10b31 100644
--- a/packages/notification-daemon/notification-daemon_0.3.6.bb
+++ b/packages/notification-daemon/notification-daemon_0.3.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.galago-project.org/"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
            file://dbus-glib-tool-prefix.patch;patch=1"
diff --git a/packages/notification-daemon/notification-daemon_0.3.7.bb b/packages/notification-daemon/notification-daemon_0.3.7.bb
index c79518cb7b..4f38ea9ff9 100644
--- a/packages/notification-daemon/notification-daemon_0.3.7.bb
+++ b/packages/notification-daemon/notification-daemon_0.3.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.galago-project.org/"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
            file://notification-daemon-fix-text-color.diff;patch=1"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index fd2fdf085c..52af4ad273 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
index ac1f50af2c..da5bdebfcd 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
index 1575d5a303..ec7689488a 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
index c47f46693e..4da6b6981a 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index f29dcd0b3f..0eebf7d04f 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 COMPATIBLE_MACHINE = "nslu2"
 
-FILE_PR = "r22"
+PR = "r22"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
diff --git a/packages/ntfs-3g/ntfs-3g_1.0.bb b/packages/ntfs-3g/ntfs-3g_1.0.bb
index 89f6ae6782..7d73b79ac9 100644
--- a/packages/ntfs-3g/ntfs-3g_1.0.bb
+++ b/packages/ntfs-3g/ntfs-3g_1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.ntfs-3g.org/"
 LICENSE = "GPLv2"
 DEPENDS = "fuse"
 RDEPENDS = "fuse"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = http://www.ntfs-3g.org/ntfs-3g-${PV}.tgz
 
diff --git a/packages/ntop/ntop_3.0.bb b/packages/ntop/ntop_3.0.bb
index 247f89924a..aa725222e9 100644
--- a/packages/ntop/ntop_3.0.bb
+++ b/packages/ntop/ntop_3.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "ntop is network top"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "gdbm zlib libpcap libpng gd"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
            file://${FILESDIR}/autotools.patch;patch=1 \
diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb
index 07c88ed8f1..dd8ca66f25 100644
--- a/packages/ntp/ntp-ssl_4.1.2.bb
+++ b/packages/ntp/ntp-ssl_4.1.2.bb
@@ -1,6 +1,6 @@
 require ntp_${PV}.bb
 DEPENDS = "openssl"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/ntp-${PV}"
 
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index 3f02e78c50..7091f05394 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -1,6 +1,6 @@
 require ntp.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1/ntp-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index 929659da5e..f2825a03c9 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -1,6 +1,6 @@
 require ntp.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
 	file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \
diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
index 5008deff69..22d2e1bff6 100644
--- a/packages/ntp/ntp_4.2.2p3.bb
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -1,6 +1,6 @@
 require ntp.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
 	file://ipv6only-workaround.patch;patch=1 \
diff --git a/packages/ntpclient/ntpclient_2003_194.bb b/packages/ntpclient/ntpclient_2003_194.bb
index 8a07a3374c..84304334e5 100644
--- a/packages/ntpclient/ntpclient_2003_194.bb
+++ b/packages/ntpclient/ntpclient_2003_194.bb
@@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>"
 RDEPENDS = "busybox"
 SECTION = "admin"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 # The ntpclient package uses version numbers that include an underscore :(
 PV = "2003_194"
 # ntpclient unpacks into a directory that doesn't include version info :(
diff --git a/packages/ntpclient/ntpclient_2007_365.bb b/packages/ntpclient/ntpclient_2007_365.bb
index 0ba801c079..b892f384e7 100644
--- a/packages/ntpclient/ntpclient_2007_365.bb
+++ b/packages/ntpclient/ntpclient_2007_365.bb
@@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>"
 RDEPENDS = "busybox"
 SECTION = "admin"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 # The ntpclient package uses version numbers that include an underscore :(
 PV = "2007_365"
 # ntpclient unpacks into a directory that doesn't include version info :(
diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
index b0098d3596..4dd1519536 100644
--- a/packages/nunome/nunome_1.0.2.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -4,7 +4,7 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "virtual/japanese-font"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
 	file://timer.patch;patch=1 \
diff --git a/packages/nut/nut_2.2.1.bb b/packages/nut/nut_2.2.1.bb
index 12de692be9..db3367435d 100644
--- a/packages/nut/nut_2.2.1.bb
+++ b/packages/nut/nut_2.2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Network UPS Tools"
 LICENSE = "GPL"
 DEPENDS = "libusb"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/nxcl/libnxcl_0.9.bb b/packages/nxcl/libnxcl_0.9.bb
index 997dad4153..ea62579019 100644
--- a/packages/nxcl/libnxcl_0.9.bb
+++ b/packages/nxcl/libnxcl_0.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Backend library for the free nx-clients"
 HOMEPAGE = "http://freenx.berlios.de/"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 RDEPENDS = "nxproxy ssh"
 
diff --git a/packages/nxproxy/nxproxy_3.2.0-1.bb b/packages/nxproxy/nxproxy_3.2.0-1.bb
index 8684958ea6..ca543ef05c 100644
--- a/packages/nxproxy/nxproxy_3.2.0-1.bb
+++ b/packages/nxproxy/nxproxy_3.2.0-1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The binary which uses libxcomp from nomachine"
 HOMEPAGE = "http://www.nomachine.com/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libxcomp"
 
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index b37c156d0a..650bd1a8e8 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 SRCDATE = "20060923"
 PV = "1.0.0+cvs${SRCDATE}"
-FILE_PR = "r2"
+PR = "r2"
 RDEPENDS = "bash"
 
 SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index e141a5e70d..ef79bc6d31 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 SRCDATE = "20050909"
 PV = "1.0.0+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb
index 057e849747..2a0b310a49 100644
--- a/packages/obexftp/obexftp_0.20.bb
+++ b/packages/obexftp/obexftp_0.20.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 HOMEPAGE = "http://openobex.triq.net"
 LICENSE = "GPL"
 DEPENDS = "openobex libgsm"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
 	   file://iconv.patch;patch=1 \
diff --git a/packages/obexftp/obexftp_0.22.bb b/packages/obexftp/obexftp_0.22.bb
index 38e99e0060..89e10a72af 100644
--- a/packages/obexftp/obexftp_0.22.bb
+++ b/packages/obexftp/obexftp_0.22.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 HOMEPAGE = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
 LICENSE = "GPL"
 DEPENDS = "openobex bluez-libs libusb virtual/libiconv"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.bz2 \
 	  "
diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb
index 88c22b9d35..4ec591d262 100644
--- a/packages/obexpush/obexpush_1.0.0.bb
+++ b/packages/obexpush/obexpush_1.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 openobex bluez-libs"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
            file://add-obextool.patch;patch=1 \
diff --git a/packages/obsolete/dbus/dbus-native_0.50.bb b/packages/obsolete/dbus/dbus-native_0.50.bb
index 95a073abd4..39ea2ae0b7 100644
--- a/packages/obsolete/dbus/dbus-native_0.50.bb
+++ b/packages/obsolete/dbus/dbus-native_0.50.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/dbus-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
 DEPENDS = "glib-2.0-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_stage() {
 	oe_runmake install
diff --git a/packages/obsolete/dbus/dbus_0.21.bb b/packages/obsolete/dbus/dbus_0.21.bb
index c6615b1c99..d7b164e8cc 100644
--- a/packages/obsolete/dbus/dbus_0.21.bb
+++ b/packages/obsolete/dbus/dbus_0.21.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r4"
+PR = "r4"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
diff --git a/packages/obsolete/dbus/dbus_0.22.bb b/packages/obsolete/dbus/dbus_0.22.bb
index 9e40e3d376..8eacbeca27 100644
--- a/packages/obsolete/dbus/dbus_0.22.bb
+++ b/packages/obsolete/dbus/dbus_0.22.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r6"
+PR = "r6"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.1-osso5.bb b/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
index 36b6db4e5b..1cb72cb792 100644
--- a/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
+++ b/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
@@ -1,6 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 SECTION = "base"
-FILE_PR = "r1"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.4.bb b/packages/obsolete/dbus/dbus_0.23.4.bb
index a4711c2c8d..6fd86ae1aa 100644
--- a/packages/obsolete/dbus/dbus_0.23.4.bb
+++ b/packages/obsolete/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r1"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.bb b/packages/obsolete/dbus/dbus_0.23.bb
index 186cb50361..de224f307e 100644
--- a/packages/obsolete/dbus/dbus_0.23.bb
+++ b/packages/obsolete/dbus/dbus_0.23.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r2"
+PR = "r2"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.34.inc b/packages/obsolete/dbus/dbus_0.34.inc
index cac7139b3e..1c63c37fdf 100644
--- a/packages/obsolete/dbus/dbus_0.34.inc
+++ b/packages/obsolete/dbus/dbus_0.34.inc
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.50.inc b/packages/obsolete/dbus/dbus_0.50.inc
index 6a1b06ab0a..094a9b68d6 100644
--- a/packages/obsolete/dbus/dbus_0.50.inc
+++ b/packages/obsolete/dbus/dbus_0.50.inc
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/gaim/gaim_1.0.3.bb b/packages/obsolete/gaim/gaim_1.0.3.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.0.3.bb
+++ b/packages/obsolete/gaim/gaim_1.0.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.0.bb b/packages/obsolete/gaim/gaim_1.1.0.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.1.0.bb
+++ b/packages/obsolete/gaim/gaim_1.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.1.bb b/packages/obsolete/gaim/gaim_1.1.1.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.1.1.bb
+++ b/packages/obsolete/gaim/gaim_1.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.2.bb b/packages/obsolete/gaim/gaim_1.1.2.bb
index dbb8d0be34..3bf9aeb3a7 100644
--- a/packages/obsolete/gaim/gaim_1.1.2.bb
+++ b/packages/obsolete/gaim/gaim_1.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.4.0.bb b/packages/obsolete/gaim/gaim_1.4.0.bb
index bcbd260adf..1585229b14 100644
--- a/packages/obsolete/gaim/gaim_1.4.0.bb
+++ b/packages/obsolete/gaim/gaim_1.4.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name_1.4.0.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.5.0.bb b/packages/obsolete/gaim/gaim_1.5.0.bb
index dbb8d0be34..3bf9aeb3a7 100644
--- a/packages/obsolete/gaim/gaim_1.5.0.bb
+++ b/packages/obsolete/gaim/gaim_1.5.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
index 0f2d2df0e6..bf8591920c 100644
--- a/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 SRCDATE_${PN} = "20050904"
 #Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
 PV = "2.0.0-cvs-mco1-${SRCDATE}"
diff --git a/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
index 6e1e7f42ca..60c2a9d385 100644
--- a/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
 
 # NOTE: make sure to keep PR in sync with libsdl-x11
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://agawa-piro-mickey.patch;patch=1 \
diff --git a/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index 524c4dda90..e0f258decd 100644
--- a/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Gnome Virtual File System - OSSO Version"
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r4"
+PR = "r4"
 PROVIDES = "virtual/gnome-vfs"
 RPROVIDES = "gnome-vfs"
 
diff --git a/packages/obsolete/olsr/olsrd_0.4.10.bb b/packages/obsolete/olsr/olsrd_0.4.10.bb
index e3d0e686d2..9722ca7d8d 100644
--- a/packages/obsolete/olsr/olsrd_0.4.10.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.10.bb
@@ -1,2 +1,2 @@
 require olsrd.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/obsolete/olsr/olsrd_0.4.9.bb b/packages/obsolete/olsr/olsrd_0.4.9.bb
index 59c00681b3..1f186f4bbb 100644
--- a/packages/obsolete/olsr/olsrd_0.4.9.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.9.bb
@@ -1,5 +1,5 @@
 require olsrd.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
 
diff --git a/packages/obsolete/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
index 5d6974c1f3..a4340eb4e8 100644
--- a/packages/obsolete/tasks/task-bootstrap-unionroot.bb
+++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Core packages required for a basic installation with unionroot"
 PROVIDES = "task-bootstrap"
 RPROVIDES = "task-bootstrap"
-FILE_PR = "r2"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
diff --git a/packages/obsolete/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb
index 37ac88ec79..ebe78058b2 100644
--- a/packages/obsolete/tasks/task-bootstrap.bb
+++ b/packages/obsolete/tasks/task-bootstrap.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Core packages required for a basic installation"
-FILE_PR = "r25"
+PR = "r25"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
diff --git a/packages/obsolete/wesnoth_svn.bb b/packages/obsolete/wesnoth_svn.bb
index 411ff57fe5..430abe7d0f 100644
--- a/packages/obsolete/wesnoth_svn.bb
+++ b/packages/obsolete/wesnoth_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "fantasy turn-based strategy game"
 PV = "0.01+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 SECTION = "games"
 LICENSE = "GPL"
 DEPENDS += "libsdl-image libsdl-mixer libsdl-net"
diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb
index 5e6b499006..8efe5243d7 100644
--- a/packages/octave/octave_2.1.73.bb
+++ b/packages/octave/octave_2.1.73.bb
@@ -2,7 +2,7 @@ require octave.inc
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
 
diff --git a/packages/octave/octave_2.9.19.bb b/packages/octave/octave_2.9.19.bb
index e5c9c17d48..3b56c8657d 100644
--- a/packages/octave/octave_2.9.19.bb
+++ b/packages/octave/octave_2.9.19.bb
@@ -3,7 +3,7 @@ require octave.inc
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch;patch=1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb
index e5c9c17d48..3b56c8657d 100644
--- a/packages/octave/octave_3.0.0.bb
+++ b/packages/octave/octave_3.0.0.bb
@@ -3,7 +3,7 @@ require octave.inc
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch;patch=1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
diff --git a/packages/ode/ode_0.9.bb b/packages/ode/ode_0.9.bb
index 0e2c75114f..31eed3b884 100644
--- a/packages/ode/ode_0.9.bb
+++ b/packages/ode/ode_0.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ODE is an Open Source Physics Engine."
 SECTION = "libs"
 HOMEPAGE = "http://www.ode.org"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
            file://install.patch;patch=1"
diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsrd/olsrd_0.5.3.bb
index 5bce4072b6..1af0f257fd 100644
--- a/packages/olsrd/olsrd_0.5.3.bb
+++ b/packages/olsrd/olsrd_0.5.3.bb
@@ -1,6 +1,6 @@
 require olsrd.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://unbreak-makefile.patch;patch=1"
 
diff --git a/packages/olsrd/olsrd_0.5.5.bb b/packages/olsrd/olsrd_0.5.5.bb
index 90320f1440..d87197481e 100644
--- a/packages/olsrd/olsrd_0.5.5.bb
+++ b/packages/olsrd/olsrd_0.5.5.bb
@@ -1,5 +1,5 @@
 require olsrd.inc
-FILE_PR = "r0"
+PR = "r0"
 
 # Oddity in the 0.5.5 source tarball.
 S = "${WORKDIR}/olsrd-a5b9cf969979"
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
index 060d6be541..1df6236aea 100644
--- a/packages/omniorb/omniorb-native_4.0.7.bb
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -1,6 +1,6 @@
 SECTION = "devel"
 DEPENDS += "python-native"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz"
 
diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb
index 40cfbaf23a..89e98e3534 100644
--- a/packages/omniorb/omniorb_4.0.7.bb
+++ b/packages/omniorb/omniorb_4.0.7.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "omniorb-native"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \
 file://omniORB.cfg \
diff --git a/packages/opencv/opencv_1.0.0.bb b/packages/opencv/opencv_1.0.0.bb
index 0153cb59c7..5b6450eca4 100644
--- a/packages/opencv/opencv_1.0.0.bb
+++ b/packages/opencv/opencv_1.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 #RDEPENDS = "python jpeg zlib libpng tiff glib-2.0"
diff --git a/packages/opencvs/opencvs_cvs.bb b/packages/opencvs/opencvs_cvs.bb
index 5d9206a65d..d098821cc6 100644
--- a/packages/opencvs/opencvs_cvs.bb
+++ b/packages/opencvs/opencvs_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 PRIORITY = "optional"
 SECTION = "console/network"
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs@anoncvs.ca.openbsd.org/cvs;method=ext;module=src/usr.bin/cvs \
 	   file://linux.patch;patch=1"
diff --git a/packages/openldap/openldap_2.2.29.bb b/packages/openldap/openldap_2.2.29.bb
index 994338c880..c651b20674 100644
--- a/packages/openldap/openldap_2.2.29.bb
+++ b/packages/openldap/openldap_2.2.29.bb
@@ -11,7 +11,7 @@ PRIORITY = "optional"
 LICENSE = "OpenLDAP"
 SECTION = "libs"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz"
 SRC_URI += "file://openldap-autoconf.patch;patch=1"
diff --git a/packages/openldap/openldap_2.3.11.bb b/packages/openldap/openldap_2.3.11.bb
index 799a316d95..9f8b5edf74 100644
--- a/packages/openldap/openldap_2.3.11.bb
+++ b/packages/openldap/openldap_2.3.11.bb
@@ -11,7 +11,7 @@ PRIORITY = "optional"
 LICENSE = "OpenLDAP"
 SECTION = "libs"
 
-FILE_PR = "r4"
+PR = "r4"
 
 LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
 
diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb
index 7cf81de7fc..edfcde03d2 100644
--- a/packages/openmax/libomxil-bellagio_0.9.0.bb
+++ b/packages/openmax/libomxil-bellagio_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim
 LICENSE = "LGPLv2"
 DEPENDS = "libmad alsa-lib ffmpeg"
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz"
 
diff --git a/packages/openmoko-3rdparty/epiano_0.3.1.bb b/packages/openmoko-3rdparty/epiano_0.3.1.bb
index 3e8728047f..ecd7d26427 100644
--- a/packages/openmoko-3rdparty/epiano_0.3.1.bb
+++ b/packages/openmoko-3rdparty/epiano_0.3.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "ecore evas edje fluidsynth"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
 PV = "0.3.1"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb b/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
index c56bcfdabb..71a9f3cdb6 100644
--- a/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
+++ b/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
@@ -14,7 +14,7 @@ LICENSE = "GPL"
 
 RDEPENDS = "python-pygtk"
 
-FILE_PR = "r0" 
+PR = "r0" 
 
 ######################################################################################
 
diff --git a/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb b/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
index 6c9cd799ce..f0d6f84ce6 100644
--- a/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
+++ b/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
@@ -3,7 +3,7 @@ AUTHOR = "Kristian M."
 SECTION = "openmoko/applications"
 RDEPENDS = "python-pygtk python-subprocess python-threading"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
 S = "${WORKDIR}/settingsgui-0.8-beta"
diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb
index acbe600350..dc5d24abe1 100644
--- a/packages/openmoko-base/openmoko-common_svn.bb
+++ b/packages/openmoko-base/openmoko-common_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common files for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko-base
 
diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
index ced703a2cc..0961d74162 100644
--- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko-base autotools
 
diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb
index ff8f3e3e53..20b05efb0b 100644
--- a/packages/openmoko-base/openmoko-libs_svn.bb
+++ b/packages/openmoko-base/openmoko-libs_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/libs"
 LICENSE = "LGPL"
 DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
 PV = "0.4+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko
 
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index cf25a2bb8f..1baa1d68b0 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for Openmoko"
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko-base
 
diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
index 9abb5be547..67fe16c858 100644
--- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -10,7 +10,7 @@ RDEPENDS = "\
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
 "
-FILE_PR = "r6"
+PR = "r6"
 
 inherit openmoko-base update-rc.d
 
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index 742bcdcb28..bb500dbeb5 100644
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard sound theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko-base autotools
 
diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
index 8b39ad3855..5cb7042c92 100644
--- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko-base
 
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index ffcbf43cb7..e5e54934dc 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit openmoko-base
 
diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
index 2c82d74087..2f87b0c41c 100644
--- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
+++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/examples"
 DEPENDS += "libmatchbox"
 PV = "0.0.1+svnr${SRCREV}"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index b4c1418e69..336a7f8541 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Shows the bluetooth status in the Openmoko panel"
 DEPENDS = "bluez-libs libnotify"
 PV = "0.1.0+svn${SVNREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index 4086a1dd04..e8a5bc877d 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
 DEPENDS = "libmokogsmd2 libnotify"
 PV = "0.1.0+svn${SVNREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index 390abcf53c..19c278596d 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Main menu applet for the Openmoko panel"
 DEPENDS += "pulseaudio startup-notification"
 PV = "0.1.0+svn${SVNREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko-panel-plugin
 
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
index 2365b4eba9..2b1d2b03bd 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel"
 DEPENDS = "libnotify"
 RDEPENDS = "openmoko-dialer2"
 PV = "0.0.0+svn${SVNREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko-panel-plugin
diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
index 70a6838994..32c976df7a 100644
--- a/packages/openmoko-projects/assassin_svn.bb
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet"
 PV = "0.2+svnr${SRCREV}"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
 
diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
index 9a14d8b1e4..43c1d0a1b9 100644
--- a/packages/openmoko-projects/diversity-daemon_svn.bb
+++ b/packages/openmoko-projects/diversity-daemon_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
 RDEPENDS_${PN} = "eds-dbus"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \
            file://no-xmmp.patch;patch=1;minrev=276"
diff --git a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
index 07b092beaa..c882963fb2 100644
--- a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
+++ b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 require diversity-maps.inc
 
diff --git a/packages/openmoko-projects/enlazar_svn.bb b/packages/openmoko-projects/enlazar_svn.bb
index 2a7bab170f..38fdab4747 100644
--- a/packages/openmoko-projects/enlazar_svn.bb
+++ b/packages/openmoko-projects/enlazar_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
 RDEPENDS = "networkmanager"
 PV = "0.1+svn${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 PE = "1"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
diff --git a/packages/openmoko-projects/illume-theme-asu_svn.bb b/packages/openmoko-projects/illume-theme-asu_svn.bb
index db22b56d53..5ddb61d0eb 100644
--- a/packages/openmoko-projects/illume-theme-asu_svn.bb
+++ b/packages/openmoko-projects/illume-theme-asu_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=http"
 S = "${WORKDIR}/illume"
diff --git a/packages/openmoko-projects/openmoko-agpsui_svn.bb b/packages/openmoko-projects/openmoko-agpsui_svn.bb
index 1751e66f86..b9b2de2de7 100644
--- a/packages/openmoko-projects/openmoko-agpsui_svn.bb
+++ b/packages/openmoko-projects/openmoko-agpsui_svn.bb
@@ -4,7 +4,7 @@ SECTION = "openmoko/apps"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=https"
 
diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb
index 328fc5bb8a..4b8fe5eeb3 100644
--- a/packages/openmoko-projects/tichy_svn.bb
+++ b/packages/openmoko-projects/tichy_svn.bb
@@ -3,7 +3,7 @@ SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "python-pygame"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http"
 S = "${WORKDIR}/tichy"
diff --git a/packages/openmoko2/libjana_svn.bb b/packages/openmoko2/libjana_svn.bb
index edc940b4bd..48779e50fe 100644
--- a/packages/openmoko2/libjana_svn.bb
+++ b/packages/openmoko2/libjana_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "O-Hand Jana Library"
 DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools pkgconfig lib_package
 
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 09335b9fe6..5625bf809d 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index 3fbdc34c7e..354b8e3f26 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2 lib_package
 
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index f6152c8e0e..0813111821 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+ matchbox-panel-2"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index 17fb66c716..3785074a82 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/moko-gtk-engine_svn.bb b/packages/openmoko2/moko-gtk-engine_svn.bb
index 54caede314..027b3cb22b 100644
--- a/packages/openmoko2/moko-gtk-engine_svn.bb
+++ b/packages/openmoko2/moko-gtk-engine_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Moko GTK+ theme engine"
 SECTION = "openmoko/libs"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index 89c175e5fe..00fc49fdf9 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/daemons"
 DEPENDS = "gtk+ pulseaudio apmd"
 RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit openmoko2 gconf
 
diff --git a/packages/openmoko2/openmoko-alsa-scenarios.bb b/packages/openmoko2/openmoko-alsa-scenarios.bb
index 3a5fbba45e..08531e898e 100644
--- a/packages/openmoko2/openmoko-alsa-scenarios.bb
+++ b/packages/openmoko2/openmoko-alsa-scenarios.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 PV = "1.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
 
diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb
index c930058647..a6f5c11171 100644
--- a/packages/openmoko2/openmoko-appearance_svn.bb
+++ b/packages/openmoko2/openmoko-appearance_svn.bb
@@ -3,6 +3,6 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 gconf gtk+"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2 gtk-icon-cache 
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
index 5eb77b9597..fe5e227d8f 100644
--- a/packages/openmoko2/openmoko-appmanager2_svn.bb
+++ b/packages/openmoko2/openmoko-appmanager2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Application Manager"
 SECTION = "openmoko/applications"
 DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2 
 
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index 85e12e5921..c7f3066946 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Webbrowser"
 SECTION = "openmoko/apps"
 DEPENDS += "intltool libmokoui2 check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2
 LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index 05b32685b3..ba202bcec9 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "A Calculator for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index ca4a4129d3..0ea381437c 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common files for the Openmoko framework"
 SECTION = "openmoko/base"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index 4c7336feff..d380f32327 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
 RDEPENDS = "libedata-book"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index 0416eb59af..ff3bfa62a6 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2 pkgconfig
 
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index bc6272d673..fa76c44a14 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r8"
+PR = "r8"
 PE = "1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index d3e17c4d9c..5fb7dab619 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "The Openmoko Feed Reader"
 SECTION = "openmoko/apps"
 DEPENDS += "libmokoui2 libmrss check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb
index aa08653753..ce2c181736 100644
--- a/packages/openmoko2/openmoko-firststart2_svn.bb
+++ b/packages/openmoko2/openmoko-firststart2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko First Start Wizard"
 SECTION = "openmoko/apps"
 DEPENDS += "libmokoui2 libglade"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index eb3780f11e..e394547fd5 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework, QVGA edition
 SECTION = "openmoko/base"
 DEPENDS = "imagemagick-native librsvg-native"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
index f571d2b065..e145fb2d98 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
 SECTION = "openmoko/base"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 3b6e39710b..79a8163328 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index 6dfc4655ce..f28f7f8e0a 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Message application"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index fbb30abc11..b944e79b45 100644
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Sample Project"
 SECTION = "openmoko/applications"
 DEPENDS = "libmokoui2 intltool gconf"
 PV = "0.0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 628842232d..d0c3268e0c 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-FILE_PR = "r69"
+PR = "r69"
 
 SRC_URI = "\
   file://etc \
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index 404d412246..33cd5648d4 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -13,7 +13,7 @@ RDEPENDS = "\
 "
 RREPLACES = "openmoko-sound-system"
 RPROVIDES = "openmoko-sound-system"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit openmoko-base update-rc.d
 
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index 924d339a0a..3096da4813 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/base"
 RREPLACES = "openmoko-sound-theme-standard"
 RPROVIDES = "openmoko-sound-theme-standard"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit openmoko2 autotools
 
diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb
index aac7fb2090..b18c269814 100644
--- a/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/pim"
 DEPENDS = "dbus-glib eds-dbus libmokoui2"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index c5284426d1..3a5ef204ff 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -3,6 +3,6 @@ SECTION = "openmoko/applications"
 DEPENDS = "vala-native vte libmokoui2"
 RDEPENDS = "ttf-liberation-mono"
 PV = "3.0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
index d147e7eb1d..4a41079059 100644
--- a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 RPROVIDES = "openmoko-theme-standard-2"
 PV = "0.1.1+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index 39e8a496ea..d4d23d11d6 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.1+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index b4511ee302..4b9f245c3c 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Openmoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 RCONFLICTS_${PN} = "matchbox-common"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index e057ff75ca..efd281a95e 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -3,6 +3,6 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit openmoko2 gtk-icon-cache 
diff --git a/packages/openmoko2/settingsgui_0.8.bb b/packages/openmoko2/settingsgui_0.8.bb
index 5549758184..e8ac48247c 100644
--- a/packages/openmoko2/settingsgui_0.8.bb
+++ b/packages/openmoko2/settingsgui_0.8.bb
@@ -3,7 +3,7 @@ AUTHOR = "Kristian M."
 SECTION = "openmoko/applications"
 RDEPENDS = "python-pygtk python-subprocess python-threading"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8.tar.bz2"
 
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 34ec2225e6..b8dca0c278 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
 DEPENDS += "openssl tzdata"
-FILE_PR = "r14"
+PR = "r14"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/packages/openntpd/openntpd_3.9p1.bb b/packages/openntpd/openntpd_3.9p1.bb
index a4388c5dbd..3798c13194 100644
--- a/packages/openntpd/openntpd_3.9p1.bb
+++ b/packages/openntpd/openntpd_3.9p1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
 DEPENDS += "openssl tzdata"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/${P}.tar.gz \
            file://adjtimex-${PV}.patch;patch=1 \
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
index 8d4040a422..41648ca412 100644
--- a/packages/openobex/openobex_1.2.bb
+++ b/packages/openobex/openobex_1.2.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PROVIDES = "openobex-apps"
 DEPENDS = "libusb bluez-libs"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1 \
diff --git a/packages/openobex/openobex_1.3.bb b/packages/openobex/openobex_1.3.bb
index 0ac3317ce7..65e98e4ab1 100644
--- a/packages/openobex/openobex_1.3.bb
+++ b/packages/openobex/openobex_1.3.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PROVIDES = "openobex-apps"
 DEPENDS = "libusb bluez-libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1 \
diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb
index df295c1991..6823eabb98 100644
--- a/packages/openocd/openocd_svn.bb
+++ b/packages/openocd/openocd_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools
 
diff --git a/packages/openprotium-init/openprotium-init_0.10.bb b/packages/openprotium-init/openprotium-init_0.10.bb
index 0157162654..7443fc9fd7 100644
--- a/packages/openprotium-init/openprotium-init_0.10.bb
+++ b/packages/openprotium-init/openprotium-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-FILE_PR = "r71"
+PR = "r71"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/opensp/opensp-native_1.5.bb b/packages/opensp/opensp-native_1.5.bb
index 199c7902fd..f837ec908a 100644
--- a/packages/opensp/opensp-native_1.5.bb
+++ b/packages/opensp/opensp-native_1.5.bb
@@ -1,6 +1,6 @@
 SECTION = "libs"
 DEPENDS = ""
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
 		file://m4.patch;patch=1 \
diff --git a/packages/opensp/opensp_1.5.bb b/packages/opensp/opensp_1.5.bb
index bdb6a88737..839fde5b8a 100644
--- a/packages/opensp/opensp_1.5.bb
+++ b/packages/opensp/opensp_1.5.bb
@@ -4,7 +4,7 @@ XML documents."
 HOMEPAGE = "http://openjade.sourceforge.net/"
 SECTION = "libs"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 # sh4/gcc3.4.4 with -O2 triggers internal compiler errors
 FULL_OPTIMIZATION_sh4 = "-O1"
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index 51ef23e2a9..7798dbd378 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -10,7 +10,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-FILE_PR ="r3"
+PR ="r3"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index 892ed7d25f..ae3092ff10 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -14,7 +14,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb
index 136e34f695..c3117802a7 100644
--- a/packages/openssh/openssh_4.3p2.bb
+++ b/packages/openssh/openssh_4.3p2.bb
@@ -14,7 +14,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://sshd_config \
diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb
index 48f85779c8..692c92fa1d 100644
--- a/packages/openssh/openssh_4.6p1.bb
+++ b/packages/openssh/openssh_4.6p1.bb
@@ -14,7 +14,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://sftp-server-nolibcrypto.patch;patch=1 \
diff --git a/packages/openssl/openssl-native_0.9.7g.bb b/packages/openssl/openssl-native_0.9.7g.bb
index e623de497b..f48e123152 100644
--- a/packages/openssl/openssl-native_0.9.7g.bb
+++ b/packages/openssl/openssl-native_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig native
 
 require openssl.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/openssl/openssl-native_0.9.7m.bb b/packages/openssl/openssl-native_0.9.7m.bb
index 505bc5da36..e7dc7c7e5e 100644
--- a/packages/openssl/openssl-native_0.9.7m.bb
+++ b/packages/openssl/openssl-native_0.9.7m.bb
@@ -6,7 +6,7 @@ require openssl.inc
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/openssl/openssl-native_0.9.8g.bb b/packages/openssl/openssl-native_0.9.8g.bb
index 80dd28c025..9ae8e391d0 100644
--- a/packages/openssl/openssl-native_0.9.8g.bb
+++ b/packages/openssl/openssl-native_0.9.8g.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 
 require openssl.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 # This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
 export FULL_OPTIMIZATION = " "
diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb
index c52fb4cd80..cda364a53d 100644
--- a/packages/openssl/openssl_0.9.7e.bb
+++ b/packages/openssl/openssl_0.9.7e.bb
@@ -1,6 +1,6 @@
 require openssl.inc
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1 \
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index 336e4652fd..fbd2af26f9 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
 
 require openssl.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/openssl/openssl_0.9.7m.bb b/packages/openssl/openssl_0.9.7m.bb
index 336e4652fd..fbd2af26f9 100644
--- a/packages/openssl/openssl_0.9.7m.bb
+++ b/packages/openssl/openssl_0.9.7m.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
 
 require openssl.inc
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/openssl/openssl_0.9.8g.bb b/packages/openssl/openssl_0.9.8g.bb
index b3e1bc49e4..1cb360f967 100644
--- a/packages/openssl/openssl_0.9.8g.bb
+++ b/packages/openssl/openssl_0.9.8g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
 
 require openssl.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://configure-targets.patch;patch=1 \
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index 06534023a6..b1c5271b13 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/packages/openswan/openswan_2.2.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_nylon = "perl"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
 	   file://openswan-2.2.0-gentoo.patch;patch=1 \
diff --git a/packages/openswan/openswan_2.4.7.bb b/packages/openswan/openswan_2.4.7.bb
index dfd701c6f2..353e0eacdd 100644
--- a/packages/openswan/openswan_2.4.7.bb
+++ b/packages/openswan/openswan_2.4.7.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_nylon = "perl"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
 	   file://openswan-2.4.7-gentoo.patch;patch=1 \
diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
index 901cb7d95a..a81417bf7e 100644
--- a/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
+++ b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-${PV};proto=http \
 	file://missing-syncml-config.patch;patch=1 \
diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb
index 32d004193a..e971624c8f 100644
--- a/packages/opensync/syncml-client_0.1.bb
+++ b/packages/opensync/syncml-client_0.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ curl gconf"
 HOMEPAGE = "http://hem.bredband.net/miko22/"
 DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." 
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz       \
 	   file://syncml-client-pc-in-cross.patch;patch=1 "
diff --git a/packages/openttd/openttd_0.6.2.bb b/packages/openttd/openttd_0.6.2.bb
index b7fb7d3763..a8a06738f4 100644
--- a/packages/openttd/openttd_0.6.2.bb
+++ b/packages/openttd/openttd_0.6.2.bb
@@ -1,6 +1,6 @@
 require openttd.inc 
 
-FILE_PR = "r0"
+PR = "r0"
 
 # When upgrading this recipe make sure to refresh this patch.
 SRC_URI += "file://openttd_${PV}-buildfix.patch;patch=1"
diff --git a/packages/openvpn/openvpn_1.5.0.bb b/packages/openvpn/openvpn_1.5.0.bb
index c7b4e74f27..12cebf5bcd 100644
--- a/packages/openvpn/openvpn_1.5.0.bb
+++ b/packages/openvpn/openvpn_1.5.0.bb
@@ -1,3 +1,3 @@
 require openvpn.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/openvpn/openvpn_1.6.0.bb b/packages/openvpn/openvpn_1.6.0.bb
index 09c1c50ddf..5bb4a2822b 100644
--- a/packages/openvpn/openvpn_1.6.0.bb
+++ b/packages/openvpn/openvpn_1.6.0.bb
@@ -1,3 +1,3 @@
 require openvpn.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/openvpn/openvpn_2.0.2.bb b/packages/openvpn/openvpn_2.0.2.bb
index 36d6cc4d96..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.2.bb
+++ b/packages/openvpn/openvpn_2.0.2.bb
@@ -1,3 +1,3 @@
 require openvpn.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/openvpn/openvpn_2.0.9.bb b/packages/openvpn/openvpn_2.0.9.bb
index 36d6cc4d96..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.9.bb
+++ b/packages/openvpn/openvpn_2.0.9.bb
@@ -1,3 +1,3 @@
 require openvpn.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/openvpn/openvpn_2.0.bb b/packages/openvpn/openvpn_2.0.bb
index 36d6cc4d96..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.bb
+++ b/packages/openvpn/openvpn_2.0.bb
@@ -1,3 +1,3 @@
 require openvpn.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/opie-alarm/opie-alarm_1.2.3.bb b/packages/opie-alarm/opie-alarm_1.2.3.bb
index 4fb960d3cd..d298efc34c 100644
--- a/packages/opie-alarm/opie-alarm_1.2.3.bb
+++ b/packages/opie-alarm/opie-alarm_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
            file://01opiealarm \
diff --git a/packages/opie-alarm/opie-alarm_1.2.4.bb b/packages/opie-alarm/opie-alarm_1.2.4.bb
index 4fb960d3cd..d298efc34c 100644
--- a/packages/opie-alarm/opie-alarm_1.2.4.bb
+++ b/packages/opie-alarm/opie-alarm_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
            file://01opiealarm \
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 3cc5311b02..fca5f8b51a 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm \
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.3.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.3.bb
index 3420dcff37..534c25c5b1 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.3.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb
index 3420dcff37..534c25c5b1 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
index 4bd0aa9881..97cc8f53ce 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
 	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.3.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.3.bb
index ddde7ead5c..1a678f0cff 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.3.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb
index ddde7ead5c..1a678f0cff 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
index 41fcd6e151..ed9b98120a 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
index 484a2acdab..f54012285d 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb
index 484a2acdab..f54012285d 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index 4653c6592c..04756ed77a 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb
index f47d492f83..2eb719fbfc 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb
index 319a80a4cf..b688603b24 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.3.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.3.bb
index a76673013a..81c88fa51b 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.3.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb
index a76673013a..81c88fa51b 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index 3d5d3f782a..7bdec3e27e 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-cardapplet/opie-cardapplet_cvs.bb b/packages/opie-cardapplet/opie-cardapplet_cvs.bb
index 83e142e00c..e791fe09fd 100644
--- a/packages/opie-cardapplet/opie-cardapplet_cvs.bb
+++ b/packages/opie-cardapplet/opie-cardapplet_cvs.bb
@@ -2,7 +2,7 @@ require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/cardapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc
index c2542cb72f..529eba0d7f 100644
--- a/packages/opie-citytime/opie-citytime.inc
+++ b/packages/opie-citytime/opie-citytime.inc
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RRECOMMENDS = "tzdata"
-FILE_PR = "r1"
+PR = "r1"
 
 APPNAME = "citytime"
 
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.3.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.3.bb
index 815576d600..8831aeec3c 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.3.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb
index 815576d600..8831aeec3c 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
index 7c3ce77159..95b33b46a9 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb
index 661b00f6e8..2785b7cd29 100644
--- a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb
index 1ca552544f..cc1a2b5376 100644
--- a/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index a928769af7..28ca4dac95 100644
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-console/opie-console_1.2.3.bb b/packages/opie-console/opie-console_1.2.3.bb
index 96f5948958..a364181d76 100644
--- a/packages/opie-console/opie-console_1.2.3.bb
+++ b/packages/opie-console/opie-console_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-console/opie-console_1.2.4.bb b/packages/opie-console/opie-console_1.2.4.bb
index c1782a0e31..034c98647f 100644
--- a/packages/opie-console/opie-console_1.2.4.bb
+++ b/packages/opie-console/opie-console_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index 4783cf99b0..857f6d10a1 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_1.2.3.bb b/packages/opie-dagger/opie-dagger_1.2.3.bb
index 3ea03731f3..cacd5552bb 100644
--- a/packages/opie-dagger/opie-dagger_1.2.3.bb
+++ b/packages/opie-dagger/opie-dagger_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_1.2.4.bb b/packages/opie-dagger/opie-dagger_1.2.4.bb
index 6ddee78aad..cdab20bcf6 100644
--- a/packages/opie-dagger/opie-dagger_1.2.4.bb
+++ b/packages/opie-dagger/opie-dagger_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb
index 87ae9b3042..8d8f93cf58 100644
--- a/packages/opie-dagger/opie-dagger_cvs.bb
+++ b/packages/opie-dagger/opie-dagger_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dvorak/opie-dvorak_1.2.3.bb b/packages/opie-dvorak/opie-dvorak_1.2.3.bb
index bebdbb2f60..54af47b2bc 100644
--- a/packages/opie-dvorak/opie-dvorak_1.2.3.bb
+++ b/packages/opie-dvorak/opie-dvorak_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard \
diff --git a/packages/opie-dvorak/opie-dvorak_1.2.4.bb b/packages/opie-dvorak/opie-dvorak_1.2.4.bb
index bebdbb2f60..54af47b2bc 100644
--- a/packages/opie-dvorak/opie-dvorak_1.2.4.bb
+++ b/packages/opie-dvorak/opie-dvorak_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard \
diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index f1a1bda78f..54234dda7a 100644
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \
diff --git a/packages/opie-eye/opie-eye_1.2.3.bb b/packages/opie-eye/opie-eye_1.2.3.bb
index 864b096e4b..d17aa0c9a6 100644
--- a/packages/opie-eye/opie-eye_1.2.3.bb
+++ b/packages/opie-eye/opie-eye_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_1.2.4.bb b/packages/opie-eye/opie-eye_1.2.4.bb
index 864b096e4b..d17aa0c9a6 100644
--- a/packages/opie-eye/opie-eye_1.2.4.bb
+++ b/packages/opie-eye/opie-eye_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb
index c93dc7194c..ed73d8c7ee 100644
--- a/packages/opie-eye/opie-eye_cvs.bb
+++ b/packages/opie-eye/opie-eye_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-freetype/opie-freetype_1.2.2.bb b/packages/opie-freetype/opie-freetype_1.2.2.bb
index 25b2c506c6..8f99026227 100644
--- a/packages/opie-freetype/opie-freetype_1.2.2.bb
+++ b/packages/opie-freetype/opie-freetype_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
diff --git a/packages/opie-freetype/opie-freetype_1.2.3.bb b/packages/opie-freetype/opie-freetype_1.2.3.bb
index b2c7dd313a..f9159deb2a 100644
--- a/packages/opie-freetype/opie-freetype_1.2.3.bb
+++ b/packages/opie-freetype/opie-freetype_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
diff --git a/packages/opie-freetype/opie-freetype_1.2.4.bb b/packages/opie-freetype/opie-freetype_1.2.4.bb
index b2c7dd313a..f9159deb2a 100644
--- a/packages/opie-freetype/opie-freetype_1.2.4.bb
+++ b/packages/opie-freetype/opie-freetype_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb
index ea29ffad5e..b26315d567 100644
--- a/packages/opie-freetype/opie-freetype_cvs.bb
+++ b/packages/opie-freetype/opie-freetype_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/freetype"
diff --git a/packages/opie-handwriting/opie-handwriting_1.2.3.bb b/packages/opie-handwriting/opie-handwriting_1.2.3.bb
index 1edaddadc5..6a81fe089c 100644
--- a/packages/opie-handwriting/opie-handwriting_1.2.3.bb
+++ b/packages/opie-handwriting/opie-handwriting_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
diff --git a/packages/opie-handwriting/opie-handwriting_1.2.4.bb b/packages/opie-handwriting/opie-handwriting_1.2.4.bb
index 1edaddadc5..6a81fe089c 100644
--- a/packages/opie-handwriting/opie-handwriting_1.2.4.bb
+++ b/packages/opie-handwriting/opie-handwriting_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index b57c776905..6f33501dc3 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};module=opie/etc/qimpen"
diff --git a/packages/opie-help-en/opie-help-en_1.2.2.bb b/packages/opie-help-en/opie-help-en_1.2.2.bb
index e8ba51b22c..f1b3dc5f47 100644
--- a/packages/opie-help-en/opie-help-en_1.2.2.bb
+++ b/packages/opie-help-en/opie-help-en_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 67ff2df33c..5960820a18 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 69f2a0af74..96b8dad1c7 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
 	   ${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 924358f28a..bc1ea8932f 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index a73c9e31ad..f168ca527f 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
index 2d48ba3edb..13a5942517 100644
--- a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index 976c054b5b..b52e162e50 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
diff --git a/packages/opie-irc/opie-irc_1.2.3.bb b/packages/opie-irc/opie-irc_1.2.3.bb
index d987367613..1166c07eef 100644
--- a/packages/opie-irc/opie-irc_1.2.3.bb
+++ b/packages/opie-irc/opie-irc_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
diff --git a/packages/opie-irc/opie-irc_1.2.4.bb b/packages/opie-irc/opie-irc_1.2.4.bb
index c384527e77..838052bf5a 100644
--- a/packages/opie-irc/opie-irc_1.2.4.bb
+++ b/packages/opie-irc/opie-irc_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index c2c5143128..ecf7f645a5 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};module=opie/help \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.3.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.3.bb
index e70dbcaa2e..aa0ece4c73 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.3.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = r3
+PR = r3
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb
index e70dbcaa2e..aa0ece4c73 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = r3
+PR = r3
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index be4d10735c..1fd3393fe1 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = r3
+PR = r3
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.3.bb b/packages/opie-jumpx/opie-jumpx_1.2.3.bb
index f8feeafbbd..7e1de3b0ac 100644
--- a/packages/opie-jumpx/opie-jumpx_1.2.3.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.4.bb b/packages/opie-jumpx/opie-jumpx_1.2.4.bb
index 6a89881ff4..222ad2d6f9 100644
--- a/packages/opie-jumpx/opie-jumpx_1.2.4.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-keyboard/opie-keyboard_1.2.3.bb b/packages/opie-keyboard/opie-keyboard_1.2.3.bb
index a98bb69e5e..04c368ba89 100644
--- a/packages/opie-keyboard/opie-keyboard_1.2.3.bb
+++ b/packages/opie-keyboard/opie-keyboard_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard \
 	file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-keyboard/opie-keyboard_1.2.4.bb b/packages/opie-keyboard/opie-keyboard_1.2.4.bb
index a98bb69e5e..04c368ba89 100644
--- a/packages/opie-keyboard/opie-keyboard_1.2.4.bb
+++ b/packages/opie-keyboard/opie-keyboard_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard \
 	file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb
index 861ea219b0..e2cdeef495 100644
--- a/packages/opie-keyboard/opie-keyboard_cvs.bb
+++ b/packages/opie-keyboard/opie-keyboard_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard \
 	file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index c0906ba188..e00a55c6cd 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-keyview/opie-keyview_1.2.3.bb b/packages/opie-keyview/opie-keyview_1.2.3.bb
index 47f29aa323..583e3a4507 100644
--- a/packages/opie-keyview/opie-keyview_1.2.3.bb
+++ b/packages/opie-keyview/opie-keyview_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
diff --git a/packages/opie-keyview/opie-keyview_1.2.4.bb b/packages/opie-keyview/opie-keyview_1.2.4.bb
index 47f29aa323..583e3a4507 100644
--- a/packages/opie-keyview/opie-keyview_1.2.4.bb
+++ b/packages/opie-keyview/opie-keyview_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb
index 774dd0ee42..5a806c6c62 100644
--- a/packages/opie-keyview/opie-keyview_cvs.bb
+++ b/packages/opie-keyview/opie-keyview_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
index 2b0055794e..587fa7924a 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb
index fddf07b0d3..430bebc56c 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.3.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.3.bb
index 71714d41e7..bc285bdc8c 100644
--- a/packages/opie-lockapplet/opie-lockapplet_1.2.3.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb
index 71714d41e7..bc285bdc8c 100644
--- a/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index 688bc15065..6ff0588118 100644
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.3.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.3.bb
index dcd19e2af0..0795d423ae 100644
--- a/packages/opie-mailapplet/opie-mailapplet_1.2.3.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb
index dcd19e2af0..0795d423ae 100644
--- a/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
index 7b4bc778ea..b20bbd0217 100644
--- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
index ec699b5ffc..19b507a2bc 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb
index 501a5fba03..78f0796834 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb
index 501a5fba03..78f0796834 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 7ed2ed7bdf..4fafc8f530 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
index 56c24fb692..5c49fb824f 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb
index 10a5cca87d..b40ab35295 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb
index 10a5cca87d..b40ab35295 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
index 8bac5eaee6..427793481e 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
index c3e6c11c3e..0407a8ab16 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb
index 55ae424990..9b700fb85b 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb
index 55ae424990..9b700fb85b 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index d559d0f0fd..0fd327d126 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
index 56c24fb692..5c49fb824f 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb
index 10a5cca87d..b40ab35295 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb
index 10a5cca87d..b40ab35295 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index f558b9f27e..ca4c49ee3a 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index 6d942ce8b6..be992e94db 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index a84c7fa65b..1857849069 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index d9b090ffcc..4d1e8fcba9 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index 5c2f2cc242..450c9dbc42 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPNAME = "opieplayer2"
 RPROVIDES = "opie-mediaplayer2-skin"
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
 
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.3.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.3.bb
index 096d84a7e2..c28a321021 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.3.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb
index 096d84a7e2..c28a321021 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 989963a102..d0802ad986 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb
index 7002788c18..9217992acc 100644
--- a/packages/opie-multikey/opie-multikey_1.2.2.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r2"
+PR = "r2"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
diff --git a/packages/opie-multikey/opie-multikey_1.2.3.bb b/packages/opie-multikey/opie-multikey_1.2.3.bb
index 3fbfdc2998..a32dd47e7c 100644
--- a/packages/opie-multikey/opie-multikey_1.2.3.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
diff --git a/packages/opie-multikey/opie-multikey_1.2.4.bb b/packages/opie-multikey/opie-multikey_1.2.4.bb
index 3fbfdc2998..a32dd47e7c 100644
--- a/packages/opie-multikey/opie-multikey_1.2.4.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 360c0d613f..307f06ae74 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};module=opie/share \
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.3.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.3.bb
index 0858ce91a4..11bd0e66ae 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.3.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb
index 0858ce91a4..11bd0e66ae 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index 1c9847830f..000f5b5e05 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
index d9b1527074..0ee5f6a00d 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb
index ba02cd35b6..16d10de21b 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networksettings/opie-networksettings_1.2.3.bb b/packages/opie-networksettings/opie-networksettings_1.2.3.bb
index 9dd34ced7c..e5981ed121 100644
--- a/packages/opie-networksettings/opie-networksettings_1.2.3.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-networksettings/opie-networksettings_1.2.4.bb b/packages/opie-networksettings/opie-networksettings_1.2.4.bb
index 9dd34ced7c..e5981ed121 100644
--- a/packages/opie-networksettings/opie-networksettings_1.2.4.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index c7e0c2e2bf..423037e7cf 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
index 9ee5ca853b..95160df5cd 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb
index 0964d20a52..09d56c6b1f 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-oxygen/opie-oxygen_1.0.0.bb b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
index 04e4d3596b..767295618e 100644
--- a/packages/opie-oxygen/opie-oxygen_1.0.0.bb
+++ b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "oxygen"
-FILE_PR = "r0"
+PR = "r0"
 
 #cvsdate for 1.0.0 is 20050101
 SRCDATE = "20050101"
diff --git a/packages/opie-parashoot/opie-parashoot_1.2.4.bb b/packages/opie-parashoot/opie-parashoot_1.2.4.bb
index 8d5c7b423a..f7033f94dd 100644
--- a/packages/opie-parashoot/opie-parashoot_1.2.4.bb
+++ b/packages/opie-parashoot/opie-parashoot_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.3.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.3.bb
index df7a97b123..90cd3bc08d 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.3.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb
index df7a97b123..90cd3bc08d 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
index 462fd367bb..eb0976f8d0 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
 	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard_1.2.3.bb b/packages/opie-pickboard/opie-pickboard_1.2.3.bb
index bb1cc97670..6640c1236f 100644
--- a/packages/opie-pickboard/opie-pickboard_1.2.3.bb
+++ b/packages/opie-pickboard/opie-pickboard_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pickboard/opie-pickboard_1.2.4.bb b/packages/opie-pickboard/opie-pickboard_1.2.4.bb
index bb1cc97670..6640c1236f 100644
--- a/packages/opie-pickboard/opie-pickboard_1.2.4.bb
+++ b/packages/opie-pickboard/opie-pickboard_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index 5d414f3489..368f265e95 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc
index 7666ed9667..68dbcb930b 100644
--- a/packages/opie-pics/opie-pics.inc
+++ b/packages/opie-pics/opie-pics.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Common Opie pictures usable from all applications"
 SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}"
 
diff --git a/packages/opie-pics/opie-pics_1.2.3.bb b/packages/opie-pics/opie-pics_1.2.3.bb
index 4a713a3178..2c199b73fc 100644
--- a/packages/opie-pics/opie-pics_1.2.3.bb
+++ b/packages/opie-pics/opie-pics_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
diff --git a/packages/opie-pics/opie-pics_1.2.4.bb b/packages/opie-pics/opie-pics_1.2.4.bb
index 4c31cf01bb..7cbe65504d 100644
--- a/packages/opie-pics/opie-pics_1.2.4.bb
+++ b/packages/opie-pics/opie-pics_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index a7d55dff41..08aa9ede5c 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
index 5748e0ae26..8fa1eff6e3 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb
index c8edacecf0..1eb12e8b64 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-qcop/opie-qcop_1.2.3.bb b/packages/opie-qcop/opie-qcop_1.2.3.bb
index c51fea0738..c62004a1db 100644
--- a/packages/opie-qcop/opie-qcop_1.2.3.bb
+++ b/packages/opie-qcop/opie-qcop_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop \
            file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-qcop/opie-qcop_1.2.4.bb b/packages/opie-qcop/opie-qcop_1.2.4.bb
index c51fea0738..c62004a1db 100644
--- a/packages/opie-qcop/opie-qcop_1.2.4.bb
+++ b/packages/opie-qcop/opie-qcop_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop \
            file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 44463c39ee..01a1d1b407 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
            file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-qss/opie-qss_1.2.3.bb b/packages/opie-qss/opie-qss_1.2.3.bb
index 697f83bfad..df7158b084 100644
--- a/packages/opie-qss/opie-qss_1.2.3.bb
+++ b/packages/opie-qss/opie-qss_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss"
diff --git a/packages/opie-qss/opie-qss_1.2.4.bb b/packages/opie-qss/opie-qss_1.2.4.bb
index 697f83bfad..df7158b084 100644
--- a/packages/opie-qss/opie-qss_1.2.4.bb
+++ b/packages/opie-qss/opie-qss_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss"
diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index a7274dd8d1..915fefafc0 100644
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.3.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.3.bb
index 8161906958..930c08a2f3 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.3.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb
index 8161906958..930c08a2f3 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index f173a758cf..4255a2bf0a 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb
index f769f8b879..38484b9413 100644
--- a/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-reader/opie-reader_1.2.3.bb b/packages/opie-reader/opie-reader_1.2.3.bb
index 33fa59a94f..43632416c5 100644
--- a/packages/opie-reader/opie-reader_1.2.3.bb
+++ b/packages/opie-reader/opie-reader_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = r2
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-reader/opie-reader_1.2.4.bb b/packages/opie-reader/opie-reader_1.2.4.bb
index 33fa59a94f..43632416c5 100644
--- a/packages/opie-reader/opie-reader_1.2.4.bb
+++ b/packages/opie-reader/opie-reader_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = r2
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index da96a32f53..36c8c06157 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = r2
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-reader/uqtreader_cvs.bb b/packages/opie-reader/uqtreader_cvs.bb
index 810d51492d..9b7ae57196 100644
--- a/packages/opie-reader/uqtreader_cvs.bb
+++ b/packages/opie-reader/uqtreader_cvs.bb
@@ -7,7 +7,7 @@ RRECOMMENDS="${PN}-filter-html"
 
 SRCDATE = "20070601"
 PV = "1.2.2opie+cvs${SRCDATE}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.3.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.3.bb
index a492041daf..27db092ec0 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.3.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps                          \
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb
index a492041daf..27db092ec0 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps                          \
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index ff85c897fa..43ce79d570 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};module=opie/apps                          \
diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb
index 1f21d5ff0d..8f8683175f 100644
--- a/packages/opie-security/opie-security_cvs.bb
+++ b/packages/opie-security/opie-security_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index b8d38a79d5..4701e1aeeb 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "opie-sh"
 
 
-FILE_PR = "r2"
+PR = "r2"
 
 FILES_${PN} = "/opt/QtPalmtop"
 
diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.3.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.3.bb
index f5e091394f..9a48668e8a 100644
--- a/packages/opie-sh-snes/opie-sh-snes_1.2.3.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_1.2.3.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb
index f5e091394f..9a48668e8a 100644
--- a/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 558fdcca4c..e28a02a80d 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc
index f086b81349..3818a21953 100644
--- a/packages/opie-sh/opie-sh.inc
+++ b/packages/opie-sh/opie-sh.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "opie-sh"
 APPTYPE = "binary"
-FILE_PR = "r3"
+PR = "r3"
 
 S = "${WORKDIR}/${APPNAME}"
 
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index cdd559c38c..fc16d24601 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
index 219e8fb7d1..3a8954bebe 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
index 687c8e7bff..a36e85b34d 100644
--- a/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 SRCDATE = "20070922"
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
index 9b8b963653..74b6c5205e 100644
--- a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r2"
+PR = "r2"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb
index dc2d14d4c6..afffae51f0 100644
--- a/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
index 160de92a1f..3d45118134 100644
--- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r7"
+PR = "r7"
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
index 2b3a867dbe..497bff0953 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb
index 8e0d67e456..c22e3bed5f 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.3.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.4.bb b/packages/opie-taskbar/opie-taskbar_1.2.4.bb
index 8e0d67e456..c22e3bed5f 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 78e4115945..e84e35d820 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r16"
+PR = "r16"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-theme/opie-theme_1.2.2.bb b/packages/opie-theme/opie-theme_1.2.2.bb
index fb85936ea6..fc20e7fd60 100644
--- a/packages/opie-theme/opie-theme_1.2.2.bb
+++ b/packages/opie-theme/opie-theme_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
diff --git a/packages/opie-theme/opie-theme_1.2.3.bb b/packages/opie-theme/opie-theme_1.2.3.bb
index 34e85d71f0..2e3900855a 100644
--- a/packages/opie-theme/opie-theme_1.2.3.bb
+++ b/packages/opie-theme/opie-theme_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
diff --git a/packages/opie-theme/opie-theme_1.2.4.bb b/packages/opie-theme/opie-theme_1.2.4.bb
index 34e85d71f0..2e3900855a 100644
--- a/packages/opie-theme/opie-theme_1.2.4.bb
+++ b/packages/opie-theme/opie-theme_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb
index 4adbc6425e..5b9a33142d 100644
--- a/packages/opie-theme/opie-theme_cvs.bb
+++ b/packages/opie-theme/opie-theme_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 PV = "${OPIE_CVS_PV}"
 
diff --git a/packages/opie-tinykate/opie-tinykate.inc b/packages/opie-tinykate/opie-tinykate.inc
index 8ac52fd889..fdec301897 100644
--- a/packages/opie-tinykate/opie-tinykate.inc
+++ b/packages/opie-tinykate/opie-tinykate.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "tinykate"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/tinykate"
 
diff --git a/packages/opie-todo/opie-todo_1.2.3.bb b/packages/opie-todo/opie-todo_1.2.3.bb
index c8d18b63ce..8f76d33bd7 100644
--- a/packages/opie-todo/opie-todo_1.2.3.bb
+++ b/packages/opie-todo/opie-todo_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-todo/opie-todo_1.2.4.bb b/packages/opie-todo/opie-todo_1.2.4.bb
index 8cef0cc62a..f68a559f97 100644
--- a/packages/opie-todo/opie-todo_1.2.4.bb
+++ b/packages/opie-todo/opie-todo_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb
index c288278fb6..164c13f25b 100644
--- a/packages/opie-todo/opie-todo_cvs.bb
+++ b/packages/opie-todo/opie-todo_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index 7db6ae56de..18ce7ac0c9 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Opie TTF support"
 SECTION = "opie/fonts"
 DEPENDS = "freetype"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "file://update-qtttffontdir.c \
            file://02qtttffont-update"
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.3.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.3.bb
index bf83053c1b..afb665b203 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.3.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb
index bf83053c1b..afb665b203 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
index ba6e4f7905..b035a101ed 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.3.bb b/packages/opie-vmemo/opie-vmemo_1.2.3.bb
index 30e00d081a..096a162c0f 100644
--- a/packages/opie-vmemo/opie-vmemo_1.2.3.bb
+++ b/packages/opie-vmemo/opie-vmemo_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.4.bb b/packages/opie-vmemo/opie-vmemo_1.2.4.bb
index bf656014a9..7fc8bfe7f6 100644
--- a/packages/opie-vmemo/opie-vmemo_1.2.4.bb
+++ b/packages/opie-vmemo/opie-vmemo_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.3.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.3.bb
index b0e8ce4073..364a8f3b31 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.3.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb
index b0e8ce4073..364a8f3b31 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index 483b3bf3bb..86a47417ed 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
index 9dfd5c7a9a..39ed06b51b 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb
index 8d4ada2beb..edbe99c21e 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opkg-utils/opkg-utils_svn.bb b/packages/opkg-utils/opkg-utils_svn.bb
index 594ff4644f..4c3c0905ea 100644
--- a/packages/opkg-utils/opkg-utils_svn.bb
+++ b/packages/opkg-utils/opkg-utils_svn.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http"
 
diff --git a/packages/opkg/opkg-ipkg-compat.bb b/packages/opkg/opkg-ipkg-compat.bb
index 41b84c547a..58c81451ae 100644
--- a/packages/opkg/opkg-ipkg-compat.bb
+++ b/packages/opkg/opkg-ipkg-compat.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Files to make opkg and ipkg coexist"
 RDEPENDS = "opkg ipkg ipkg-collateral"
 
-FILE_PR = "r0"
+PR = "r0"
 PACKAGE_ARCH = "all"
 
 do_compile() {
diff --git a/packages/opkg/opkg-native_svn.bb b/packages/opkg/opkg-native_svn.bb
index 50cd818217..57c6e61fb0 100644
--- a/packages/opkg/opkg-native_svn.bb
+++ b/packages/opkg/opkg-native_svn.bb
@@ -1,7 +1,7 @@
 require opkg.inc
 
 DEPENDS = "curl-native"
-FILE_PR = "r2"
+PR = "r2"
 
 target_libdir := "${libdir}"
 
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index e9396c350e..5fa459630d 100644
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -6,7 +6,7 @@ PROVIDES += "opkg"
 SRC_URI += "file://opkg_wget.patch;patch=1 \
 	    file://reduce-nogpg-noise.patch;patch=1 \
 	   "
-FILE_PR = "r0"
+PR = "r0"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index c79ad4c676..7a56b4d7fd 100644
--- a/packages/opkg/opkg-nogpg_svn.bb
+++ b/packages/opkg/opkg-nogpg_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "curl"
 PROVIDES += "opkg"
 
 SRC_URI += "file://reduce-nogpg-noise.patch;patch=1"
-FILE_PR = "r1"
+PR = "r1"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/packages/opkg/opkg-sdk_svn.bb b/packages/opkg/opkg-sdk_svn.bb
index deed540cb1..bff1d7cf4f 100644
--- a/packages/opkg/opkg-sdk_svn.bb
+++ b/packages/opkg/opkg-sdk_svn.bb
@@ -1,7 +1,7 @@
 require opkg.inc
 
 DEPENDS = "curl-sdk"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb
index f450bbf69f..7ffcec3b99 100644
--- a/packages/oprofile/oprofile_0.9.3.bb
+++ b/packages/oprofile/oprofile_0.9.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "popt binutils"
 RDEPENDS = "binutils-symlinks"
 RRECOMMENDS = "kernel-vmlinux"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
            file://armv6_fix.patch;patch=1 \
diff --git a/packages/oprofile/oprofile_0.9.4.bb b/packages/oprofile/oprofile_0.9.4.bb
index 460c0e6efc..f8fb744fcc 100644
--- a/packages/oprofile/oprofile_0.9.4.bb
+++ b/packages/oprofile/oprofile_0.9.4.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "popt binutils"
 RDEPENDS = "binutils-symlinks"
 RRECOMMENDS = "kernel-vmlinux"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index efce51a0d5..786e7046de 100644
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/packages/oprofile/oprofile_cvs.bb
@@ -1,5 +1,5 @@
 PV = "0.9.3+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
diff --git a/packages/oprofile/oprofileui-svn.inc b/packages/oprofile/oprofileui-svn.inc
index cb36054ac3..6d111d1d59 100644
--- a/packages/oprofile/oprofileui-svn.inc
+++ b/packages/oprofile/oprofileui-svn.inc
@@ -1,7 +1,7 @@
 require oprofileui.inc
 
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/trunk"
 
diff --git a/packages/orinoco/orinoco-conf_1.0.bb b/packages/orinoco/orinoco-conf_1.0.bb
index 0bb82b26f2..0062e870a6 100644
--- a/packages/orinoco/orinoco-conf_1.0.bb
+++ b/packages/orinoco/orinoco-conf_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "update-modules"
 PACKAGE_ARCH = "all"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "file://spectrum.conf \
            file://hermes.conf \
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 766aa5295e..4f8ca98e0b 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -1,7 +1,7 @@
 require orinoco-modules.inc
 
 RDEPENDS_orinoco-modules-cs += "orinoco-modules"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "\
            file://crosscompile.patch;patch=1 \
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 88bad7d6d5..746618f7df 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -3,7 +3,7 @@ require orinoco-modules.inc
 DEPENDS = "orinoco-conf spectrum-fw"
 RDEPENDS += "orinoco-conf"
 RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
            file://makefile_fix.patch;patch=1 \
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index 80da946714..da25d7b7e5 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -3,7 +3,7 @@ require orinoco-modules.inc
 DEPENDS = "orinoco-conf spectrum-fw"
 RDEPENDS += "orinoco-conf"
 RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI += "\
            file://makefile_fix.patch;patch=1 \
diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb
index e23694218e..6cbb7eb8f6 100644
--- a/packages/orinoco/orinoco-modules_cvs.bb
+++ b/packages/orinoco/orinoco-modules_cvs.bb
@@ -3,7 +3,7 @@ require orinoco-modules.inc
 DEPENDS = "orinoco-conf spectrum-fw"
 RDEPENDS += "orinoco-conf"
 RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw"
-FILE_PR = "r3"
+PR = "r3"
 
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"'
diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb
index d7b7945076..f2e11eea74 100644
--- a/packages/orinoco/spectrum-fw.bb
+++ b/packages/orinoco/spectrum-fw.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
 DEPENDS += " unzip-native "
 LICENSE = "unknown"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://get_symbol_fw \
            file://parse_symbol_fw"
diff --git a/packages/ortp/ortp_0.7.1.bb b/packages/ortp/ortp_0.7.1.bb
index 97cf1e8e3d..c05e9d51cb 100644
--- a/packages/ortp/ortp_0.7.1.bb
+++ b/packages/ortp/ortp_0.7.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An LGPL implementation of RTP - RFC3550"
 LICENSE = "LGPL"
 DEPENDS = "glibc "
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/otpcalc/otpcalc_0.97.bb b/packages/otpcalc/otpcalc_0.97.bb
index 4a7f42f6f2..baeddd91a9 100644
--- a/packages/otpcalc/otpcalc_0.97.bb
+++ b/packages/otpcalc/otpcalc_0.97.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "An OTP and S/Key calculator for X"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gtk+ openssl"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/otpCalc-${PV}"
 
diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb
index 57e041f84d..44a4789f98 100644
--- a/packages/otpkeygen/otpkeygen_1.3.0.bb
+++ b/packages/otpkeygen/otpkeygen_1.3.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html"
 AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>"
 LICENSE = "GPL"
 APPTYPE="binary"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz"
 
diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb
index 817d536c96..e419e2e234 100644
--- a/packages/p3scan/p3scan_2.9.05d.bb
+++ b/packages/p3scan/p3scan_2.9.05d.bb
@@ -6,7 +6,7 @@ SECTION = "network"
 LICENSE = "GPLv2"
 DEPENDS = "gmp bzip2 zlib clamav openssl"
 RDEPENDS_${PN} = "${PN}-templates-en"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \
            file://libtool-fix.patch;patch=1 \
diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb
index 4ac4a415da..8e2adff2cf 100644
--- a/packages/packagekit/packagekit_git.bb
+++ b/packages/packagekit/packagekit_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
 RDEPENDS_${PN} = "opkg"
 PV = "0.2.3+gitr${SRCREV}"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
            file://disable-docbook2man.patch;patch=1"
diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb
index 35ae0bacc0..c695f4799b 100644
--- a/packages/pam/libpam_0.79.bb
+++ b/packages/pam/libpam_0.79.bb
@@ -18,7 +18,7 @@ HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
diff --git a/packages/pam/libpam_1.0.2.bb b/packages/pam/libpam_1.0.2.bb
index e8bb888fc5..0b7eada2ab 100644
--- a/packages/pam/libpam_1.0.2.bb
+++ b/packages/pam/libpam_1.0.2.bb
@@ -12,7 +12,7 @@ LICENSE = "GPLv2"
 
 DEPENDS = "flex flex-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 62d692d686..fa91b2bd28 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-FILE_PR = "r2"
+PR = "r2"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index f37ccaf6d6..ae8f597bc1 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-FILE_PR = "r2"
+PR = "r2"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
diff --git a/packages/pango/pango_1.14.8.bb b/packages/pango/pango_1.14.8.bb
index f9cecf9025..aec8219efa 100644
--- a/packages/pango/pango_1.14.8.bb
+++ b/packages/pango/pango_1.14.8.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
diff --git a/packages/pango/pango_1.22.0.bb b/packages/pango/pango_1.22.0.bb
index 9d7b88c594..639e094cc0 100644
--- a/packages/pango/pango_1.22.0.bb
+++ b/packages/pango/pango_1.22.0.bb
@@ -1,4 +1,4 @@
 require pango.inc
-FILE_PR = "r2"
+PR = "r2"
 
 
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 785e64f614..477a6f27da 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -5,7 +5,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-FILE_PR = "r0"
+PR = "r0"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb
index 6014af7657..cb9b08f407 100644
--- a/packages/parted/parted_1.6.23.bb
+++ b/packages/parted/parted_1.6.23.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
 
diff --git a/packages/parted/parted_1.6.25.1.bb b/packages/parted/parted_1.6.25.1.bb
index 5af905ba36..8681055855 100644
--- a/packages/parted/parted_1.6.25.1.bb
+++ b/packages/parted/parted_1.6.25.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
 
diff --git a/packages/parted/parted_1.8.0.bb b/packages/parted/parted_1.8.0.bb
index 4a7469261b..bff27a62e8 100644
--- a/packages/parted/parted_1.8.0.bb
+++ b/packages/parted/parted_1.8.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
            file://memory_allocation.patch;patch=0"
diff --git a/packages/parted/parted_1.8.2.bb b/packages/parted/parted_1.8.2.bb
index b5a85b837a..1185014aa3 100644
--- a/packages/parted/parted_1.8.2.bb
+++ b/packages/parted/parted_1.8.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
            
diff --git a/packages/parted/parted_1.8.7.bb b/packages/parted/parted_1.8.7.bb
index 3bdffaf887..59e3aeaece 100644
--- a/packages/parted/parted_1.8.7.bb
+++ b/packages/parted/parted_1.8.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
            file://syscalls.h \
diff --git a/packages/patch/patch_2.5.9.bb b/packages/patch/patch_2.5.9.bb
index a51e64f8ce..ff485546fc 100644
--- a/packages/patch/patch_2.5.9.bb
+++ b/packages/patch/patch_2.5.9.bb
@@ -7,4 +7,4 @@ SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \
            file://unified-reject-files.diff;patch=1 \
            file://global-reject-file.diff;patch=1 "
 S = "${WORKDIR}/patch-2.5.4"
-FILE_PR = "r2"
\ No newline at end of file
+PR = "r2"
\ No newline at end of file
diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index 742bac9e23..c071d52404 100644
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
 SECTION = "base"
 PRIORITY = "optional"
 PACKAGES = ""
-FILE_PR = "r1"
+PR = "r1"
 
 inherit native
 
diff --git a/packages/pbltool/pbltool-native_0.2.bb b/packages/pbltool/pbltool-native_0.2.bb
index 1a29f9d2dd..7b2d80acf0 100644
--- a/packages/pbltool/pbltool-native_0.2.bb
+++ b/packages/pbltool/pbltool-native_0.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Loader tool for Amstrad Delta (E3)"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://the.earth.li/pub/e3/pbltool-${PV}.c"
 
diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb
index 6e8f464117..44a0bd1ff5 100644
--- a/packages/pciutils/pciutils_2.1.11.bb
+++ b/packages/pciutils/pciutils_2.1.11.bb
@@ -5,7 +5,7 @@ DESCRIPTION_pciutils-ids = 'The list of PCI IDs for pciutils'
 HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml"
 LICENSE = "GPLv2"
 
-FILE_PR ="r3"
+PR ="r3"
 
 PARALLEL_MAKE = ""
 FILES_pciutils-ids="${prefix}/share/pci.ids"
diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb
index c81d51e1e9..70a95ca11e 100644
--- a/packages/pciutils/pciutils_2.2.4.bb
+++ b/packages/pciutils/pciutils_2.2.4.bb
@@ -13,7 +13,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.b
 
 PARALLEL_MAKE = ""
 
-FILE_PR ="r3"
+PR ="r3"
 
 do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 15c83a531e..018f33550f 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 RDEPENDS = "hostap-conf orinoco-conf"
-FILE_PR = "r28"
+PR = "r28"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://busybox.patch;patch=1 \
diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb
index fe76e28d42..bcebb5f624 100644
--- a/packages/pcmciautils/pcmciautils_010.bb
+++ b/packages/pcmciautils/pcmciautils_010.bb
@@ -1,5 +1,5 @@
 require pcmciautils.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 CFLAGS =+ '-DPCMCIAUTILS_VERSION=010'
diff --git a/packages/pcmciautils/pcmciautils_013.bb b/packages/pcmciautils/pcmciautils_013.bb
index 38c9cd2318..72a78b0780 100644
--- a/packages/pcmciautils/pcmciautils_013.bb
+++ b/packages/pcmciautils/pcmciautils_013.bb
@@ -1,6 +1,6 @@
 require pcmciautils.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://makefile_fix.patch;patch=1 \
             file://version_workaround.patch;patch=1 \
diff --git a/packages/pcmciautils/pcmciautils_014.bb b/packages/pcmciautils/pcmciautils_014.bb
index 38c9cd2318..72a78b0780 100644
--- a/packages/pcmciautils/pcmciautils_014.bb
+++ b/packages/pcmciautils/pcmciautils_014.bb
@@ -1,6 +1,6 @@
 require pcmciautils.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://makefile_fix.patch;patch=1 \
             file://version_workaround.patch;patch=1 \
diff --git a/packages/pcmciautils/pcmciautils_015.bb b/packages/pcmciautils/pcmciautils_015.bb
index c188fae40f..44a3d59dc6 100644
--- a/packages/pcmciautils/pcmciautils_015.bb
+++ b/packages/pcmciautils/pcmciautils_015.bb
@@ -1,6 +1,6 @@
 require pcmciautils.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://makefile_fix.patch;patch=1 \
             file://version_workaround.patch;patch=1 \
diff --git a/packages/pcsc-lite/pcsc-lite_1.4.102.bb b/packages/pcsc-lite/pcsc-lite_1.4.102.bb
index 6d5bb44113..0455ae47a8 100644
--- a/packages/pcsc-lite/pcsc-lite_1.4.102.bb
+++ b/packages/pcsc-lite/pcsc-lite_1.4.102.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "PC/SC Lite smart card framework and applications"
 HOMEPAGE = "http://pcsclite.alioth.debian.org/"
 LICENSE = "BSD"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "hal"
 RDEPENDS_${PN} = "hal"
diff --git a/packages/perl/libalgorithm-diff-perl_1.1902.bb b/packages/perl/libalgorithm-diff-perl_1.1902.bb
index ace359412c..4adc4e81f0 100644
--- a/packages/perl/libalgorithm-diff-perl_1.1902.bb
+++ b/packages/perl/libalgorithm-diff-perl_1.1902.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars \
 	     perl-module-strict perl-module-vars"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-${PV}.tar.gz"
 
diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb
index 9361e7f334..f9485a7548 100644
--- a/packages/perl/libarchive-tar-perl_1.30.bb
+++ b/packages/perl/libarchive-tar-perl_1.30.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-${PV}.tar.gz"
 
diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb
index bc4cb4e19f..60908ad648 100644
--- a/packages/perl/libcache-cache-perl_1.05.bb
+++ b/packages/perl/libcache-cache-perl_1.05.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
 RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-${PV}.tar.gz"
 
diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb
index 55ce36ad57..81b00f544a 100644
--- a/packages/perl/libclass-container-perl_0.12.bb
+++ b/packages/perl/libclass-container-perl_0.12.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libparams-validate-perl-native"
 RDEPENDS = "libparams-validate-perl"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-${PV}.tar.gz"
 
diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb
index 1d40083b3f..6bb5c597ed 100644
--- a/packages/perl/libclass-data-inheritable-perl_0.06.bb
+++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-${PV}.tar.gz"
 
diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index 0f99f0d4c3..3326d961bf 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz"
 
diff --git a/packages/perl/libdata-optlist-perl_0.101.bb b/packages/perl/libdata-optlist-perl_0.101.bb
index 4da3c30e57..084a055329 100644
--- a/packages/perl/libdata-optlist-perl_0.101.bb
+++ b/packages/perl/libdata-optlist-perl_0.101.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 DEPENDS += "libsub-install-perl-native libparams-util-perl-native"
 RDEPENDS += "perl-module-list-util libparams-util-perl perl-module-strict \
              libsub-install-perl perl-module-warnings "
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-${PV}.tar.gz"
 
diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb
index a515242189..fd1b290364 100644
--- a/packages/perl/libdevel-stacktrace-perl_1.13.bb
+++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-${PV}.tar.gz"
 
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index bf18ff26e0..c6d629417f 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r13"
+PR = "r13"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz"
 
diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb
index 74f835dfec..9e5b2b4d71 100644
--- a/packages/perl/liberror-perl_0.17004.bb
+++ b/packages/perl/liberror-perl_0.17004.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Error - Error/exception handling in an OO-ish way"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-${PV}.tar.gz"
 
diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb
index 97f1decc2d..b26af13d84 100644
--- a/packages/perl/libexception-class-perl_1.23.bb
+++ b/packages/perl/libexception-class-perl_1.23.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native"
 RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-${PV}.tar.gz"
 
diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb
index 880aaf7310..aedb04f707 100644
--- a/packages/perl/libextutils-cbuilder-perl_0.18.bb
+++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-${PV}.tar.gz"
 
diff --git a/packages/perl/libextutils-depends-perl_0.205.bb b/packages/perl/libextutils-depends-perl_0.205.bb
index f213186f1a..af4f6ffd8f 100644
--- a/packages/perl/libextutils-depends-perl_0.205.bb
+++ b/packages/perl/libextutils-depends-perl_0.205.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ExtUtils::Depends - Easily build XS extensions that depend on XS extensions"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-${PV}.tar.gz"
 
diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb
index 0b70a529fb..431b04127b 100644
--- a/packages/perl/libextutils-parsexs-perl_2.16.bb
+++ b/packages/perl/libextutils-parsexs-perl_2.16.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-${PV}.tar.gz"
 
diff --git a/packages/perl/libextutils-pkgconfig-perl_1.07.bb b/packages/perl/libextutils-pkgconfig-perl_1.07.bb
index a391f57bd9..d023beac69 100644
--- a/packages/perl/libextutils-pkgconfig-perl_1.07.bb
+++ b/packages/perl/libextutils-pkgconfig-perl_1.07.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ExtUtils::PkgConfig - simplistic interface to pkg-config"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-${PV}.tar.gz"
 
diff --git a/packages/perl/libhtml-mason-perl_1.35.bb b/packages/perl/libhtml-mason-perl_1.35.bb
index c2cad9be27..71e96005e8 100644
--- a/packages/perl/libhtml-mason-perl_1.35.bb
+++ b/packages/perl/libhtml-mason-perl_1.35.bb
@@ -10,7 +10,7 @@ RDEPENDS_${PN} = "libexception-class-perl libparams-validate-perl \
         perl-module-exporter-heavy perl-module-cwd perl-module-scalar-util \
         perl-module-list-util perl-module-bytes perl-module-file-glob \
         perl-module-data-dumper"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-${PV}.tar.gz"
 
diff --git a/packages/perl/libintl-perl_1.16.bb b/packages/perl/libintl-perl_1.16.bb
index 5c9b348b9a..e7cebd7458 100644
--- a/packages/perl/libintl-perl_1.16.bb
+++ b/packages/perl/libintl-perl_1.16.bb
@@ -3,7 +3,7 @@ LICENSE = "Artistic|GPL"
 RDEPENDS = "perl-module-vars perl-module-locale perl-module-io-handle \
             perl-module-symbol perl-module-selectsaver perl-module-io \
             perl-module-integer perl-module-exporter-heavy"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz"
 
diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb
index 404af6fd2a..40292f1a95 100644
--- a/packages/perl/libio-zlib-perl_1.04.bb
+++ b/packages/perl/libio-zlib-perl_1.04.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "libcompress-zlib-perl-native"
 RDEPENDS += "libcompress-zlib-perl"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-${PV}.tar.gz"
 
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index 30dc670d3f..6cef180374 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r13"
+PR = "r13"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz"
 
diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb
index 366ff0cad1..763a5680cf 100644
--- a/packages/perl/liblocale-gettext-perl_1.05.bb
+++ b/packages/perl/liblocale-gettext-perl_1.05.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Locale::gettext - message handling functions"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/libintl"
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz"
 
diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb
index e6e1241c9d..ee4a2198c1 100644
--- a/packages/perl/liblog-dispatch-perl_2.13.bb
+++ b/packages/perl/liblog-dispatch-perl_2.13.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-${PV}.tar.gz"
 
diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb
index 9e7056d520..beecaad0fb 100644
--- a/packages/perl/liblog-log4perl-perl_1.06.bb
+++ b/packages/perl/liblog-log4perl-perl_1.06.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-${PV}.tar.gz"
 
diff --git a/packages/perl/libmail-sendmail-perl_0.79.bb b/packages/perl/libmail-sendmail-perl_0.79.bb
index a9c437b538..b333c8239b 100644
--- a/packages/perl/libmail-sendmail-perl_0.79.bb
+++ b/packages/perl/libmail-sendmail-perl_0.79.bb
@@ -1,6 +1,6 @@
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-${PV}.tar.gz"
 
diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
index c7d8d03a3c..6a0e91d00c 100644
--- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb
+++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS += "gmp-native"
 RDEPENDS += "gmp"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz"
 
diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb
index b7d56a8d8e..8a7ce9fa04 100644
--- a/packages/perl/libmodule-build-perl_0.2805.bb
+++ b/packages/perl/libmodule-build-perl_0.2805.bb
@@ -8,7 +8,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \
            libarchive-tar-perl-native"
 RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \
             libextutils-parsexs-perl libarchive-tar-perl"
-FILE_PR = "r5"
+PR = "r5"
 
 S = "${WORKDIR}/Module-Build-${PV}"
 
diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb
index 301ff606ab..351e96187e 100644
--- a/packages/perl/libnet-ip-perl_1.25.bb
+++ b/packages/perl/libnet-ip-perl_1.25.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libio-zlib-perl-native"
 RDEPENDS += "libio-zlib-perl perl-module-math-bigint"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-${PV}.tar.gz"
 
diff --git a/packages/perl/libnetserver-generic-perl_1.03.bb b/packages/perl/libnetserver-generic-perl_1.03.bb
index 59897b29a3..c4153b8c4c 100644
--- a/packages/perl/libnetserver-generic-perl_1.03.bb
+++ b/packages/perl/libnetserver-generic-perl_1.03.bb
@@ -1,6 +1,6 @@
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/NetServer/NetServer-Generic-${PV}.tar.gz"
 
diff --git a/packages/perl/libparams-util-perl_0.20.bb b/packages/perl/libparams-util-perl_0.20.bb
index 05070c957f..ef5b6e186a 100644
--- a/packages/perl/libparams-util-perl_0.20.bb
+++ b/packages/perl/libparams-util-perl_0.20.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-overload \
              perl-module-scalar-util perl-module-strict perl-module-vars"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${PV}.tar.gz"
 
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index 23a42bcdbf..52c23333e9 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r13"
+PR = "r13"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz"
 
diff --git a/packages/perl/libperl6-junction-perl_1.10.bb b/packages/perl/libperl6-junction-perl_1.10.bb
index 9854522af3..8cfef00670 100644
--- a/packages/perl/libperl6-junction-perl_1.10.bb
+++ b/packages/perl/libperl6-junction-perl_1.10.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Perl6::Junction - Perl6 style Junction operators in Perl5."
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-${PV}.tar.gz"
 
diff --git a/packages/perl/libsub-exporter-perl_0.970.bb b/packages/perl/libsub-exporter-perl_0.970.bb
index 728ef525e0..44756601a2 100644
--- a/packages/perl/libsub-exporter-perl_0.970.bb
+++ b/packages/perl/libsub-exporter-perl_0.970.bb
@@ -5,7 +5,7 @@ DEPENDS += "libdata-optlist-perl-native libsub-install-perl-native \
             libparams-util-perl-native"
 RDEPENDS += "perl-module-carp libdata-optlist-perl libparams-util-perl \
              perl-module-strict libsub-install-perl perl-module-warnings"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-${PV}.tar.gz"
 
diff --git a/packages/perl/libsub-install-perl_0.922.bb b/packages/perl/libsub-install-perl_0.922.bb
index 59adff7d5e..72bbfcc73b 100644
--- a/packages/perl/libsub-install-perl_0.922.bb
+++ b/packages/perl/libsub-install-perl_0.922.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \
              perl-module-warnings"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-${PV}.tar.gz"
 
diff --git a/packages/perl/libsub-uplevel-perl_0.13.bb b/packages/perl/libsub-uplevel-perl_0.13.bb
index 491b91052e..032d924856 100644
--- a/packages/perl/libsub-uplevel-perl_0.13.bb
+++ b/packages/perl/libsub-uplevel-perl_0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Sub::Uplevel - apparently run a function in a higher stack frame"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-${PV}.tar.gz"
 
diff --git a/packages/perl/libtest-builder-tester-perl_1.01.bb b/packages/perl/libtest-builder-tester-perl_1.01.bb
index 3a49b51841..0704506ac7 100644
--- a/packages/perl/libtest-builder-tester-perl_1.01.bb
+++ b/packages/perl/libtest-builder-tester-perl_1.01.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-strict perl-module-carp perl-module-exporter \
              perl-module-symbol perl-module-vars"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-${PV}.tar.gz"
 
diff --git a/packages/perl/libtest-differences-perl_0.47.bb b/packages/perl/libtest-differences-perl_0.47.bb
index 694eaf6fb7..e76f35ff0d 100644
--- a/packages/perl/libtest-differences-perl_0.47.bb
+++ b/packages/perl/libtest-differences-perl_0.47.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 DEPENDS += "libtext-diff-perl-native"
 RDEPENDS += "perl-module-carp perl-module-constant perl-module-exporter \
              perl-module-strict libtext-diff-perl"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Test-Differences-${PV}.tar.gz"
 
diff --git a/packages/perl/libtest-exception-perl_0.22.bb b/packages/perl/libtest-exception-perl_0.22.bb
index 8272e2f946..021770b01a 100644
--- a/packages/perl/libtest-exception-perl_0.22.bb
+++ b/packages/perl/libtest-exception-perl_0.22.bb
@@ -5,7 +5,7 @@ DEPENDS += "libsub-uplevel-perl-native"
 RDEPENDS += "perl-module-base perl-module-carp perl-module-strict \
              libsub-uplevel-perl perl-module-test-builder \
              perl-module-warnings"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-${PV}.tar.gz"
 
diff --git a/packages/perl/libtest-mockmodule-perl_0.05.bb b/packages/perl/libtest-mockmodule-perl_0.05.bb
index 1d23b04210..422bd41ed0 100644
--- a/packages/perl/libtest-mockmodule-perl_0.05.bb
+++ b/packages/perl/libtest-mockmodule-perl_0.05.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \
              perl-module-vars "
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-${PV}.tar.gz"
 
diff --git a/packages/perl/libtest-output-perl_0.10.bb b/packages/perl/libtest-output-perl_0.10.bb
index 429fdf1c4d..3a2452ecfd 100644
--- a/packages/perl/libtest-output-perl_0.10.bb
+++ b/packages/perl/libtest-output-perl_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS += "libsub-exporter-perl-native"
 RDEPENDS += "libsub-exporter-perl"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SS/SSORICHE/Test-Output-${PV}.tar.gz"
 
diff --git a/packages/perl/libtext-diff-perl_0.35.bb b/packages/perl/libtext-diff-perl_0.35.bb
index 998aa63b2c..07dde46945 100644
--- a/packages/perl/libtext-diff-perl_0.35.bb
+++ b/packages/perl/libtext-diff-perl_0.35.bb
@@ -5,7 +5,7 @@ DEPENDS += "libalgorithm-diff-perl-native"
 RDEPENDS += "libalgorithm-diff-perl perl-module-carp perl-module-constant \
              perl-module-exporter perl-module-strict perl-module-carp \
              perl-module-strict "
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Text-Diff-${PV}.tar.gz"
 
diff --git a/packages/perl/liburi-perl_1.35.bb b/packages/perl/liburi-perl_1.35.bb
index 1110c42307..5c1c427c24 100644
--- a/packages/perl/liburi-perl_1.35.bb
+++ b/packages/perl/liburi-perl_1.35.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Manipulates and accesses URI strings"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 #RDEPENDS += " libmime-base64-perl libnet-perl"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz"
 
diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb
index 8fe6f96296..817824edec 100644
--- a/packages/perl/libversion-perl_0.6701.bb
+++ b/packages/perl/libversion-perl_0.6701.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "version - Perl extension for Version Objects"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz"
 
diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb
index 7493831334..2bc9b76f9b 100644
--- a/packages/perl/libwww-perl_5.808.bb
+++ b/packages/perl/libwww-perl_5.808.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic"
 DEPENDS = "liburi-perl-native"
 RDEPENDS = "liburi-perl"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
 
diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb
index e6b8104bdc..dd502a8f63 100644
--- a/packages/perl/libxml-parser-perl_2.34.bb
+++ b/packages/perl/libxml-parser-perl_2.34.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 LICENSE = "Artistic"
 DEPENDS += "expat expat-native"
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 
diff --git a/packages/perl/libxml-simple-perl_2.18.bb b/packages/perl/libxml-simple-perl_2.18.bb
index 0ae9bfe77f..6cab76bf1e 100644
--- a/packages/perl/libxml-simple-perl_2.18.bb
+++ b/packages/perl/libxml-simple-perl_2.18.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 LICENSE = "Artistic"
 DEPENDS += "libxml-parser-perl"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Simple-${PV}.tar.gz"
 
diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb
index 8da805c023..f6398097b8 100644
--- a/packages/perl/libyaml-perl_0.62.bb
+++ b/packages/perl/libyaml-perl_0.62.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
            libipc-sharelite-perl-native"
 RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-${PV}.tar.gz"
 
diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb
index 68e290e03c..69555e0fac 100644
--- a/packages/perl/perl-native_5.8.4.bb
+++ b/packages/perl/perl-native_5.8.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SECTION = "libs"
 inherit native
diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb
index 63d5cd1ae3..ebb10e5580 100644
--- a/packages/perl/perl-native_5.8.7.bb
+++ b/packages/perl/perl-native_5.8.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 LICENSE = "Artistic|GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SECTION = "libs"
 inherit native
diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb
index 3e215c56cf..c58f82822c 100644
--- a/packages/perl/perl-native_5.8.8.bb
+++ b/packages/perl/perl-native_5.8.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-FILE_PR = "r13"
+PR = "r13"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb
index bbc9428063..10a871c8dd 100644
--- a/packages/perl/perl_5.8.4.bb
+++ b/packages/perl/perl_5.8.4.bb
@@ -1,6 +1,6 @@
 require perl.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://uclibc.patch;patch=1 \
             file://config.sh-mipsel-linux \
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 96ca94675f..6589180ff2 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -26,7 +26,7 @@ SRC_URI_append_powerpc += " ${GCCLINK_SRC}"
 
 PARALLEL_MAKE = ""
 
-FILE_PR = "r22"
+PR = "r22"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index e9873e7b13..8c00a61536 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-FILE_PR = "r26"
+PR = "r26"
 
 # Major part of version
 PVM = "5.8"
diff --git a/packages/phalanx/phalanx_22.bb b/packages/phalanx/phalanx_22.bb
index cf240f573a..a59a696809 100644
--- a/packages/phalanx/phalanx_22.bb
+++ b/packages/phalanx/phalanx_22.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Phalanx is a chess playing engine."
 SECTION = "opie/libs"
 PRIORITY = "optional"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "GPL"
 SRC_URI = "http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz \
            file://gcc3.patch;patch=1 \
diff --git a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
index 2436eaf923..7348e87ca3 100644
--- a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
+++ b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 require phoneme-advanced.inc
 
diff --git a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
index 92ea53d79f..675d7b7b9a 100644
--- a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
+++ b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 require phoneme-advanced.inc
 
diff --git a/packages/php/php-native_5.2.6.bb b/packages/php/php-native_5.2.6.bb
index f13bd5cb4e..97064a6510 100644
--- a/packages/php/php-native_5.2.6.bb
+++ b/packages/php/php-native_5.2.6.bb
@@ -1,3 +1,3 @@
 require php-native.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/php/php_5.2.6.bb b/packages/php/php_5.2.6.bb
index 1bf732aa8a..17073e1eaf 100644
--- a/packages/php/php_5.2.6.bb
+++ b/packages/php/php_5.2.6.bb
@@ -2,7 +2,7 @@ require php.inc
 
 DEPENDS = "zlib libxml2 virtual/libiconv php-native"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://pear-makefile.patch;patch=1 "
 
diff --git a/packages/picocom/picocom_1.4.bb b/packages/picocom/picocom_1.4.bb
index 73cc454969..c13bdabcc3 100644
--- a/packages/picocom/picocom_1.4.bb
+++ b/packages/picocom/picocom_1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Lightweight and minimal (~20K) dumb-terminal emulation program."
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://efault.net/npat/hacks/picocom/dist/picocom-${PV}.tar.gz \
            file://nolock.patch;patch=1 \
diff --git a/packages/pimlico/contacts_0.8.bb b/packages/pimlico/contacts_0.8.bb
index 0eae83182d..d596d45659 100644
--- a/packages/pimlico/contacts_0.8.bb
+++ b/packages/pimlico/contacts_0.8.bb
@@ -1,6 +1,6 @@
 require contacts.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
 	   file://stock_contact.png \
diff --git a/packages/pimlico/dates_0.4.5.bb b/packages/pimlico/dates_0.4.5.bb
index f3d19b358d..185a53ac6e 100644
--- a/packages/pimlico/dates_0.4.5.bb
+++ b/packages/pimlico/dates_0.4.5.bb
@@ -1,6 +1,6 @@
 require dates.inc
 
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \
 	   file://dates-owl-window-menu.patch;patch=1 \
diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb
index a0e7e72f30..91d53b9524 100644
--- a/packages/pipepanic/pipepanic_0.1.1.bb
+++ b/packages/pipepanic/pipepanic_0.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Pipepanic is a pipe connecting game using libSDL. \
 Connect as many different shaped pipes together as possible within the time given."
 HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz \
            file://fix-datadir.patch;patch=1"
diff --git a/packages/pivotinit/pivotinit_1.0.0.bb b/packages/pivotinit/pivotinit_1.0.0.bb
index 301b136001..912cfeb5b9 100644
--- a/packages/pivotinit/pivotinit_1.0.0.bb
+++ b/packages/pivotinit/pivotinit_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Dedicated /sbin/init for pivot root images"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "file://init"
 
diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc
index fdb377ee7b..939199bc37 100644
--- a/packages/pkgconfig/pkgconfig.inc
+++ b/packages/pkgconfig/pkgconfig.inc
@@ -5,7 +5,7 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb
index b84fd7406a..31fc7820fe 100644
--- a/packages/pkgconfig/pkgconfig_0.15.0.bb
+++ b/packages/pkgconfig/pkgconfig_0.15.0.bb
@@ -5,7 +5,7 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://www.freedesktop.org/software/pkgconfig/"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/pmacct/pmacct_0.7.9.bb b/packages/pmacct/pmacct_0.7.9.bb
index 25a12a2299..06cbd9296a 100644
--- a/packages/pmacct/pmacct_0.7.9.bb
+++ b/packages/pmacct/pmacct_0.7.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Promiscuous mode IP Accounting package"
 HOMEPAGE = "http://www.ba.cnr.it/~paolo/pmacct/"
 LICENSE = "GPLv2"
 DEPENDS = "libpcap"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.ba.cnr.it/~paolo/pmacct/pmacct-${PV}.tar.gz \
 	file://pmacct.init \
diff --git a/packages/pme/pme_1.0.3.bb b/packages/pme/pme_1.0.3.bb
index a9adcbf513..75269c3432 100644
--- a/packages/pme/pme_1.0.3.bb
+++ b/packages/pme/pme_1.0.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "libpcre"
 LICENSE = "BSD"
 DESCRIPTION = "PME is a C++ wrapper around the PCRE library."
 SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/pmount/pmount_0.9.17.bb b/packages/pmount/pmount_0.9.17.bb
index 0d76aa8c67..f72534b468 100644
--- a/packages/pmount/pmount_0.9.17.bb
+++ b/packages/pmount/pmount_0.9.17.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user"
 HOMEPAGE = "http://pmount.alioth.debian.org/"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "hal e2fsprogs-libs sysfsutils"
 RDEPENDS_${PN}-hal = "${PN}"
diff --git a/packages/pmount/pmount_0.9.4.bb b/packages/pmount/pmount_0.9.4.bb
index 0cffd24230..1dcb8733c4 100644
--- a/packages/pmount/pmount_0.9.4.bb
+++ b/packages/pmount/pmount_0.9.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION="mount removable devices as normal user"
 DEPENDS="sysfsutils"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI="http://www.piware.de/projects/pmount-0.9.4.tar.gz \
 	 file://mmc-fix.patch;patch=1 \
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index 9829b9877e..49730374e7 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Opera
 SECTION = "inputmethods"
 LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
diff --git a/packages/poboxserver/qpobox_0.5.4.bb b/packages/poboxserver/qpobox_0.5.4.bb
index 2ff427e53c..9bb8c34523 100644
--- a/packages/poboxserver/qpobox_0.5.4.bb
+++ b/packages/poboxserver/qpobox_0.5.4.bb
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
 RDEPENDS = "poboxserver virtual/japanese-font"
 LICENSE = "GPL"
 HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOBox"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \
            file://qpobox-0.5.4-opie.patch;patch=1 \
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index c443034036..84fc53fa87 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -4,7 +4,7 @@ suitable for your meal, and indicate those in your cellar that match."
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.gz \
            file://winedb.patch;patch=1 \
diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index 06a718b6ac..945e6270a4 100644
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
diff --git a/packages/poppler/poppler-data_0.1.bb b/packages/poppler/poppler-data_0.1.bb
index e58688694a..e145cb07ee 100644
--- a/packages/poppler/poppler-data_0.1.bb
+++ b/packages/poppler/poppler-data_0.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 LICENSE = "Adobe"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb
index b21b83fc23..2fc2200afc 100644
--- a/packages/poppler/poppler_0.5.9.bb
+++ b/packages/poppler/poppler_0.5.9.bb
@@ -1,6 +1,6 @@
 require poppler.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://fix-splash.patch;patch=1"
 EXTRA_OECONF_append = " --disable-abiword-output "
diff --git a/packages/poppler/poppler_0.6.4.bb b/packages/poppler/poppler_0.6.4.bb
index 05f36929d0..3c1ec00183 100644
--- a/packages/poppler/poppler_0.6.4.bb
+++ b/packages/poppler/poppler_0.6.4.bb
@@ -1,6 +1,6 @@
 require poppler.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 EXTRA_OECONF_append = " --disable-abiword-output "
 
diff --git a/packages/poppler/poppler_0.8.4.bb b/packages/poppler/poppler_0.8.4.bb
index 05f36929d0..3c1ec00183 100644
--- a/packages/poppler/poppler_0.8.4.bb
+++ b/packages/poppler/poppler_0.8.4.bb
@@ -1,6 +1,6 @@
 require poppler.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 EXTRA_OECONF_append = " --disable-abiword-output "
 
diff --git a/packages/popt/popt-native_1.14.bb b/packages/popt/popt-native_1.14.bb
index 123b35e346..54712ab812 100644
--- a/packages/popt/popt-native_1.14.bb
+++ b/packages/popt/popt-native_1.14.bb
@@ -2,7 +2,7 @@ require popt.inc
 
 DEPENDS = "gettext-native"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit native autotools
 
diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb
index d54e134cd3..a83d384eee 100644
--- a/packages/popt/popt-native_1.7.bb
+++ b/packages/popt/popt-native_1.7.bb
@@ -2,7 +2,7 @@ require popt.inc
 
 DEPENDS = "gettext-native"
 
-FILE_PR = "r5"
+PR = "r5"
 
 inherit native autotools
 
diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb
index a1675263ae..240ac52275 100644
--- a/packages/popt/popt_1.14.bb
+++ b/packages/popt/popt_1.14.bb
@@ -2,7 +2,7 @@ require popt.inc
 
 DEPENDS = "gettext-native virtual/libintl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb
index 007791d245..7992db56e7 100644
--- a/packages/popt/popt_1.7.bb
+++ b/packages/popt/popt_1.7.bb
@@ -2,7 +2,7 @@ require popt.inc
 
 DEPENDS = "gettext virtual/libintl"
 
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools
 
diff --git a/packages/poptop/poptop_1.3.0.bb b/packages/poptop/poptop_1.3.0.bb
index 0ac2dd5b57..da7ebe6a24 100644
--- a/packages/poptop/poptop_1.3.0.bb
+++ b/packages/poptop/poptop_1.3.0.bb
@@ -11,7 +11,7 @@ PRIORITY    = "optional"
 DEPENDS     = "ppp"
 RDEPENDS    = "ppp"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/poptop/poptop_1.3.4.bb b/packages/poptop/poptop_1.3.4.bb
index 618129d0ad..5c6a71bb2e 100644
--- a/packages/poptop/poptop_1.3.4.bb
+++ b/packages/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
            file://fix-plugins-install.patch;patch=1 \
diff --git a/packages/poqetpresenter/poqetpresenter_0.0.6.bb b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
index 02c87b2d95..e513e9721e 100644
--- a/packages/poqetpresenter/poqetpresenter_0.0.6.bb
+++ b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://poqetp.sourceforge.net/"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poqetp/poqetp_${PV}_src.tar.gz"
 S = "${WORKDIR}/poqetp"
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index 6bd2546ec2..404dfcfe1e 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.equi4.com/metakit.html"
 
 SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
 	   file://metakit-2.4.9.3.patch;patch=1"
-FILE_PR = "r3"
+PR = "r3"
 
 FILES_${PN} += " ${libdir}/*.so"
 
diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb
index c5d17eecad..e6eb9716ff 100644
--- a/packages/portabase/portabase_1.9.bb
+++ b/packages/portabase/portabase_1.9.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://portabase.sourceforge.net/"
 DEPENDS = "metakit beecrypt"
 APPNAME = "portabase"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/portabase/portabase_${PV}.tar.gz \
 	   file://qtopia.patch;patch=1 		\
diff --git a/packages/portaudio/portaudio-v19_svn.bb b/packages/portaudio/portaudio-v19_svn.bb
index 7c503bcad5..2dbef45d2d 100644
--- a/packages/portaudio/portaudio-v19_svn.bb
+++ b/packages/portaudio/portaudio-v19_svn.bb
@@ -3,7 +3,7 @@ SECTION = "libs/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PV = "v19+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index db36035266..c86ae1e892 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb
index 20134b5804..348a3060e4 100644
--- a/packages/portmap/portmap_5-9.bb
+++ b/packages/portmap/portmap_5-9.bb
@@ -1,3 +1,3 @@
 require portmap.inc
 
-FILE_PR = "r5"
+PR = "r5"
diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb
index 2acf2d6f05..cb94a48fb7 100644
--- a/packages/portmap/portmap_6.0.bb
+++ b/packages/portmap/portmap_6.0.bb
@@ -1,6 +1,6 @@
 require portmap.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
            file://destdir-no-strip.patch;patch=1 \
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 2a37029e42..8cafc344f2 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,3 +1,3 @@
 require postfix.inc
 
-FILE_PR = "r13"
+PR = "r13"
diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb
index 6af059b324..cfb0162bb4 100644
--- a/packages/postgresql/postgresql_8.1.4.bb
+++ b/packages/postgresql/postgresql_8.1.4.bb
@@ -1,3 +1,3 @@
 require postgresql.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/postgresql/postgresql_8.1.8.bb b/packages/postgresql/postgresql_8.1.8.bb
index 6af059b324..cfb0162bb4 100644
--- a/packages/postgresql/postgresql_8.1.8.bb
+++ b/packages/postgresql/postgresql_8.1.8.bb
@@ -1,3 +1,3 @@
 require postgresql.inc
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/postgresql/postgresql_8.2.4.bb b/packages/postgresql/postgresql_8.2.4.bb
index 9702ecf5f0..9b60b2b6a7 100644
--- a/packages/postgresql/postgresql_8.2.4.bb
+++ b/packages/postgresql/postgresql_8.2.4.bb
@@ -1,6 +1,6 @@
 require postgresql.inc
 
-FILE_PR = "r3"
+PR = "r3"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
diff --git a/packages/povray/povray_3.6.1+3.7.0-beta25b.bb b/packages/povray/povray_3.6.1+3.7.0-beta25b.bb
index a74f39defe..eee01e13ed 100644
--- a/packages/povray/povray_3.6.1+3.7.0-beta25b.bb
+++ b/packages/povray/povray_3.6.1+3.7.0-beta25b.bb
@@ -4,7 +4,7 @@ SECTION = "console/graphics"
 LICENSE = "povray"
 DEPENDS = "virtual/libx11 boost zlib jpeg libpng tiff"
 
-FILE_PR = "r1"
+PR = "r1"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index 61a3f6c1ee..107c86cfb8 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -6,7 +6,7 @@ LICENSE = "povray"
 DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
 RDEPENDS = ""
 
-FILE_PR = "r2"
+PR = "r2"
 
 #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
 SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \
diff --git a/packages/powermanga/powermanga_0.79.bb b/packages/powermanga/powermanga_0.79.bb
index acb41ba047..875690b06b 100644
--- a/packages/powermanga/powermanga_0.79.bb
+++ b/packages/powermanga/powermanga_0.79.bb
@@ -3,7 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-mixer"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz \
 	   file://linuxroutines.cpp \
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 80a3d22784..6861d8ad44 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
 DEPENDS = "ppp"
 RDEPENDS = "ppp"
-FILE_PR = "r5"
+PR = "r5"
 LICENSE = "MIT"
 
 SRC_URI = "file://host-peer \
diff --git a/packages/ppp-dsl/ppp-dsl_0.1.bb b/packages/ppp-dsl/ppp-dsl_0.1.bb
index 26b4878cdb..8d63e8fc47 100644
--- a/packages/ppp-dsl/ppp-dsl_0.1.bb
+++ b/packages/ppp-dsl/ppp-dsl_0.1.bb
@@ -4,7 +4,7 @@ LICENSE = "PD"
 DEPENDS = "ppp rp-pppoe"
 RDEPENDS = "ppp rp-pppoe"
 RRECOMMENDS = "kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "file://dsl-provider \
 	file://ppp_on_boot.dsl"
diff --git a/packages/ppp/ppp-gprs_1.0.bb b/packages/ppp/ppp-gprs_1.0.bb
index 4e663a5d4e..2db6e808f4 100644
--- a/packages/ppp/ppp-gprs_1.0.bb
+++ b/packages/ppp/ppp-gprs_1.0.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "PPP scripts for easy GPRS connection"
 LICENSE = "GPL"
 RDEPENDS = "ppp"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://peers/* file://chats/*"
 
diff --git a/packages/ppp/ppp_2.4.1.bb b/packages/ppp/ppp_2.4.1.bb
index 7d392dafb8..77cce50117 100644
--- a/packages/ppp/ppp_2.4.1.bb
+++ b/packages/ppp/ppp_2.4.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 LICENSE = "BSD GPLv2"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://pppd.patch;patch=1 \
diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb
index c96b9b5539..f09dcaca21 100644
--- a/packages/ppp/ppp_2.4.3.bb
+++ b/packages/ppp/ppp_2.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
         file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \
diff --git a/packages/pptp-linux/pptp-linux_1.7.1.bb b/packages/pptp-linux/pptp-linux_1.7.1.bb
index 529fcd1e75..b233cef723 100644
--- a/packages/pptp-linux/pptp-linux_1.7.1.bb
+++ b/packages/pptp-linux/pptp-linux_1.7.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://pptpclient.sourceforge.net"
 SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS = "ppp"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
            file://options.pptp"
diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb
index 0cfe67d55c..063742ce97 100644
--- a/packages/prboom/prboom-devconfig.bb
+++ b/packages/prboom/prboom-devconfig.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Device specific configuration for prboom"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://prboom.cfg"
 
diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index c4f17d3bff..8a7804b554 100644
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 require prboom_${PV}.bb
 
-FILE_PR = "r6"
+PR = "r6"
 
 S = "${WORKDIR}/prboom-${PV}"
 
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
index 683cd59e72..7bcfa90ae1 100644
--- a/packages/prboom/prboom_2.2.6.bb
+++ b/packages/prboom/prboom_2.2.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz"
 
diff --git a/packages/prboom/prboom_2.4.7.bb b/packages/prboom/prboom_2.4.7.bb
index f132d1a06f..f775855d93 100644
--- a/packages/prboom/prboom_2.4.7.bb
+++ b/packages/prboom/prboom_2.4.7.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 RRECOMMENDS = "freedoom"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
diff --git a/packages/prelink/prelink_20061027.bb b/packages/prelink/prelink_20061027.bb
index 609dec264f..e93f1f2515 100644
--- a/packages/prelink/prelink_20061027.bb
+++ b/packages/prelink/prelink_20061027.bb
@@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared
 and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
            file://prelink.conf \
diff --git a/packages/prelink/prelink_20071009.bb b/packages/prelink/prelink_20071009.bb
index 609dec264f..e93f1f2515 100644
--- a/packages/prelink/prelink_20071009.bb
+++ b/packages/prelink/prelink_20071009.bb
@@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared
 and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
            file://prelink.conf \
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index ee38d82091..41285fb412 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION}) prism54-firmware (1.0.3.0) hotplug"
 RRECOMMENDS = "kernel-module-firmware-class"
 DEPENDS = "virtual/kernel prism54-firmware"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"
 
diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb
index ce611ed889..cda97bc832 100644
--- a/packages/prismstumbler/prismstumbler_0.7.2.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.2.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/network"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index 2296e4e023..b7c71002af 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/network"
-FILE_PR = "r3"
+PR = "r3"
 
 PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 0034c9cc55..5bddcf31b6 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/network"
-FILE_PR = "r5"
+PR = "r5"
 
 PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
diff --git a/packages/privoxy/privoxy_3.0.3.bb b/packages/privoxy/privoxy_3.0.3.bb
index 4ede62dbd9..55580b1aa5 100644
--- a/packages/privoxy/privoxy_3.0.3.bb
+++ b/packages/privoxy/privoxy_3.0.3.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "pcre"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ijbswa/privoxy-${PV}-stable-src.tar.gz \
           file://privoxy.conf \
diff --git a/packages/procps/procps_3.2.1.bb b/packages/procps/procps_3.2.1.bb
index 8ef180a3e1..33df399c5f 100644
--- a/packages/procps/procps_3.2.1.bb
+++ b/packages/procps/procps_3.2.1.bb
@@ -1,6 +1,6 @@
 require procps.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://pagesz-not-constant.patch;patch=1"
 
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index aaf1c88d7f..de7524b2cb 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -1,6 +1,6 @@
 require procps.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://procmodule.patch;patch=1 \
             file://psmodule.patch;patch=1"
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index bbcc211aff..e6a6573635 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -1,6 +1,6 @@
 require procps.inc
 
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI += "file://procmodule.patch;patch=1 \
             file://psmodule.patch;patch=1 \
diff --git a/packages/proj4/proj-4.inc b/packages/proj4/proj-4.inc
index 3299f3185f..da78a384bd 100644
--- a/packages/proj4/proj-4.inc
+++ b/packages/proj4/proj-4.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
 HOMEPAGE = "http://www.remotesensing.org/proj/"
 LICENSE = "MIT"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/proxy-libintl/proxy-libintl_20080418.bb b/packages/proxy-libintl/proxy-libintl_20080418.bb
index 63d20f9dbd..dbe7b92c7e 100644
--- a/packages/proxy-libintl/proxy-libintl_20080418.bb
+++ b/packages/proxy-libintl/proxy-libintl_20080418.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/"
 SECTION = "libs"
 LICENSE = "LGPL"
 
-FILE_PR = "r1"
+PR = "r1"
 PROVIDES = "virtual/libintl"
 
 
diff --git a/packages/psmisc/psmisc_20.2.bb b/packages/psmisc/psmisc_20.2.bb
index 159d635b59..68f11dce13 100644
--- a/packages/psmisc/psmisc_20.2.bb
+++ b/packages/psmisc/psmisc_20.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "ncurses"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
 	   file://gettext.patch;patch=1"
diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb
index 063ea394b6..b1e1ae2fad 100644
--- a/packages/psmisc/psmisc_21.8.bb
+++ b/packages/psmisc/psmisc_21.8.bb
@@ -1,3 +1,3 @@
 require psmisc.inc
-FILE_PR = "r2"
+PR = "r2"
 SRC_URI += "file://signames-header-fix.patch;patch=1"
diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb
index f9db6b8b52..62327fa4d6 100644
--- a/packages/psmisc/psmisc_22.2.bb
+++ b/packages/psmisc/psmisc_22.2.bb
@@ -1,2 +1,2 @@
 require psmisc.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 6144e91c0d..7e19ce3cbb 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/psplash"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r13"
+PR = "r13"
 RDEPENDS = "initscripts"
 
 # You can create your own pslash-hand-img.h by doing
diff --git a/packages/pth/pth_2.0.0.bb b/packages/pth/pth_2.0.0.bb
index ad56045118..8c7f5772a4 100644
--- a/packages/pth/pth_2.0.0.bb
+++ b/packages/pth/pth_2.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Portable Threads"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.ossp.org/pkg/lib/pth/pth-${PV}.tar.gz"
 
diff --git a/packages/pth/pth_2.0.2.bb b/packages/pth/pth_2.0.2.bb
index 2dcd7f4a42..81b8a71b63 100644
--- a/packages/pth/pth_2.0.2.bb
+++ b/packages/pth/pth_2.0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Portable Threads"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \
 	   file://m4-warning.patch;patch=1 \
diff --git a/packages/pulseaudio/libatomics-ops_1.2.bb b/packages/pulseaudio/libatomics-ops_1.2.bb
index e00c728bfc..0563eb6382 100644
--- a/packages/pulseaudio/libatomics-ops_1.2.bb
+++ b/packages/pulseaudio/libatomics-ops_1.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A library for atomic integer operations"
 LICENSE = "MIT"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \
            file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1"
diff --git a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
index da49dbc97c..e555d50075 100644
--- a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
+++ b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
 LICENSE = "GPLv2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://asound.conf.pulseaudio"
 
diff --git a/packages/pulseaudio/pulseaudio-esd-wrapper.bb b/packages/pulseaudio/pulseaudio-esd-wrapper.bb
index 711adacd15..d1ae362c14 100644
--- a/packages/pulseaudio/pulseaudio-esd-wrapper.bb
+++ b/packages/pulseaudio/pulseaudio-esd-wrapper.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Drop-in Esound replacement"
 LICENSE = "GPLv2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 RCONFLICTS = "esd"
 RREPLACES = "esd"
diff --git a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
index df6be4091d..1c53ee0b91 100644
--- a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
@@ -18,7 +18,7 @@ RDEPENDS = "\
   libasound-module-ctl-pulse \
   libasound-module-pcm-pulse \
 "
-FILE_PR = "r3"
+PR = "r3"
 
 inherit update-rc.d
 
diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb
index 1540a7e014..8da4a1c7da 100644
--- a/packages/pulseaudio/pulseaudio_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.10.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI += "\
   file://disable-using-glibc-tls.patch;patch=1 \
diff --git a/packages/pulseaudio/pulseaudio_0.9.11.bb b/packages/pulseaudio/pulseaudio_0.9.11.bb
index dcc285553b..930b991751 100644
--- a/packages/pulseaudio/pulseaudio_0.9.11.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.11.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus gdbm speex"
-FILE_PR = "r0"
+PR = "r0"
 
 # work in progress
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index 083d27772f..8944b664c0 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
 require pulseaudio.inc
 
-FILE_PR = "r8"
+PR = "r8"
 
diff --git a/packages/pulseaudio/pulseaudio_0.9.9.bb b/packages/pulseaudio/pulseaudio_0.9.9.bb
index 82aa1136b2..764f891654 100644
--- a/packages/pulseaudio/pulseaudio_0.9.9.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.9.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus"
-FILE_PR = "r5"
+PR = "r5"
 
 # this is not correct (see below)
 SRC_URI += "\
diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb
index 9f8d3c1cb3..ee9254bd01 100644
--- a/packages/puppy/puppy_1.11.bb
+++ b/packages/puppy/puppy_1.11.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11 \
 	   file://usb-header.patch;patch=1"
diff --git a/packages/puppy/puppy_1.8.bb b/packages/puppy/puppy_1.8.bb
index ef1e9dc836..7696333ca9 100644
--- a/packages/puppy/puppy_1.8.bb
+++ b/packages/puppy/puppy_1.8.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_8"
 S = "${WORKDIR}/puppy"
diff --git a/packages/puppy/puppy_1.9.bb b/packages/puppy/puppy_1.9.bb
index 69e59be9e4..6387ee07c7 100644
--- a/packages/puppy/puppy_1.9.bb
+++ b/packages/puppy/puppy_1.9.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_9"
 S = "${WORKDIR}/puppy"
diff --git a/packages/puzzles/oh-puzzles_svn.bb b/packages/puzzles/oh-puzzles_svn.bb
index 0a01263903..f0e0eade69 100644
--- a/packages/puzzles/oh-puzzles_svn.bb
+++ b/packages/puzzles/oh-puzzles_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 SECTION = "x11"
 DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit autotools pkgconfig
 
diff --git a/packages/puzzles/puzzles_r7436.bb b/packages/puzzles/puzzles_r7436.bb
index 18bdd215cd..fc2997fcf8 100644
--- a/packages/puzzles/puzzles_r7436.bb
+++ b/packages/puzzles/puzzles_r7436.bb
@@ -1,7 +1,7 @@
 
 DEPENDS = "gtk+ libxt"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SVN_REV = "${@bb.data.getVar('PV',d,1).replace('r', '')}"
 
diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb
index 18001b6def..af1d5f53ab 100644
--- a/packages/pwc/pwc_10.0.12-rc1.bb
+++ b/packages/pwc/pwc_10.0.12-rc1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.saillard.org/linux/pwc"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
            file://Makefile.patch;patch=1"
diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb
index c3f58ff9aa..26213ee84a 100644
--- a/packages/pwc/pwc_10.0.6a.bb
+++ b/packages/pwc/pwc_10.0.6a.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
 	   file://endian-fix.patch;patch=1 \
diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb
index ae3c57c806..b3adc80ee5 100644
--- a/packages/pwc/pwc_10.0.7a.bb
+++ b/packages/pwc/pwc_10.0.7a.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
 	   file://Makefile"
diff --git a/packages/pwc/pwc_10.0.9-rc1.bb b/packages/pwc/pwc_10.0.9-rc1.bb
index 98d8eb6978..6067c0b1aa 100644
--- a/packages/pwc/pwc_10.0.9-rc1.bb
+++ b/packages/pwc/pwc_10.0.9-rc1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
 	   file://Makefile"
diff --git a/packages/python/python-cheetah_1.0.bb b/packages/python/python-cheetah_1.0.bb
index 24fd4a53a2..20fe083d81 100644
--- a/packages/python/python-cheetah_1.0.bb
+++ b/packages/python/python-cheetah_1.0.bb
@@ -8,7 +8,7 @@ SRCNAME = "Cheetah"
 SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit distutils
 
diff --git a/packages/python/python-connexion_svn.bb b/packages/python/python-connexion_svn.bb
index 10a82ee92d..ae546f5256 100644
--- a/packages/python/python-connexion_svn.bb
+++ b/packages/python/python-connexion_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "GPL"
 BV = "0.4.6"
 PV = "${BV}+svnr${SRCREV}"
-FILE_PR = "ml1"
+PR = "ml1"
 
 inherit distutils
 
diff --git a/packages/python/python-constraint_1.1.bb b/packages/python/python-constraint_1.1.bb
index 0e7fc468d2..5218b368ac 100644
--- a/packages/python/python-constraint_1.1.bb
+++ b/packages/python/python-constraint_1.1.bb
@@ -5,7 +5,7 @@ provided to work with finite domains only."
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://labix.org/download/python-constraint/python-constraint-${PV}.tar.bz2"
 
diff --git a/packages/python/python-cython_0.9.8.bb b/packages/python/python-cython_0.9.8.bb
index fb5a3de125..69d73fe969 100644
--- a/packages/python/python-cython_0.9.8.bb
+++ b/packages/python/python-cython_0.9.8.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Cython"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-dbus_0.83.0.bb b/packages/python/python-dbus_0.83.0.bb
index 328d3296e1..4ccecc0aa1 100644
--- a/packages/python/python-dbus_0.83.0.bb
+++ b/packages/python/python-dbus_0.83.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
diff --git a/packages/python/python-dialog_2.7.bb b/packages/python/python-dialog_2.7.bb
index b666230157..fa54a5a7f3 100644
--- a/packages/python/python-dialog_2.7.bb
+++ b/packages/python/python-dialog_2.7.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "pythondialog"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb
index 11aca1bd4d..1b02bf77df 100644
--- a/packages/python/python-ecore_svn.bb
+++ b/packages/python/python-ecore_svn.bb
@@ -2,7 +2,7 @@ require python-efl.inc
 DEPENDS += "python-evas ecore"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 do_stage() {
     distutils_stage_all
diff --git a/packages/python/python-edbus_svn.bb b/packages/python/python-edbus_svn.bb
index d317133de0..3299cfee88 100644
--- a/packages/python/python-edbus_svn.bb
+++ b/packages/python/python-edbus_svn.bb
@@ -2,7 +2,7 @@ require python-efl.inc
 DEPENDS += "edbus python-dbus"
 RDEPENDS += "python-dbus"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb
index 4f4fce46ed..4e33847dae 100644
--- a/packages/python/python-edje_svn.bb
+++ b/packages/python/python-edje_svn.bb
@@ -2,6 +2,6 @@ require python-efl.inc
 DEPENDS += "edje python-evas"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1"
diff --git a/packages/python/python-egenix-mx-base_3.0.0.bb b/packages/python/python-egenix-mx-base_3.0.0.bb
index cec7d9133d..8452ca6e7f 100644
--- a/packages/python/python-egenix-mx-base_3.0.0.bb
+++ b/packages/python/python-egenix-mx-base_3.0.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "EGENIX"
 SRCNAME = "egenix-mx-base"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-emotion_svn.bb b/packages/python/python-emotion_svn.bb
index df726531d7..ceb60870eb 100644
--- a/packages/python/python-emotion_svn.bb
+++ b/packages/python/python-emotion_svn.bb
@@ -2,4 +2,4 @@ require python-efl.inc
 DEPENDS += "emotion python-evas"
 RDEPENDS += "python-ecore"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/python/python-epsilon_svn.bb b/packages/python/python-epsilon_svn.bb
index 700ba1b14a..00fbcf5ce6 100644
--- a/packages/python/python-epsilon_svn.bb
+++ b/packages/python/python-epsilon_svn.bb
@@ -2,4 +2,4 @@ require python-efl.inc
 DEPENDS += "epsilon python-ecore"
 RDEPENDS += "python-ecore"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/python/python-etk_svn.bb b/packages/python/python-etk_svn.bb
index ebfe8e2e62..14d530911f 100644
--- a/packages/python/python-etk_svn.bb
+++ b/packages/python/python-etk_svn.bb
@@ -2,7 +2,7 @@ require python-efl.inc
 DEPENDS += "etk"
 RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk-themes" 
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 do_stage() {         
 	distutils_stage_all 
diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb
index 3b561b03e3..6f53bf7e8d 100644
--- a/packages/python/python-evas_svn.bb
+++ b/packages/python/python-evas_svn.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 DEPENDS += "evas"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 do_stage() {
 	distutils_stage_all
diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb
index 6f5bd72722..97dd5be64b 100644
--- a/packages/python/python-formencode_svn.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
 PV = "0.4+svnr${SRCREV}"
-FILE_PR = "ml1"
+PR = "ml1"
 
 inherit setuptools
 
diff --git a/packages/python/python-fuse_cvs.bb b/packages/python/python-fuse_cvs.bb
index 332238e62e..d017e28536 100644
--- a/packages/python/python-fuse_cvs.bb
+++ b/packages/python/python-fuse_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "fuse"
 
 PV = "0.0+cvs${SRCDATE}"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@fuse.cvs.sourceforge.net/cvsroot/fuse;module=python"
 
diff --git a/packages/python/python-gammu_0.26.bb b/packages/python/python-gammu_0.26.bb
index ea48c6ea3e..f8989d9181 100644
--- a/packages/python/python-gammu_0.26.bb
+++ b/packages/python/python-gammu_0.26.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://cihar.com/gammu/python"
 SECTION = "devel/python"
 DEPENDS = "gammu"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2"
 
diff --git a/packages/python/python-gnosis_1.2.2.bb b/packages/python/python-gnosis_1.2.2.bb
index 04deb880a4..e5a4f0056f 100644
--- a/packages/python/python-gnosis_1.2.2.bb
+++ b/packages/python/python-gnosis_1.2.2.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 SRCNAME = "Gnosis_Utils"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://gnosis.cx/download/Gnosis_Utils.More/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-gsmd_svn.bb b/packages/python/python-gsmd_svn.bb
index 939f650e0b..927dff01d4 100644
--- a/packages/python/python-gsmd_svn.bb
+++ b/packages/python/python-gsmd_svn.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "libgsmd"
 PV = "0.02+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko/trunk;module=python-gsmd;proto=http"
 S = "${WORKDIR}/python-gsmd"
diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb
index c2a17ad40f..ea2b10095a 100644
--- a/packages/python/python-gst_0.10.10.bb
+++ b/packages/python/python-gst_0.10.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python Gstreamer bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-FILE_PR = "ml2"
+PR = "ml2"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
diff --git a/packages/python/python-imaging_1.1.6.bb b/packages/python/python-imaging_1.1.6.bb
index acea292bd5..9f3b6323dd 100644
--- a/packages/python/python-imaging_1.1.6.bb
+++ b/packages/python/python-imaging_1.1.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "freetype jpeg tiff"
 RDEPENDS = "python-lang python-stringold"
 SRCNAME = "Imaging"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
            file://path.patch;patch=1"
diff --git a/packages/python/python-imdbpy_3.1.bb b/packages/python/python-imdbpy_3.1.bb
index 48fe2f4c3c..72d30fb89b 100644
--- a/packages/python/python-imdbpy_3.1.bb
+++ b/packages/python/python-imdbpy_3.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://imdbpy.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "IMDbPY"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/imdbpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-inotify_0.1.0.bb b/packages/python/python-inotify_0.1.0.bb
index f127a30bb1..941194abd6 100644
--- a/packages/python/python-inotify_0.1.0.bb
+++ b/packages/python/python-inotify_0.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python Linux Inotify Wrapper"
 SECTION = "devel/python"
 HOMEPAGE = "http://rudd-o.com/projects/python-inotify/"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://rudd-o.com/wp-content/uploads/projects/files/python-inotify/python-inotify-${PV}.tar.gz"
 
diff --git a/packages/python/python-irclib_0.4.6.bb b/packages/python/python-irclib_0.4.6.bb
index 51beac5dc7..5e274c2c1e 100644
--- a/packages/python/python-irclib_0.4.6.bb
+++ b/packages/python/python-irclib_0.4.6.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://python-irclib.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/python-irclib/python-irclib-${PV}.tar.gz"
 
diff --git a/packages/python/python-itools_0.16.5.bb b/packages/python/python-itools_0.16.5.bb
index 542dbe3846..7879c6415e 100644
--- a/packages/python/python-itools_0.16.5.bb
+++ b/packages/python/python-itools_0.16.5.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.ikaaro.org/itools"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "itools"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://download.ikaaro.org/itools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-libgmail_0.1.6.bb b/packages/python/python-libgmail_0.1.6.bb
index eaf9259466..aeb08113ea 100644
--- a/packages/python/python-libgmail_0.1.6.bb
+++ b/packages/python/python-libgmail_0.1.6.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-netclient python-email python-mime python-pprint python-re python-pickle"
 SRCNAME = "libgmail"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-logilab-common_0.9.3.bb b/packages/python/python-logilab-common_0.9.3.bb
index dad59fb655..87c9a25f53 100644
--- a/packages/python/python-logilab-common_0.9.3.bb
+++ b/packages/python/python-logilab-common_0.9.3.bb
@@ -7,7 +7,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "common"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz \
            file://fix-future-in-setup.patch;patch=1"
diff --git a/packages/python/python-lxml_1.3.3.bb b/packages/python/python-lxml_1.3.3.bb
index 16e5893f70..7ead15b2a0 100644
--- a/packages/python/python-lxml_1.3.3.bb
+++ b/packages/python/python-lxml_1.3.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://codespeak.net/lxml/"
 AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev"
 LICENSE = "BSD"
 DEPENDS = "libxml2 libxslt"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz \
            file://use-pkgconfig-to-detect.patch;patch=1"
diff --git a/packages/python/python-m2crypto_0.18.2.bb b/packages/python/python-m2crypto_0.18.2.bb
index 07f7644808..c83a2ec076 100644
--- a/packages/python/python-m2crypto_0.18.2.bb
+++ b/packages/python/python-m2crypto_0.18.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "openssl swig-native"
 LICENSE = "BSD"
 SRCNAME = "M2Crypto"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://chandlerproject.org/pub/Projects/MeTooCrypto/m2crypto-${PV}.tar.gz \
            file://install.patch;patch=1"
diff --git a/packages/python/python-mad_0.6.bb b/packages/python/python-mad_0.6.bb
index 18d3c05a76..e62b8c88d6 100644
--- a/packages/python/python-mad_0.6.bb
+++ b/packages/python/python-mad_0.6.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libmad"
 SRCNAME = "pymad"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://spacepants.org/src/pymad/download/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-mako_0.2.2.bb b/packages/python/python-mako_0.2.2.bb
index 3923c154fc..718e58a09b 100644
--- a/packages/python/python-mako_0.2.2.bb
+++ b/packages/python/python-mako_0.2.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.makotemplates.org/"
 SRCNAME = "Mako"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz" 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index 59df065324..be8fc35a5a 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 DEPENDS = "openssl-native bzip2-full-native"
 SECTION = "devel/python"
 PRIORITY = "optional"
-FILE_PR = "ml5"
+PR = "ml5"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/packages/python/python-numarray_1.1.1.bb b/packages/python/python-numarray_1.1.1.bb
index 80b9df9ee8..e4ff40849f 100644
--- a/packages/python/python-numarray_1.1.1.bb
+++ b/packages/python/python-numarray_1.1.1.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PYRAF"
 SRCNAME = "numarray"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb
index b5f7f1fddd..bd6934d711 100644
--- a/packages/python/python-numeric_23.7.bb
+++ b/packages/python/python-numeric_23.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \
            file://no-lapack.patch;patch=1"
diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb
index 63d36e9de8..157dadadaf 100644
--- a/packages/python/python-numpy_1.1.1.bb
+++ b/packages/python/python-numpy_1.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
            file://unbreak-assumptions.diff;patch=1 \
diff --git a/packages/python/python-opendir_1.0.bb b/packages/python/python-opendir_1.0.bb
index 36811be2be..88f22a1d9a 100644
--- a/packages/python/python-opendir_1.0.bb
+++ b/packages/python/python-opendir_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "PD"
 HOMEPAGE = "http://rabenfrost.net/mokopedia/opendir/"
 DEPENDS = "python-pyrex-native python-cython-native"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "\
   file://opendir.pyx \
diff --git a/packages/python/python-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb
index f2c21975eb..b55794598a 100644
--- a/packages/python/python-openmoko_0.1.bb
+++ b/packages/python/python-openmoko_0.1.bb
@@ -3,7 +3,7 @@ AUTHOR = "Holger 'Zecke' Freyther"
 LICENSE = "LGPL"
 DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2"
 SECTION = "devel/python"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http \
 	   file://python-path.patch;patch=1;maxdate=20070829"
diff --git a/packages/python/python-ptrace_0.3.2.bb b/packages/python/python-ptrace_0.3.2.bb
index 039ff0fa95..a039476c39 100644
--- a/packages/python/python-ptrace_0.3.2.bb
+++ b/packages/python/python-ptrace_0.3.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "python-ptrace is a debugger using ptrace."
 HOMEPAGE = "http://fusil.hachoir.org/trac/wiki/python-ptrace"
 SECTION = "devel/python"
 LICENSE = "GPLv2"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://pypi.python.org/packages/source/p/ptrace/ptrace-${PV}.tar.gz"
 S = "${WORKDIR}/ptrace-${PV}"
diff --git a/packages/python/python-pyalsa_1.0.16.bb b/packages/python/python-pyalsa_1.0.16.bb
index a7f6681045..f98e144c75 100644
--- a/packages/python/python-pyalsa_1.0.16.bb
+++ b/packages/python/python-pyalsa_1.0.16.bb
@@ -4,7 +4,7 @@ DEPENDS = "alsa-lib"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "pyalsa"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pyalsaaudio_0.3.bb b/packages/python/python-pyalsaaudio_0.3.bb
index 92657cd773..42b15ce5be 100644
--- a/packages/python/python-pyalsaaudio_0.3.bb
+++ b/packages/python/python-pyalsaaudio_0.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "alsa-lib"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "pyalsaaudio"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyalsaaudio/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pybluez_0.10.bb b/packages/python/python-pybluez_0.10.bb
index 764e76228e..2e7e282ddc 100644
--- a/packages/python/python-pybluez_0.10.bb
+++ b/packages/python/python-pybluez_0.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python bindings for the Linux Bluetooth stack"
 SECTION = "devel/python"
 DEPENDS = "bluez-libs"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://org.csail.mit.edu/pybluez/release/pybluez-src-${PV}.tar.gz"
 S = "${WORKDIR}/pybluez-${PV}"
diff --git a/packages/python/python-pybluez_0.13.bb b/packages/python/python-pybluez_0.13.bb
index 764e76228e..2e7e282ddc 100644
--- a/packages/python/python-pybluez_0.13.bb
+++ b/packages/python/python-pybluez_0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python bindings for the Linux Bluetooth stack"
 SECTION = "devel/python"
 DEPENDS = "bluez-libs"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://org.csail.mit.edu/pybluez/release/pybluez-src-${PV}.tar.gz"
 S = "${WORKDIR}/pybluez-${PV}"
diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb
index a37dce5a01..bd3c1a7aa0 100644
--- a/packages/python/python-pycairo_1.4.0.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -3,7 +3,7 @@ SECTION = "python-devel"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-FILE_PR = "ml2"
+PR = "ml2"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
            file://fix-setup-py.patch;patch=1"
diff --git a/packages/python/python-pychecker_0.8.17.bb b/packages/python/python-pychecker_0.8.17.bb
index 65c12dff28..1b39b588ce 100644
--- a/packages/python/python-pychecker_0.8.17.bb
+++ b/packages/python/python-pychecker_0.8.17.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://pychecker.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "pychecker"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pycodes_1.2.bb b/packages/python/python-pycodes_1.2.bb
index 400ce32620..6cf94a6902 100644
--- a/packages/python/python-pycodes_1.2.bb
+++ b/packages/python/python-pycodes_1.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://web.mit.edu/~emin/www/source_code/pycodes/index.html"
 PRIORITY = "optional"
 LICENSE = "PYCODES"
 SRCNAME = "pycodes"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz \
            file://no-docs.patch;patch=1"
diff --git a/packages/python/python-pycrypto_2.0.1.bb b/packages/python/python-pycrypto_2.0.1.bb
index c991961b30..4a58b6930e 100644
--- a/packages/python/python-pycrypto_2.0.1.bb
+++ b/packages/python/python-pycrypto_2.0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "gmp"
 SRCNAME = "pycrypto"
 LICENSE = "pycrypto"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pycurl_7.18.2.bb b/packages/python/python-pycurl_7.18.2.bb
index f2bbe9b9e5..406add10c8 100644
--- a/packages/python/python-pycurl_7.18.2.bb
+++ b/packages/python/python-pycurl_7.18.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "curl-${PV}"
 SRCNAME = "pycurl"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
index fc761792a5..e730f0f8ba 100644
--- a/packages/python/python-pydirectfb_cvs.bb
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "directfb"
 SRCNAME = "pydirectfb"
 PV = "0.0.0+cvs${SRCDATE}"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \
            file://fix-directfb-detection.patch;patch=1"
diff --git a/packages/python/python-pyephem_3.7.2a.bb b/packages/python/python-pyephem_3.7.2a.bb
index c528f517d9..c5d3e111a8 100644
--- a/packages/python/python-pyephem_3.7.2a.bb
+++ b/packages/python/python-pyephem_3.7.2a.bb
@@ -3,7 +3,7 @@ for the Python programming language."
 HOMEPAGE = "http://www.rhodesmill.org/brandon/projects/pyephem.html"
 LICENSE = "PSF"
 AUTHOR = "Brandon Craig Rhodes"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://www.rhodesmill.org/brandon/projects/pyephem-${PV}.tar.gz"
 S = "${WORKDIR}/pyephem-${PV}"
diff --git a/packages/python/python-pyfits_1.1.bb b/packages/python/python-pyfits_1.1.bb
index a528d928da..9eb3d63969 100644
--- a/packages/python/python-pyfits_1.1.bb
+++ b/packages/python/python-pyfits_1.1.bb
@@ -5,7 +5,7 @@ AUTHOR = "Space Telescope Science Institute"
 RDEPENDS = "python-numarray"
 SECTION = "devel/python"
 LICENSE = "AURA"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-${PV}.tar.gz"
 S = "${WORKDIR}/pyfits"
diff --git a/packages/python/python-pyflakes_0.2.1.bb b/packages/python/python-pyflakes_0.2.1.bb
index 9139d96feb..306c6d64e9 100644
--- a/packages/python/python-pyflakes_0.2.1.bb
+++ b/packages/python/python-pyflakes_0.2.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://divmod.org/projects/pyflakes"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "pyflakes"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb
index 6c8d89eda3..71eff50dfb 100644
--- a/packages/python/python-pygame_1.8.1.bb
+++ b/packages/python/python-pygame_1.8.1.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
 SRCNAME = "pygame"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "\
   ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
diff --git a/packages/python/python-pygobject-native_2.14.2.bb b/packages/python/python-pygobject-native_2.14.2.bb
index 3429d0829d..70af95259c 100644
--- a/packages/python/python-pygobject-native_2.14.2.bb
+++ b/packages/python/python-pygobject-native_2.14.2.bb
@@ -1,7 +1,7 @@
 require python-pygobject_${PV}.bb
 
 DEPENDS = "python-native glib-2.0-native"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit native
 
diff --git a/packages/python/python-pygobject_2.14.2.bb b/packages/python/python-pygobject_2.14.2.bb
index 75af5f4b60..87623c39c0 100644
--- a/packages/python/python-pygobject_2.14.2.bb
+++ b/packages/python/python-pygobject_2.14.2.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "python-pygobject-native"
 PE = "1"
-FILE_PR = "r2"
+PR = "r2"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
diff --git a/packages/python/python-pygobject_2.15.4.bb b/packages/python/python-pygobject_2.15.4.bb
index 36366b29cb..95b226a4d7 100644
--- a/packages/python/python-pygobject_2.15.4.bb
+++ b/packages/python/python-pygobject_2.15.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "python-pygobject-native"
-FILE_PR = "ml0"
+PR = "ml0"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
diff --git a/packages/python/python-pygoogle_0.6.bb b/packages/python/python-pygoogle_0.6.bb
index de46298414..2682d4ffd8 100644
--- a/packages/python/python-pygoogle_0.6.bb
+++ b/packages/python/python-pygoogle_0.6.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 LICENSE = "PSF"
 RDEPENDS = "python-soappy"
 SRCNAME = "pygoogle"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
index 5e4d659e5a..a974a2471d 100644
--- a/packages/python/python-pygtk-1.2_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+-1.2"
 RDEPENDS = "python-shell python-re"
 SRCNAME = "pygtk"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
            file://remove-imlib-et-al.patch;patch=1 \
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index a152a2a7ba..dcc32894b1 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-FILE_PR = "ml8"
+PR = "ml8"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
diff --git a/packages/python/python-pygtk_2.6.3.bb b/packages/python/python-pygtk_2.6.3.bb
index 5b5d7506d0..7856e196e2 100644
--- a/packages/python/python-pygtk_2.6.3.bb
+++ b/packages/python/python-pygtk_2.6.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+-2.6.10 libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
diff --git a/packages/python/python-pygtk_2.8.6.bb b/packages/python/python-pygtk_2.8.6.bb
index 57f912f2f8..9f602e7200 100644
--- a/packages/python/python-pygtk_2.8.6.bb
+++ b/packages/python/python-pygtk_2.8.6.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+-2.8.16 libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
diff --git a/packages/python/python-pyiw_0.3.3.bb b/packages/python/python-pyiw_0.3.3.bb
index 46e620093d..aaa18c7ee9 100644
--- a/packages/python/python-pyiw_0.3.3.bb
+++ b/packages/python/python-pyiw_0.3.3.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "wireless-tools"
 RDEPENDS = "python-core"
-FILE_PR = "ml0"
+PR = "ml0"
 
 inherit autotools pkgconfig distutils-base
 
diff --git a/packages/python/python-pylint_0.13.2.bb b/packages/python/python-pylint_0.13.2.bb
index 5703efa317..d0640607f0 100644
--- a/packages/python/python-pylint_0.13.2.bb
+++ b/packages/python/python-pylint_0.13.2.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python-logilab-common"
 SRCNAME = "pylint"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pylirc_0.0.5.bb b/packages/python/python-pylirc_0.0.5.bb
index a3ffe3bc14..fc5e8af430 100644
--- a/packages/python/python-pylirc_0.0.5.bb
+++ b/packages/python/python-pylirc_0.0.5.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "lirc"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pylirc/pylirc-${PV}.tar.gz"
 S = "${WORKDIR}/pylirc-${PV}"
diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb
index b89b04db20..a6d205dd5d 100644
--- a/packages/python/python-pymp3_0.3.4.bb
+++ b/packages/python/python-pymp3_0.3.4.bb
@@ -3,7 +3,7 @@ SECTION = "console/multimedia"
 PRIORITY = "optional"
 RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz"
 S = "${WORKDIR}/PyMP3-0.3.4"
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 36fb6485a1..9dd2040a5b 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "sip-native python-sip"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "\
   http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
diff --git a/packages/python/python-pyraf_1.4.bb b/packages/python/python-pyraf_1.4.bb
index d368314fb6..af267cfa9e 100644
--- a/packages/python/python-pyraf_1.4.bb
+++ b/packages/python/python-pyraf_1.4.bb
@@ -4,7 +4,7 @@ AUTHOR = "Space Telescope Science Institute"
 RDEPENDS = "python-numarray"
 SECTION = "devel/python"
 LICENSE = "AURA"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/v2.5/pyraf-${PV}.tar.gz"
 S = "${WORKDIR}/pyraf"
diff --git a/packages/python/python-pyreverse_0.5.2.bb b/packages/python/python-pyreverse_0.5.2.bb
index 50c6b700a0..9194df5a4a 100644
--- a/packages/python/python-pyreverse_0.5.2.bb
+++ b/packages/python/python-pyreverse_0.5.2.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-logilab-common python-pyxml"
 SRCNAME = "pyreverse"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
            file://fix-future.patch;patch=1"
diff --git a/packages/python/python-pyrex_0.9.8.4.bb b/packages/python/python-pyrex_0.9.8.4.bb
index 076d68c68e..80371c396a 100644
--- a/packages/python/python-pyrex_0.9.8.4.bb
+++ b/packages/python/python-pyrex_0.9.8.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Pyrex"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
diff --git a/packages/python/python-pyro_3.7.bb b/packages/python/python-pyro_3.7.bb
index b4d137a320..80875af5c5 100644
--- a/packages/python/python-pyro_3.7.bb
+++ b/packages/python/python-pyro_3.7.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 RDEPENDS = "python-crypt python-io python-lang python-math python-netserver python-pickle \
 python-re python-shell python-stringold python-threading"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "cvs://anonymous:@pyro.cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_7 \
            file://pyro-unattended-install.patch;patch=1;pnum=0"
diff --git a/packages/python/python-pyrtc_git.bb b/packages/python/python-pyrtc_git.bb
index e39408decd..e8532711af 100644
--- a/packages/python/python-pyrtc_git.bb
+++ b/packages/python/python-pyrtc_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 SRCNAME = "pyrtc"
 DEPENDS = "python-cython-native"
 PV = "1.0.0+gitr${SRCREV}"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/${SRCNAME}"
diff --git a/packages/python/python-pyserial_2.2.bb b/packages/python/python-pyserial_2.2.bb
index 5fc8044338..57d184fcc3 100644
--- a/packages/python/python-pyserial_2.2.bb
+++ b/packages/python/python-pyserial_2.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
 RDEPENDS = "python-fcntl python-io python-stringold"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.zip"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pysqlite2_2.4.0.bb b/packages/python/python-pysqlite2_2.4.0.bb
index 3beea9e93f..50adcba006 100644
--- a/packages/python/python-pysqlite2_2.4.0.bb
+++ b/packages/python/python-pysqlite2_2.4.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 DEPENDS = "sqlite3"
 SRCNAME = "pysqlite"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
            file://fix-setup.patch;patch=1"
diff --git a/packages/python/python-pytester_0.6.0.bb b/packages/python/python-pytester_0.6.0.bb
index cb81490be8..bc7953b73e 100644
--- a/packages/python/python-pytester_0.6.0.bb
+++ b/packages/python/python-pytester_0.6.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://oss.wxnet.org/pytester/index.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "pytester"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pyvisa_1.1.bb b/packages/python/python-pyvisa_1.1.bb
index 74e1920a82..1bb185829e 100644
--- a/packages/python/python-pyvisa_1.1.bb
+++ b/packages/python/python-pyvisa_1.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://pyvisa.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "PyVISA"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyvisa/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pyweather_0.7.0.bb b/packages/python/python-pyweather_0.7.0.bb
index 572bd16cf7..5c643fa5c0 100644
--- a/packages/python/python-pyweather_0.7.0.bb
+++ b/packages/python/python-pyweather_0.7.0.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "weather"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pywpa_0.3.4.bb b/packages/python/python-pywpa_0.3.4.bb
index 9ba4158916..e8886625b6 100644
--- a/packages/python/python-pywpa_0.3.4.bb
+++ b/packages/python/python-pywpa_0.3.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "python-core"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://downloads.emperorlinux.com/contrib/pywpa/pywpa-${PV}.tbz2 \
            file://Makefile \
diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb
index c539ac4746..34b5cbfd0c 100644
--- a/packages/python/python-pyxml_0.8.4.bb
+++ b/packages/python/python-pyxml_0.8.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "PSF"
 RDEPENDS = "python-xml python-netclient"
 SRCNAME = "pyxml"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz"
 S = "${WORKDIR}/PyXML-${PV}"
diff --git a/packages/python/python-pyyaml_svn.bb b/packages/python/python-pyyaml_svn.bb
index f11d440275..3f316cff82 100644
--- a/packages/python/python-pyyaml_svn.bb
+++ b/packages/python/python-pyyaml_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 DEPENDS = "libyaml python-cython-native"
 PV = "3.05+svnr${SRCREV}"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "\
   svn://svn.pyyaml.org/pyyaml;module=trunk;proto=http \
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 05e749a004..5409c8a7bc 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-FILE_PR = "ml2"
+PR = "ml2"
 
 SRC_URI = "\
   http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_1.7.1.bb
index a7d1138fc0..67270f2df1 100644
--- a/packages/python/python-simplejson_1.7.1.bb
+++ b/packages/python/python-simplejson_1.7.1.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 # python-zlib is needed to unpack egg created by setuptools
 RDEPENDS = "python-core python-re python-io python-netserver python-zlib"
 SRCNAME = "simplejson"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb
index 5cc58c0b39..fc87b01e53 100644
--- a/packages/python/python-sip_4.7.3.bb
+++ b/packages/python/python-sip_4.7.3.bb
@@ -5,7 +5,7 @@ AUTHOR = "Phil Thompson"
 LICENSE = "GPL"
 DEPENDS = "python"
 RDEPENDS = "python-core"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
diff --git a/packages/python/python-sphinxsearch_0.1.bb b/packages/python/python-sphinxsearch_0.1.bb
index bfe940b2e9..6c1afdcbe6 100644
--- a/packages/python/python-sphinxsearch_0.1.bb
+++ b/packages/python/python-sphinxsearch_0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.sphinxsearch.com/"
 SRCNAME = "sphinxsearch"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://pypi.python.org/packages/source/s/sphinxsearch/${SRCNAME}-${PV}.tar.gz" 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-spydi_0.9.7.bb b/packages/python/python-spydi_0.9.7.bb
index 35b89bb01a..17283a981e 100644
--- a/packages/python/python-spydi_0.9.7.bb
+++ b/packages/python/python-spydi_0.9.7.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.spyron.org/spydi.html"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-${PV}.tar.gz"
 S = "${WORKDIR}/SPyDI-${PV}"
diff --git a/packages/python/python-spyro_0.9.22.bb b/packages/python/python-spyro_0.9.22.bb
index 8eef86ff58..9d5a583147 100644
--- a/packages/python/python-spyro_0.9.22.bb
+++ b/packages/python/python-spyro_0.9.22.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.spyron.org/"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyRO-${PV}.tar.gz"
 S="${WORKDIR}/SPyRO-${PV}"
diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.4.2p3.bb
index dce1037433..2a797eb439 100644
--- a/packages/python/python-sqlalchemy_0.4.2p3.bb
+++ b/packages/python/python-sqlalchemy_0.4.2p3.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"          
 SRCNAME = "SQLAlchemy"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-sqlobject_0.9.1.bb b/packages/python/python-sqlobject_0.9.1.bb
index c4763d296d..90c88a4650 100644
--- a/packages/python/python-sqlobject_0.9.1.bb
+++ b/packages/python/python-sqlobject_0.9.1.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-formencode"
 SRCNAME = "SQLObject"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-sword_1.5.10.bb b/packages/python/python-sword_1.5.10.bb
index ea474bccfe..4769a8814f 100644
--- a/packages/python/python-sword_1.5.10.bb
+++ b/packages/python/python-sword_1.5.10.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 RDEPENDS = "python-core sword"
 DEPENDS = "sword-${PV} swig-native"
 SRCNAME = "sword"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
 
diff --git a/packages/python/python-tlslite_0.3.8.bb b/packages/python/python-tlslite_0.3.8.bb
index d8bcccbdb9..d21d5cda38 100644
--- a/packages/python/python-tlslite_0.3.8.bb
+++ b/packages/python/python-tlslite_0.3.8.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://trevp.net/tlslite/"
 PRIORITY = "optional"
 LICENSE = "PD"
 SRCNAME = "tlslite"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb
index 458e6b063b..e085e81eb6 100644
--- a/packages/python/python-twisted_2.5.0.bb
+++ b/packages/python/python-twisted_2.5.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
            file://remove-zope-check.patch;patch=1"
diff --git a/packages/python/python-urwid_0.9.8.1.bb b/packages/python/python-urwid_0.9.8.1.bb
index d285cb484d..75c3c84701 100644
--- a/packages/python/python-urwid_0.9.8.1.bb
+++ b/packages/python/python-urwid_0.9.8.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-curses"
 SRCNAME = "urwid"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://excess.org/urwid/urwid-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-webpy_0.21.bb b/packages/python/python-webpy_0.21.bb
index 765e88f681..f6bb1812d0 100644
--- a/packages/python/python-webpy_0.21.bb
+++ b/packages/python/python-webpy_0.21.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 RDEPENDS = "python-netserver python-netclient python-pprint"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://webpy.org/static/web.py-${PV}.tar.gz"
 S = "${WORKDIR}/webpy"
diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb
index 01e0a02999..15b2b4c0fe 100644
--- a/packages/python/python24-native_2.4.0.bb
+++ b/packages/python/python24-native_2.4.0.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = ""
-FILE_PR = "r2"
+PR = "r2"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb
index 736dd6579c..dc93d28a09 100644
--- a/packages/python/python24-pyqt2_3.13.bb
+++ b/packages/python/python24-pyqt2_3.13.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 virtual/libqpe1"
 RDEPENDS = "python-core python24-sip"
 SRCNAME = "pyqt"
-FILE_PR = "ml5"
+PR = "ml5"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
            file://qt2-fix.patch;patch=1 \
diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb
index 55b98b2eb0..4f1f9bc0c9 100644
--- a/packages/python/python24-pyqwt2_3.10.bb
+++ b/packages/python/python24-pyqwt2_3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
-FILE_PR = "ml4"
+PR = "ml4"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://qt2.x-compat.patch;patch=1 \
diff --git a/packages/python/python24-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb
index 7e981caf05..718b019af9 100644
--- a/packages/python/python24-sip_4.1.1.bb
+++ b/packages/python/python24-sip_4.1.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 python24"
 RDEPENDS = "python-core"
-FILE_PR = "ml4"
+PR = "ml4"
 
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
diff --git a/packages/python/python24_2.4.4.bb b/packages/python/python24_2.4.4.bb
index 5d44b57021..313075094e 100644
--- a/packages/python/python24_2.4.4.bb
+++ b/packages/python/python24_2.4.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-FILE_PR = "ml2"
+PR = "ml2"
 
 PYTHON_MAJMIN = "2.4"
 
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index d6e8bb3ab0..35bcf858e6 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-FILE_PR = "ml13"
+PR = "ml13"
 
 PYTHON_MAJMIN = "2.5"
 
diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb
index 96dd91fec4..18c3e64d73 100644
--- a/packages/qc-usb/qc-usb-messenger_0.8.bb
+++ b/packages/qc-usb/qc-usb-messenger_0.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \
 	   file://qc-messenger-0.8-fix;patch=1"
diff --git a/packages/qc-usb/qc-usb-messenger_1.1.bb b/packages/qc-usb/qc-usb-messenger_1.1.bb
index 75c37562fc..19f0e766ff 100644
--- a/packages/qc-usb/qc-usb-messenger_1.1.bb
+++ b/packages/qc-usb/qc-usb-messenger_1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz"
 
diff --git a/packages/qclockchange/qclockchange_0.1b.bb b/packages/qclockchange/qclockchange_0.1b.bb
index a1629c4505..7980618f97 100644
--- a/packages/qclockchange/qclockchange_0.1b.bb
+++ b/packages/qclockchange/qclockchange_0.1b.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 AUTHOR = "piro <piro400@occn.zaq.ne.jp>"
 HOMEPAGE = "http://piro.sytes.net/~piro/zaurus/"
 APPTYPE="binary"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://piro.sytes.net/~piro/zaurus/etc/qclockchange-${PV}.tar.gz \
 	   file://qclockchange.png \
diff --git a/packages/qemu/qemu_0.9.1.bb b/packages/qemu/qemu_0.9.1.bb
index 4a485f9a34..e3e7aa0887 100644
--- a/packages/qemu/qemu_0.9.1.bb
+++ b/packages/qemu/qemu_0.9.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
-FILE_PR = "r7"
+PR = "r7"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
diff --git a/packages/qemu/qemu_20070613.bb b/packages/qemu/qemu_20070613.bb
index 034946326d..533848963b 100644
--- a/packages/qemu/qemu_20070613.bb
+++ b/packages/qemu/qemu_20070613.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "zlib"
 SRCDATE = "20070613"
 PV = "0.9.0+cvs${SRCDATE}"
-FILE_PR = "r5"
+PR = "r5"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"
diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb
index 86077961d3..137262ca2d 100644
--- a/packages/qemu/qemu_cvs.bb
+++ b/packages/qemu/qemu_cvs.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 PV = "0.9.0+cvs${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${WORKDIR}"
diff --git a/packages/qfish/qfish2_1.1.0.bb b/packages/qfish/qfish2_1.1.0.bb
index a9e6f54042..ad2182371b 100644
--- a/packages/qfish/qfish2_1.1.0.bb
+++ b/packages/qfish/qfish2_1.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A Game with fishes, Qt/Embedded based Palmtop Environments Editio
 SECTION = "opie/games"
 LICENSE = "GPL"
 PRIORITY = "optional"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://taiga0818.hp.infoseek.co.jp/rpms/qfish2-${PV}.tar.gz"
 S = "${WORKDIR}/qfish"
diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb
index 0cfb2d753d..17138452a5 100644
--- a/packages/qiv/qiv_1.9.bb
+++ b/packages/qiv/qiv_1.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Qiv is a very small and pretty fast gdk/Imlib image viewer."
 LICENSE = "GPLv2"
 SECTION = "x11/graphics"
 DEPENDS = "gtk+-1.2 imlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.klografx.net/qiv/download/qiv-1.9-src.tgz \
 		file://makefile.patch;patch=1 \
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index 1ff0ed0b30..29f736dea1 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-FILE_PR = "r4"
+PR = "r4"
 
 QTEVER = "qt-embedded-free-3.3.5"
 
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index f6713a9dce..def68451ba 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 # We call 'moc' during the build 
 DEPENDS = "uicmoc4-native"
diff --git a/packages/qmatrix/qmatrix_1.1.0.bb b/packages/qmatrix/qmatrix_1.1.0.bb
index 4a95090735..057701e9b5 100644
--- a/packages/qmatrix/qmatrix_1.1.0.bb
+++ b/packages/qmatrix/qmatrix_1.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A matrix Game, Qt/Embedded based Palmtop Environments Edition"
 SECTION = "opie/games"
 LICENSE = "GPL"
 PRIORITY = "optional"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.geocities.co.jp/SiliconValley-Oakland/8074/src/qmatrix-${PV}.tar.gz"
 S = "${WORKDIR}/qmatrix"
diff --git a/packages/qolyester/qolyester_20050728.bb b/packages/qolyester/qolyester_20050728.bb
index 188ba80c4f..e57fa6efb2 100644
--- a/packages/qolyester/qolyester_20050728.bb
+++ b/packages/qolyester/qolyester_20050728.bb
@@ -3,7 +3,7 @@ SECTION = "net"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://qolsr.lri.fr"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://qolsr.lri.fr/code/qolyester-${PV}.tar.bz2"
 
diff --git a/packages/qpdf2/qpdf2_2.2.1.bb b/packages/qpdf2/qpdf2_2.2.1.bb
index 0f4fc799ce..c1da64f3f9 100644
--- a/packages/qpdf2/qpdf2_2.2.1.bb
+++ b/packages/qpdf2/qpdf2_2.2.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "t1lib freetype"
 APPNAME = "qpdf"
 APPTYPE = "binary"
 APPDESKTOP = "${S}/ipkg-render-freetype/opt/QtPalmtop/apps/Applications"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf2/qpdf2_2.2.1_20040217b.tgz \
            file://hack-the-hack.patch;patch=1 \
diff --git a/packages/qpe-gaim/qpe-gaim_20041030.bb b/packages/qpe-gaim/qpe-gaim_20041030.bb
index a59cd53a27..f8f4d6a28f 100644
--- a/packages/qpe-gaim/qpe-gaim_20041030.bb
+++ b/packages/qpe-gaim/qpe-gaim_20041030.bb
@@ -8,7 +8,7 @@ APPNAME = "gaim"
 APPTYPE = "binary"
 LICENSE = "GPL"
 APPDESKTOP = "${S}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \
            file://qpe-gaim.patch;patch=1 \
diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
index 3ce42f7797..4483b8cce7 100644
--- a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
+++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 gnutls"
 RDEPENDS = "libgaim-plugins"
 LICENSE = "GPL"
 HOMEPAGE = "http://gaim.sourceforge.net/"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \
 	   file://dont-look-for-gtk.patch;patch=1        \
diff --git a/packages/qpe-games/crossword_0.0.3.bb b/packages/qpe-games/crossword_0.0.3.bb
index a93a3915f5..3301009cc8 100644
--- a/packages/qpe-games/crossword_0.0.3.bb
+++ b/packages/qpe-games/crossword_0.0.3.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Crossword.html"
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/crossword_V0.0.3.tar.gz \
 	   file://crossword.patch;patch=1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 PV = "0.0.3"
 S = "${WORKDIR}/crossword_V${PV}"
diff --git a/packages/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb
index a4331af22d..f51805f1d8 100644
--- a/packages/qpe-games/ziq_1.1ern.bb
+++ b/packages/qpe-games/ziq_1.1ern.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz \
            file://ziq.patch;patch=1"
 
 PV = "1.1ern"
-FILE_PR = "r1"
+PR = "r1"
 S = "${WORKDIR}/ziq_V${PV}"
 
 
diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb
index f43a69254f..3a2b3c5e46 100644
--- a/packages/qpe-games/zrev7_1.0.1.bb
+++ b/packages/qpe-games/zrev7_1.0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 AUTHOR = "Mario Weilguni"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \
            file://zrev.patch;patch=1"
diff --git a/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb b/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
index 05408a8bd2..7660549051 100644
--- a/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
+++ b/packages/qpe-inputhelper/qpe-inputhelper-applet_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Qtopia/Opie Input helper for USB devices"
 SECTION = "opie/inputmethods"
 HOMEPAGE = "http://tbox.jpn.org/wiki/linuzau/wiki.cgi"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 APPNAME = "qpeinputhelper"
 
 SRC_URI = "http://tbox.jpn.org/data/inputhelper_${PV}_src.tar.gz"
diff --git a/packages/qpe-nmap/qpe-nmap_0.02.bb b/packages/qpe-nmap/qpe-nmap_0.02.bb
index 9106ca9c92..43cd451957 100644
--- a/packages/qpe-nmap/qpe-nmap_0.02.bb
+++ b/packages/qpe-nmap/qpe-nmap_0.02.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "nmap"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.bluelightning.org/qpe-nmap/files/qpe-nmap-${PV}.tar.bz2"
 
diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
index 480a3dbf91..76f81a3d81 100644
--- a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
+++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
@@ -8,7 +8,7 @@ RDEPENDS = "qpealarmclock"
 RCONFLICTS = "opie-clockapplet"
 RREPLACES = "opie-clockapplet"
 
-FILE_PR = "r1"
+PR = "r1"
 
 APPNAME = "qpealarmclockapplet"
 APPTYPE = "binary"
diff --git a/packages/qpegps/qpegps_0.9.2.3.3.bb b/packages/qpegps/qpegps_0.9.2.3.3.bb
index 2899913235..a1c493005f 100644
--- a/packages/qpegps/qpegps_0.9.2.3.3.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.3.bb
@@ -1,3 +1,3 @@
 require qpegps.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb
index 53264f2bcb..be4f293fe6 100644
--- a/packages/qpegps/qpegps_0.9.3.1.bb
+++ b/packages/qpegps/qpegps_0.9.3.1.bb
@@ -1,6 +1,6 @@
 require qpegps.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_configure_prepend() {
          mv ${S}/Place.cpp ${S}/place.cpp
diff --git a/packages/qpegps/qpegps_svn.bb b/packages/qpegps/qpegps_svn.bb
index c4e1cc768b..3ae1d58a80 100644
--- a/packages/qpegps/qpegps_svn.bb
+++ b/packages/qpegps/qpegps_svn.bb
@@ -1,7 +1,7 @@
 require qpegps.inc
 
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://qpegps.svn.sourceforge.net/svnroot/;module=qpegps/trunk/qpegps;proto=https \
            file://qpegps.desktop \
diff --git a/packages/qpenmapfe/qpenmapfe_1.0.0.bb b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
index 91c5886883..f3bcc9948b 100644
--- a/packages/qpenmapfe/qpenmapfe_1.0.0.bb
+++ b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
@@ -6,7 +6,7 @@ AUTHOR = "Dennis Webb"
 APPNAME = "qpenmapfe"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://home.midsouth.rr.com/zaurus/qpenmapfe_${PV}_src.tar.gz \
            file://qpenmapfe.desktop \
diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb
index 39adc79381..d2ef3af639 100644
--- a/packages/qpf-fonts/qpf-arabic_1.0.bb
+++ b/packages/qpf-fonts/qpf-arabic_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Arabic fonts from Arabeyes.org"
 HOMEPAGE = "http://www.arabeyes.org"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/arabeyes/arabic-fonts-${PV}.tar.gz"
 S = "${WORKDIR}"
diff --git a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 4ebd80511a..98c9016ee4 100644
--- a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
@@ -2,7 +2,7 @@ require qpf.inc
 
 DESCRIPTION = "Bitstream Vera Monospaced Font, QPF for Qt/Embedded"
 LICENSE = "Bitstream Vera"
-FILE_PR = "r4"
+PR = "r4"
 
 PROVIDES += "qpf-bitstream-vera-sans-mono-small"
 PROVIDES += "qpf-bitstream-vera-sans-mono-larger"
diff --git a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
index 18e86e186c..fc05ad99f6 100644
--- a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
@@ -2,7 +2,7 @@ require qpf.inc
 
 DESCRIPTION = "The Bitstream Vera fonts - QPF Edition"
 LICENSE = "Bitstream Vera"
-FILE_PR = "r3"
+PR = "r3"
 
 PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large"
 
diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index f7dd0a1fbd..ba4f0867ad 100644
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Common files for Qt/Embedded fonts"
 LICENSE = "GPL QPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "file://update-qtfontdir"
 S = "${WORKDIR}/qt-${PV}"
diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb
index 378bc6f6c9..a4c73f2b7f 100644
--- a/packages/qpf-fonts/qpf-freemono_1.0.bb
+++ b/packages/qpf-fonts/qpf-freemono_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "FreeMono font - QPF Edition"
 HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb
index 88fbc4bec5..a45abbdcd3 100644
--- a/packages/qpf-fonts/qpf-freeserif_1.0.bb
+++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "FreeSerif font - QPF Edition"
 HOMEPAGE = "http://savannah.nongnu.org/projects/freefont/"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb
index f52d70e7ad..1d2c672bcb 100644
--- a/packages/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Helvetica fonts - QPF Edition"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
 LICENSE = "GPL QPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2"
 S = "${WORKDIR}/helvetica"
diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
index 77481ea5b5..6f9db1202c 100644
--- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Hunky Sans font - QPF Edition"
 HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts"
 LICENSE = "LGPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar.bz2"
 
diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
index a57531d4cd..f06599f9eb 100644
--- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Hunky Serif font - QPF Edition"
 HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts"
 LICENSE = "LGPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar.bz2"
 
diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb
index d73915ed7b..a1a589f003 100644
--- a/packages/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Qt/Embedded fonts version ${PV}"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-FILE_PR = "r2"
+PR = "r2"
 
 PROVIDES  = "qte-font-helvetica-100 qte-font-helvetica-120"
 PROVIDES += "qte-font-fixed-70 qte-font-fixed-120"
diff --git a/packages/qpf-fonts/qpf-qte_3.3.5.bb b/packages/qpf-fonts/qpf-qte_3.3.5.bb
index acea65b889..6ac091f29d 100644
--- a/packages/qpf-fonts/qpf-qte_3.3.5.bb
+++ b/packages/qpf-fonts/qpf-qte_3.3.5.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Qt/Embedded fonts version ${PV}"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
diff --git a/packages/qpf-fonts/qpf-terminus.bb b/packages/qpf-fonts/qpf-terminus.bb
index a15c1af155..7e8bbfe393 100644
--- a/packages/qpf-fonts/qpf-terminus.bb
+++ b/packages/qpf-fonts/qpf-terminus.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Qt/Embedded terminus font"
 HOMEPAGE = "http://www.is-vn.bg/hamster/jimmy-en.html"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 #SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2" -> 404 error
 SRC_URI = "http://openzaurus.linuxtogo.org/download/3.5.4/sources/terminus-fonts.tar.bz2"
diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb
index 8aa836e06f..e91e762845 100644
--- a/packages/qpf-fonts/qpf-unifont_1.0.bb
+++ b/packages/qpf-fonts/qpf-unifont_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Unicode fonts - QPF Edition"
 LICENSE = "GPL QPL"
 RPROVIDES = "virtual/japanese-font"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2"
 S = "${WORKDIR}"
diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
index 294ad0c7fa..6298e2dfc4 100644
--- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb
+++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 displa
 HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/"
 LICENSE = "GPL"
 RPROVIDES = "virtual/japanese-font"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz"
 
diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb
index 679872970a..eaee2d07a4 100644
--- a/packages/qpf-fonts/qpf-utopia_1.0.bb
+++ b/packages/qpf-fonts/qpf-utopia_1.0.bb
@@ -3,7 +3,7 @@ require qpf.inc
 DESCRIPTION = "Utopia fonts - QPF Edition"
 HOMEPAGE = "http://www.pobox.sk/~mico/zaurus.html"
 LICENSE = "GPL QPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2"
 S = "${WORKDIR}/utopia"
diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb
index 5363cd292a..515eefaafc 100644
--- a/packages/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://qplot.sourceforge.net/"
 SRCDATE = "20020420"
 #Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV
 PV = "2.0.1-cvs-${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@qplot.cvs.sourceforge.net/cvsroot/qplot;module=qplot \
 	   file://gcc3.patch;patch=1"
diff --git a/packages/qpphoto/qpphoto_1.0.2.bb b/packages/qpphoto/qpphoto_1.0.2.bb
index 65c2f608b8..9ef9b4ef3a 100644
--- a/packages/qpphoto/qpphoto_1.0.2.bb
+++ b/packages/qpphoto/qpphoto_1.0.2.bb
@@ -7,7 +7,7 @@ APPNAME = "qpPhoto"
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit opie
 
diff --git a/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb b/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
index 83c34822c8..a983e7f1b4 100644
--- a/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
+++ b/packages/qscintilla/qscintilla_1.60-gpl-1.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz"
 S = "${WORKDIR}/qscintilla-${PV}/qt"
diff --git a/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb b/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
index 3f36a9b5ae..afcd3041d0 100644
--- a/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
+++ b/packages/qscintilla/qscintilla_1.60-gpl-1.3b.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz"
 S = "${WORKDIR}/qscintilla-1.60-gpl-1.3/qt"
diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
index d0b0619386..3acb29e3fa 100644
--- a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
+++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component"
 SECTION = "opie/libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \
            file://no-external-lexers.patch;patch=1;pnum=0"
diff --git a/packages/qsvn/qsvn.inc b/packages/qsvn/qsvn.inc
index c715f3cce6..c27bbab114 100644
--- a/packages/qsvn/qsvn.inc
+++ b/packages/qsvn/qsvn.inc
@@ -5,7 +5,7 @@ AUTHOR = "Andreas Richter, Rajko Albrecht"
 LICENSE = "GPL"
 SECTION = "network"
 DEPENDS = "apr-util subversion"
-FILE_PR = "r0"
+PR = "r0"
 
 def vars_from_file(filename):
     import os
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index 2670ccb4cf..719215c5d2 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -1,6 +1,6 @@
 DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
 PROVIDES = "qt3x11"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb
index 9ba4c2f824..d5df55cbb4 100644
--- a/packages/qt/qt-x11-free_3.3.7.bb
+++ b/packages/qt/qt-x11-free_3.3.7.bb
@@ -1,6 +1,6 @@
 DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
 PROVIDES = "qt3x11"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb
index ec306aafce..0bc82e77af 100644
--- a/packages/qt4/qt-embedded_4.4.3.bb
+++ b/packages/qt4/qt-embedded_4.4.3.bb
@@ -3,7 +3,7 @@ require qtopia-core.inc
 PROVIDES += "qtopia-core"
 RPROVIDES_${PN} = "qtopia-core"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://qconfig-oe.h \
diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
index 8dc7275cbd..17f2fff0fe 100644
--- a/packages/qt4/qt4-x11-free.inc
+++ b/packages/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
diff --git a/packages/qt4/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb
index 1ef846f473..54c706463a 100644
--- a/packages/qt4/qt4-x11-free_4.1.2.bb
+++ b/packages/qt4/qt4-x11-free_4.1.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor"
 PROVIDES = "qt4x11"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://cross-compile.patch;patch=1 \
diff --git a/packages/qt4/qt4-x11-free_4.4.3.bb b/packages/qt4/qt4-x11-free_4.4.3.bb
index 32ae6be839..3bef76f138 100644
--- a/packages/qt4/qt4-x11-free_4.4.3.bb
+++ b/packages/qt4/qt4-x11-free_4.4.3.bb
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += " \
            file://0002-fix-resinit-declaration.patch;patch=1 \
diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc
index fc5decbde4..eab7e1b3e1 100644
--- a/packages/qt4/qtopia-core.inc
+++ b/packages/qt4/qtopia-core.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "tslib"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
            file://qconfig-oe.h \
diff --git a/packages/qt4/qtopia-core_4.4.3.bb b/packages/qt4/qtopia-core_4.4.3.bb
index 56ec256ce0..061fd2cd6c 100644
--- a/packages/qt4/qtopia-core_4.4.3.bb
+++ b/packages/qt4/qtopia-core_4.4.3.bb
@@ -3,4 +3,4 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
 #keep in sync with qt-embedded_${PV}.bb
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb
index 284f5c6609..68ab2aceab 100644
--- a/packages/qte/qte-mt-static_2.3.10.bb
+++ b/packages/qte/qte-mt-static_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-FILE_PR = "r8"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index 79b9544863..32afeda271 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-FILE_PR = "r27"
+PR = "r27"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index a801484efe..68825b6ce8 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -1,3 +1,3 @@
 require qte-common_${PV}.inc
-FILE_PR = "r52"
+PR = "r52"
 
diff --git a/packages/qtnx/qtnx.inc b/packages/qtnx/qtnx.inc
index f1720d2e64..b20339001e 100644
--- a/packages/qtnx/qtnx.inc
+++ b/packages/qtnx/qtnx.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "This a the freesource nx client, build with qt"
 HOMEPAGE = "http://freenx.berlios.de/"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libnxcl"
 
diff --git a/packages/quagga/quagga_0.99.6.bb b/packages/quagga/quagga_0.99.6.bb
index 577c177208..9911f519d0 100644
--- a/packages/quagga/quagga_0.99.6.bb
+++ b/packages/quagga/quagga_0.99.6.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 require quagga.inc
 
diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb
index 20904cfd26..86210e4621 100644
--- a/packages/quake/quake1_0.0.1.bb
+++ b/packages/quake/quake1_0.0.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-x11 libsdl-mixer libsdl-net zlib libxau"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://mirror1.pdaXrom.org/rc9/src/quake1src.tar.bz2 \
            http://mirror1.pdaxrom.org/source/src/pak0.tar.gz \
diff --git a/packages/quilt/quilt.inc b/packages/quilt/quilt.inc
index 0a741adefc..33bc0f62ea 100644
--- a/packages/quilt/quilt.inc
+++ b/packages/quilt/quilt.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool to work with series of patches."
 HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
 SECTION = "devel"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
            file://install.patch;patch=1"
diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb
index fd9e26f789..31f3daaaa2 100644
--- a/packages/qwt/qwt_4.2.0rc1.bb
+++ b/packages/qwt/qwt_4.2.0rc1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tgz \
           file://qt2-fix.patch;patch=1"
diff --git a/packages/radlib/radlib-mysql_2.6.2.bb b/packages/radlib/radlib-mysql_2.6.2.bb
index b623ba9a04..3b05f1f40a 100644
--- a/packages/radlib/radlib-mysql_2.6.2.bb
+++ b/packages/radlib/radlib-mysql_2.6.2.bb
@@ -1,3 +1,3 @@
 require radlib-common.inc
 require radlib-mysql.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/radlib/radlib_2.6.2.bb b/packages/radlib/radlib_2.6.2.bb
index 6cc26f8ac0..1296a659a9 100644
--- a/packages/radlib/radlib_2.6.2.bb
+++ b/packages/radlib/radlib_2.6.2.bb
@@ -1,3 +1,3 @@
 require radlib-common.inc
 require radlib.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/radvd/radvd_0.7.2.bb b/packages/radvd/radvd_0.7.2.bb
index 197790708e..e22cc5e96b 100644
--- a/packages/radvd/radvd_0.7.2.bb
+++ b/packages/radvd/radvd_0.7.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI_append += "file://automake.patch;patch=1 "
 
diff --git a/packages/radvd/radvd_1.0.bb b/packages/radvd/radvd_1.0.bb
index 3e439cfc5b..6d44ff2f94 100644
--- a/packages/radvd/radvd_1.0.bb
+++ b/packages/radvd/radvd_1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 
 require radvd.inc
 
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index a5f177f503..8682c8ee98 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://strip.patch;patch=1"
 
diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index cd6bbf13ac..d652dfe633 100644
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb
index cd6bbf13ac..d652dfe633 100644
--- a/packages/rdesktop/rdesktop_1.6.0.bb
+++ b/packages/rdesktop/rdesktop_1.6.0.bb
@@ -1,6 +1,6 @@
 require rdesktop.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools
 
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 3f00addb0c..0b76ee7535 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,7 +1,7 @@
 require rdesktop.inc
 
 PV = "1.6.0+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
 S = "${WORKDIR}/rdesktop"
diff --git a/packages/rdiff-backup/rdiff-backup_1.0.4.bb b/packages/rdiff-backup/rdiff-backup_1.0.4.bb
index f147259029..05aa686a02 100644
--- a/packages/rdiff-backup/rdiff-backup_1.0.4.bb
+++ b/packages/rdiff-backup/rdiff-backup_1.0.4.bb
@@ -1,2 +1,2 @@
 require rdiff-backup.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/rdiff-backup/rdiff-backup_1.1.5.bb b/packages/rdiff-backup/rdiff-backup_1.1.5.bb
index 71b03ec372..a8cf1876ec 100644
--- a/packages/rdiff-backup/rdiff-backup_1.1.5.bb
+++ b/packages/rdiff-backup/rdiff-backup_1.1.5.bb
@@ -1,5 +1,5 @@
 require rdiff-backup.inc
-FILE_PR = "r0"
+PR = "r0"
 
 # 1.1.x added the use of sha which we get from python-crypt
 RDEPENDS_${PN} += "python-crypt"
diff --git a/packages/re2c/re2c-native_0.13.1.bb b/packages/re2c/re2c-native_0.13.1.bb
index 481d50dbb1..fb7e3df626 100644
--- a/packages/re2c/re2c-native_0.13.1.bb
+++ b/packages/re2c/re2c-native_0.13.1.bb
@@ -1,5 +1,5 @@
 require re2c.inc 
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit native
diff --git a/packages/re2c/re2c_0.13.1.bb b/packages/re2c/re2c_0.13.1.bb
index 93634c26ce..5846dc4bf1 100644
--- a/packages/re2c/re2c_0.13.1.bb
+++ b/packages/re2c/re2c_0.13.1.bb
@@ -1,3 +1,3 @@
 require re2c.inc 
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb
index c748cf829c..a2420c57e4 100644
--- a/packages/readline/readline_4.3.bb
+++ b/packages/readline/readline_4.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/readline/readline-${PV}.tar.gz \
 	   file://shlink-termcap.patch;patch=1 \
diff --git a/packages/recode/recode_3.6.bb b/packages/recode/recode_3.6.bb
index dc3a4106dc..6fd60ae399 100644
--- a/packages/recode/recode_3.6.bb
+++ b/packages/recode/recode_3.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Charset converting utility"
 SECTION = "console/utils"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/recode-${PV}', '${FILE_DIRNAME}' ], d)}"
 
diff --git a/packages/redboot-utils/fconfig_20060419.bb b/packages/redboot-utils/fconfig_20060419.bb
index 7b524d7540..561718f9b2 100644
--- a/packages/redboot-utils/fconfig_20060419.bb
+++ b/packages/redboot-utils/fconfig_20060419.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tool to edit the Redboot config from userspace"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://andrzejekiert.ovh.org/software/fconfig/fconfig-20060419.tar.gz"
 
diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/redboot-utils/fis_1.0.bb
index 371de11cfd..e1ac56448b 100644
--- a/packages/redboot-utils/fis_1.0.bb
+++ b/packages/redboot-utils/fis_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
diff --git a/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb
index be96164da2..c54b2f1ba4 100644
--- a/packages/reiser4progs/reiser4progs_1.0.4.bb
+++ b/packages/reiser4progs/reiser4progs_1.0.4.bb
@@ -1,7 +1,7 @@
 # This package builds tools to manipulate Reiser4 file systems,
 # the libaal package must be built and installed as well to
 # run these tools.
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "User-level tools for Reiser4 filesystems"
 HOMEPAGE = "http://www.namesys.com"
 SECTION = "base"
diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 7500738663..fe047aed37 100644
--- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "User-level tools for ReiserFS filesystems"
 SECTION = "base"
 LICENSE = "GPL"
 RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
-FILE_PR = "r1"
+PR = "r1"
 
 #Namesys.com seems to be in trouble.  See bug #3482 for more information
 #SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
diff --git a/packages/resistorui/resistorui_0.9.bb b/packages/resistorui/resistorui_0.9.bb
index 60f37cf1c7..41e50c01e4 100644
--- a/packages/resistorui/resistorui_0.9.bb
+++ b/packages/resistorui/resistorui_0.9.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.pellicosystems.com/zaurus/applications/index.html"
 APPNAME = "resistorUI"
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.pellicosystems.com/zaurus/applications/resistorUI_1.5.0-0.9_armSRC.zip"
 S = "${WORKDIR}/ResistorUI"
diff --git a/packages/resolvconf/resolvconf_1.28.bb b/packages/resolvconf/resolvconf_1.28.bb
index c919b850bb..2aa2fccc8b 100644
--- a/packages/resolvconf/resolvconf_1.28.bb
+++ b/packages/resolvconf/resolvconf_1.28.bb
@@ -9,7 +9,7 @@ AUTHOR = "Thomas Hood"
 HOMEPAGE = "http://packages.debian.org/resolvconf"
 DEPENDS = "bash"
 RDEPENDS = "bash"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
 
diff --git a/packages/rfakeap/rfakeap_0.2.bb b/packages/rfakeap/rfakeap_0.2.bb
index 4166cf7449..036831a11e 100644
--- a/packages/rfakeap/rfakeap_0.2.bb
+++ b/packages/rfakeap/rfakeap_0.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://rfakeap.tuxfamily.org/"
 LICENSE = "GPLv2"
 DEPENDS = "libpcap"
 PV="0.2"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://rfakeap.tuxfamily.org/rfakeap-0.2.tar.gz"
 
diff --git a/packages/rhythmbox/rhythmbox_0.8.5.bb b/packages/rhythmbox/rhythmbox_0.8.5.bb
index 0f4e997af3..8a6f3a8905 100644
--- a/packages/rhythmbox/rhythmbox_0.8.5.bb
+++ b/packages/rhythmbox/rhythmbox_0.8.5.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "unknown"
-FILE_PR = "r4"
+PR = "r4"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-${PV}.tar.gz \
            file://ogg.m4 file://vorbis.m4 \
 	   file://omfmake.patch;patch=1"
diff --git a/packages/rhythmbox/rhythmbox_0.8.7.bb b/packages/rhythmbox/rhythmbox_0.8.7.bb
index 3c41d068e9..2adb11fb8d 100644
--- a/packages/rhythmbox/rhythmbox_0.8.7.bb
+++ b/packages/rhythmbox/rhythmbox_0.8.7.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "unknown"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gnome
 
diff --git a/packages/rng-tools/rng-tools_2.bb b/packages/rng-tools/rng-tools_2.bb
index ec52b62dc5..a82daaad64 100644
--- a/packages/rng-tools/rng-tools_2.bb
+++ b/packages/rng-tools/rng-tools_2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Random number generator daemon"
 LICENSE = "GPL"
-FILE_PR = "1"
+PR = "1"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/gkernel/${P}.tar.gz \
            file://init"
diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb
index a9adb83abf..a4a72a2c8a 100644
--- a/packages/roadmap/roadmap-gtk2_1.1.0.bb
+++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb
@@ -1,6 +1,6 @@
 require roadmap-gtk2.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb
index c96a8a6622..9d7adbaa3e 100644
--- a/packages/roadmap/roadmap-gtk2_cvs.bb
+++ b/packages/roadmap/roadmap-gtk2_cvs.bb
@@ -1,7 +1,7 @@
 require roadmap-gtk2.inc
 
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb
index 68cdd23ad7..b06e4e7ad0 100644
--- a/packages/roadmap/zroadmap_1.1.0.bb
+++ b/packages/roadmap/zroadmap_1.1.0.bb
@@ -1,6 +1,6 @@
 require zroadmap.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
index 42ec45eb87..383ffe8f69 100644
--- a/packages/roadmap/zroadmap_cvs.bb
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -1,7 +1,7 @@
 require zroadmap.inc
 
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
index 35b58e3be3..81e406c6e1 100644
--- a/packages/roadster/roadster_cvs.bb
+++ b/packages/roadster/roadster_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://linuxadvocate.org/projects/roadster/"
 SECTION = "x11/navigation"
 PV = "0.0+cvs${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade"
 RDEPENDS = "gpsd gtk+ cairo libxml2"
diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb
index 80cd58dfc6..726b68aa81 100644
--- a/packages/rosetta/rosetta_cvs.bb
+++ b/packages/rosetta/rosetta_cvs.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SRC_URI = "${HANDHELDS_CVS};module=rosetta \
 	file://rosetta-makefile.patch;patch=1"
 S = "${WORKDIR}/rosetta"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit pkgconfig gettext
 
diff --git a/packages/rott/rott_1.0.bb b/packages/rott/rott_1.0.bb
index 36f50fc3ec..e1fc4e6a74 100644
--- a/packages/rott/rott_1.0.bb
+++ b/packages/rott/rott_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition"
 HOMEPAGE = "http://www.icculus.org/root"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 APPIMAGE = "${WORKDIR}/rott.jpg"
 
diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb
index 3cc66b6500..3a77161d93 100644
--- a/packages/rox/rox-filer_2.5.bb
+++ b/packages/rox/rox-filer_2.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS = "gtk+ shared-mime-info"
 RDEPENDS = "shared-mime-info"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \
            file://no-strip-objcopy.patch;patch=1;pnum=3"
diff --git a/packages/rp-pppoe/rp-pppoe_3.8.bb b/packages/rp-pppoe/rp-pppoe_3.8.bb
index c68bc75b1c..9852522da1 100644
--- a/packages/rp-pppoe/rp-pppoe_3.8.bb
+++ b/packages/rp-pppoe/rp-pppoe_3.8.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-server = "${PN}"
 RRECOMMENDS_${PN} = "ppp-oe"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://top-autoconf.patch;patch=1 \
diff --git a/packages/rpm/rpm_4.4.bb b/packages/rpm/rpm_4.4.bb
index f51860b809..ff69ddc50f 100644
--- a/packages/rpm/rpm_4.4.bb
+++ b/packages/rpm/rpm_4.4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL GPL"
 # file, or virtual/db.  FIXME: patch it to support that.
 # DEPENDS = "virtual/db popt file zlib"
 DEPENDS = "zlib"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.jbj.org/pub/rpm-4.4.x/rpm-4.4-1.src.rpm \
 	   file://fix_mypath.patch;patch=1 \
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index 945053693a..11968ea609 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -4,7 +4,7 @@ SECTION = "utils"
 LICENSE = "GPLv2"
 DEPENDS = "libpng zlib"
 DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
-FILE_PR = "r2"
+PR = "r2"
 SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \
 	file://perl-make-options.diff;patch=1;pnum=0"
 
diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb
index ce1b03ced4..77cb0b2b67 100644
--- a/packages/rsync/rsync_2.6.9.bb
+++ b/packages/rsync/rsync_2.6.9.bb
@@ -1,5 +1,5 @@
 require rsync.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI += "file://rsyncd.conf"
diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb
index 72e0a97d16..cd8a986f8f 100644
--- a/packages/rsync/rsync_3.0.0.bb
+++ b/packages/rsync/rsync_3.0.0.bb
@@ -1,6 +1,6 @@
 require rsync.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "\
   file://m4.patch;patch=1 \
diff --git a/packages/rt-tests/rt-tests_0.21.bb b/packages/rt-tests/rt-tests_0.21.bb
index ba68628bfe..83600d5329 100644
--- a/packages/rt-tests/rt-tests_0.21.bb
+++ b/packages/rt-tests/rt-tests_0.21.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT RT kernels"
 HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2"
 
diff --git a/packages/rt2x00/rt73-chumby_1.2.bb b/packages/rt2x00/rt73-chumby_1.2.bb
index ec2fe49c1b..3d6cd0cb51 100644
--- a/packages/rt2x00/rt73-chumby_1.2.bb
+++ b/packages/rt2x00/rt73-chumby_1.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for Ralink rt73 USB 802.11g WiFi sticks found in the Chumb
 HOMEPAGE = "http://www.chumby.com"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI="http://files.chumby.com/source/ironforge/build396/${PN}-${PV}.tar.gz"
 
diff --git a/packages/rt2x00/rt73-k2wrlz_1.0.0.bb b/packages/rt2x00/rt73-k2wrlz_1.0.0.bb
index c1cac74fe8..094cb264a3 100644
--- a/packages/rt2x00/rt73-k2wrlz_1.0.0.bb
+++ b/packages/rt2x00/rt73-k2wrlz_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI= "http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-1.0.0.tar.bz2"
 inherit module
diff --git a/packages/rt2x00/rt73-k2wrlz_2.0.1.bb b/packages/rt2x00/rt73-k2wrlz_2.0.1.bb
index 2ed96931f7..93d371986a 100644
--- a/packages/rt2x00/rt73-k2wrlz_2.0.1.bb
+++ b/packages/rt2x00/rt73-k2wrlz_2.0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1" 
+PR = "r1" 
 
 SRC_URI="http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/rt2x00/rt73-k2wrlz_3.0.0.bb b/packages/rt2x00/rt73-k2wrlz_3.0.0.bb
index 3c615957c5..68b6b5710b 100644
--- a/packages/rt2x00/rt73-k2wrlz_3.0.0.bb
+++ b/packages/rt2x00/rt73-k2wrlz_3.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r0" 
+PR = "r0" 
 
 SRC_URI="http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/rtaudio/librtaudio_3.0.1.bb b/packages/rtaudio/librtaudio_3.0.1.bb
index cc7909ace1..9549076ee5 100644
--- a/packages/rtaudio/librtaudio_3.0.1.bb
+++ b/packages/rtaudio/librtaudio_3.0.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "rtaudio"
 HOMEPAGE = "http://www.music.mcgill.ca/~gary/rtaudio"
 DEPENDS = "alsa-lib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-${PV}.tar.gz"
 S = "${WORKDIR}/rtaudio-${PV}"
diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index 9cb95c7437..6260614772 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,7 +1,7 @@
 require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
 
-FILE_PR = "r1"
+PR = "r1"
 
 FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
                     ${libdir}/ruby/1.8/*/*/.debug"
diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb
index f64ef472ad..360d5acd78 100644
--- a/packages/rxtx/rxtx_2.1-7r2.bb
+++ b/packages/rxtx/rxtx_2.1-7r2.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 SECTION = "libs"
 HOMEPAGE = "http://rxtx.org"
 
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "classpath classpath-tools-native"
 
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.8.bb b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
index 85a164c7ee..3b96243b77 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.8.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
@@ -5,7 +5,7 @@ terminal emulator rxvt, modified to store text in Unicode \
 (either UCS-2 or UCS-4) and to use locale-correct input and \
 output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch;patch=1 \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
index 570a9a14f2..b3f261818c 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.3.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch;patch=1 \
 	   file://signedchar.patch;patch=1"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools update-alternatives
 
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
index 570a9a14f2..b3f261818c 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.4.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
@@ -9,7 +9,7 @@ LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch;patch=1 \
 	   file://signedchar.patch;patch=1"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools update-alternatives
 
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 4b6aa0a585..f9ba2bedde 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/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"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools update-alternatives
 
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
index ee06b76d1c..f80984bc7a 100644
--- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_7.7.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"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.9.bb b/packages/rxvt-unicode/rxvt-unicode_7.9.bb
index a4aa1f8b12..e08583527c 100644
--- a/packages/rxvt-unicode/rxvt-unicode_7.9.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_7.9.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"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools update-alternatives
 
diff --git a/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb
index 56b19d02e3..1d6d586f2a 100644
--- a/packages/rxvt/rxvt_2.7.9.bb
+++ b/packages/rxvt/rxvt_2.7.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Well known terminal emulator"
 SECTION = "x11/utils"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "virtual/libx11 libxft"
 LICENSE = "GPL"
 SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
diff --git a/packages/rxvt/rxvt_2.8.0.bb b/packages/rxvt/rxvt_2.8.0.bb
index aee8ed82c2..92bb2dcbf5 100644
--- a/packages/rxvt/rxvt_2.8.0.bb
+++ b/packages/rxvt/rxvt_2.8.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Well known terminal emulator"
 SECTION = "x11/utils"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "virtual/libx11 libxft"
 LICENSE = "GPL"
 SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
index bd0455759c..675d07c910 100644
--- a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
+++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 AUTHOR = "Harald Welte <laforge@openmoko.org>"
 LICENSE = "GPL"
 PV = "0.1.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
 S = "${WORKDIR}/s3c2410_boot_usb"
diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
index c968c3b81e..0a57d2c0e6 100644
--- a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
+++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 AUTHOR = "Werner Almesberger <werner@openmoko.org>"
 LICENSE = "GPL"
 PV = "1.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
 S = "${WORKDIR}/gpio"
diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
index 95c5796a02..fcfbba923d 100644
--- a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
+++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 AUTHOR = "Harald Welte <laforge@openmoko.org>"
 LICENSE = "GPL"
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
 S = "${WORKDIR}/sjf2410-linux"
diff --git a/packages/sablevm/sablevm-classpath_1.1.9.bb b/packages/sablevm/sablevm-classpath_1.1.9.bb
index 94ba4ba45f..c222572009 100644
--- a/packages/sablevm/sablevm-classpath_1.1.9.bb
+++ b/packages/sablevm/sablevm-classpath_1.1.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://sablevm.org"
 LICENSE = "Classpath"
 PRIORITY = "optional"
 SECTION = "libs"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native fastjar-native"
 RDEPENDS_${PN} = "${PN}-native"
diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb
index aab84ef05f..7c5198c0e6 100644
--- a/packages/sablevm/sablevm_1.1.9.bb
+++ b/packages/sablevm/sablevm_1.1.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://sablevm.org"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 SECTION = "interpreters"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libffi libtool popt \
            sablevm-classpath"
diff --git a/packages/sailcut/sailcut_1.3.2.bb b/packages/sailcut/sailcut_1.3.2.bb
index 284810c335..02f68b9405 100644
--- a/packages/sailcut/sailcut_1.3.2.bb
+++ b/packages/sailcut/sailcut_1.3.2.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "qt4-x11-free"
 SRCNAME = "sailcut"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index 5876606628..ecf591dbb5 100644
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -1,7 +1,7 @@
 require samba-essential.inc
 inherit update-rc.d
 
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "file://config-lfs.patch;patch=1 \
 	   file://init-essential \
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index 9ac5a42654..fdbc67d1bc 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,7 +1,7 @@
 require samba.inc
 inherit update-rc.d
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
 	   file://init \
diff --git a/packages/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb
index abf79fe9e4..f79cf9e508 100644
--- a/packages/sane/sane-frontends_1.0.13.bb
+++ b/packages/sane/sane-frontends_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Frontends for SANE"
 DEPENDS = "virtual/libx11 gimp sane-backends"
 LICENSE = "LGPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \
 	"
diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb
index 99aa4b7643..39ccacb6f6 100644
--- a/packages/sapwood/sapwood_svn.bb
+++ b/packages/sapwood/sapwood_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GTK theme engine Sapwood"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
 PV = "2.43+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \
 	   file://sockets.patch;patch=1 \
diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb
index 36a0954c44..9ba295a7a5 100644
--- a/packages/scap/scap_0.1.bb
+++ b/packages/scap/scap_0.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "OSL"
-FILE_PR = "r5"
+PR = "r5"
 
 DESCRIPTION = "handhelds.org screen capture utility"
 SRC_URI = "file://scap.sh file://scap.desktop file://scap.png"
diff --git a/packages/sccd/sccd_1.0.bb b/packages/sccd/sccd_1.0.bb
index 8a55767285..bf25fbe90c 100644
--- a/packages/sccd/sccd_1.0.bb
+++ b/packages/sccd/sccd_1.0.bb
@@ -1,7 +1,7 @@
 DECSCRIPTION = "StorCenter Control Daemon controls leds, fans, softpower"
 SECTION = "utils"
 LICENSE = "BSD"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "file://scc.h \
 	   file://scc.c \
diff --git a/packages/scew/scew_0.3.1.bb b/packages/scew/scew_0.3.1.bb
index 1e555f609e..6abde6b012 100644
--- a/packages/scew/scew_0.3.1.bb
+++ b/packages/scew/scew_0.3.1.bb
@@ -4,6 +4,6 @@ DEPENDS = "expat"
 LICENSE = "LGPL"
 SRC_URI = "http://savannah.nongnu.org/download/scew/scew-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/packages/schroedinger/schroedinger_1.0.5.bb b/packages/schroedinger/schroedinger_1.0.5.bb
index 9087ddf238..defb758046 100644
--- a/packages/schroedinger/schroedinger_1.0.5.bb
+++ b/packages/schroedinger/schroedinger_1.0.5.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/"
 LICENSE = "MPL GPL LGPL MIT"
 DEPENDS = "liboil gstreamer gst-plugins-base"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz"
 
diff --git a/packages/scratchbox/sbrsh_7.1.bb b/packages/scratchbox/sbrsh_7.1.bb
index 9e752875e5..43ff0178d6 100644
--- a/packages/scratchbox/sbrsh_7.1.bb
+++ b/packages/scratchbox/sbrsh_7.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Daemon to allow scratchbox to use your device as a CPU tranparenc
 HOMEPAGE = "http://scratchbox.org"
 LICENSE = "GPLv2"
 DEPENDS = "fakeroot"
-FILE_PR = "r1"
+PR = "r1"
 RRECOMMENDS = "kernel-module-nfs"
 
 SRC_URI = "http://scratchbox.org/download/files/sbox-releases/1.0/src/${P}.tar.gz"
diff --git a/packages/screen/screen_4.0.2.bb b/packages/screen/screen_4.0.2.bb
index f2ce001357..29681304ec 100644
--- a/packages/screen/screen_4.0.2.bb
+++ b/packages/screen/screen_4.0.2.bb
@@ -4,7 +4,7 @@ processes, typically interactive shells."
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
diff --git a/packages/scsi-idle/scsi-idle_2.4.23.bb b/packages/scsi-idle/scsi-idle_2.4.23.bb
index 9d9a50ccfa..6085112c63 100644
--- a/packages/scsi-idle/scsi-idle_2.4.23.bb
+++ b/packages/scsi-idle/scsi-idle_2.4.23.bb
@@ -7,7 +7,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://packages.debian.org/unstable/admin/scsi-idle"
 AUTHOR = "Eduard Bloch <blade@debian.org>"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/scsi-idle/scsi-idle_${PV}-5.tar.gz \
 	file://makefile.patch;patch=1 \
diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
index 551b5eb96a..b35e71374d 100644
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
diff --git a/packages/sdcc/sdcc_2.5.0.bb b/packages/sdcc/sdcc_2.5.0.bb
index e465e13653..3347fb9f6e 100644
--- a/packages/sdcc/sdcc_2.5.0.bb
+++ b/packages/sdcc/sdcc_2.5.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "devel"
 HOMEPAGE = "http://sdcc.sourceforge.net"
 DEPENDS = "sdcc-native"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-${PV}.tar.gz \
            file://gcc4.patch;patch=1 \
diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb
index 300bac0698..6820fa05ce 100644
--- a/packages/sdlperl/sdl-perl_1.20.3.bb
+++ b/packages/sdlperl/sdl-perl_1.20.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 HOMEPAGE = "http://sdl.perl.org/"
 LICENSE = "GPL"
 DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_perl-${PV}"
diff --git a/packages/sed/sed_4.1.2.bb b/packages/sed/sed_4.1.2.bb
index 0fe7a168ba..fe80f3e687 100644
--- a/packages/sed/sed_4.1.2.bb
+++ b/packages/sed/sed_4.1.2.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
 DESCRIPTION = "sed is a Stream EDitor."
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
 S = "${WORKDIR}/sed-${PV}"
diff --git a/packages/setpwc/setpwc_0.9.bb b/packages/setpwc/setpwc_0.9.bb
index 59e0bf94e7..79e24794d2 100644
--- a/packages/setpwc/setpwc_0.9.bb
+++ b/packages/setpwc/setpwc_0.9.bb
@@ -3,7 +3,7 @@ SECTION = "console"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.vanheusden.com/setpwc/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \
 	   file://Makefile.patch;patch=1"
diff --git a/packages/setpwc/setpwc_1.1.bb b/packages/setpwc/setpwc_1.1.bb
index 309decf236..76b2ac6f82 100644
--- a/packages/setpwc/setpwc_1.1.bb
+++ b/packages/setpwc/setpwc_1.1.bb
@@ -3,7 +3,7 @@ SECTION = "console"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.vanheusden.com/setpwc/"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \
 	   file://makefile.diff;patch=1"
diff --git a/packages/setserial/setserial_2.17.bb b/packages/setserial/setserial_2.17.bb
index ad8ff603c2..0255a9f2b0 100644
--- a/packages/setserial/setserial_2.17.bb
+++ b/packages/setserial/setserial_2.17.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://setserial.sourceforge.net"
 AUTHOR = "Theodore Ts'o >tytso@mit.edu>"
 SECTION = "console/utils"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools
 
diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb
index 3bdc2f77db..27931dcd32 100644
--- a/packages/settings-daemon/settings-daemon_svn.bb
+++ b/packages/settings-daemon/settings-daemon_svn.bb
@@ -5,7 +5,7 @@ RDEPENDS = "xrdb"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"
diff --git a/packages/shared-mime-info/shared-mime-info.inc b/packages/shared-mime-info/shared-mime-info.inc
index fd9d45e6fd..a5176a7bf1 100644
--- a/packages/shared-mime-info/shared-mime-info.inc
+++ b/packages/shared-mime-info/shared-mime-info.inc
@@ -1,7 +1,7 @@
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "libxml2 intltool-native glib-2.0"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
 
diff --git a/packages/shared-mime-info/shared-mime-info_0.22.bb b/packages/shared-mime-info/shared-mime-info_0.22.bb
index 6c628e307f..6d3b760390 100644
--- a/packages/shared-mime-info/shared-mime-info_0.22.bb
+++ b/packages/shared-mime-info/shared-mime-info_0.22.bb
@@ -1,3 +1,3 @@
 require shared-mime-info.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index 0798ab59f4..bc015e3d52 100644
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for the Ati W100 found on the Sharp Zaurus C[87]x0"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2 \
 		file://fixstretchblit.patch;patch=1 \
diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index b83ce172ae..701915dbe3 100644
--- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://openzaurus.sf.net/mirror/camera-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \
            file://CE-AG06.dat \
diff --git a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
index 95df9dc448..3fa80452f6 100644
--- a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
+++ b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
@@ -8,7 +8,7 @@ RDEPENDS = "opie-sh"
 RPROVIDES = "oz-compat"
 RCONFLICTS = "oz-compat"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 EXCLUDE_FROM_SHLIBS = "1"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb
index adb1013a4d..7fc60aa250 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${PV})"
-FILE_PR = "r23"
+PR = "r23"
 PACKAGE_ARCH = "${MACHINE}"
 
 COMPATIBLE_MACHINE = '(collie|poodle|tosa)'
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index 548fb25750..8870bcc799 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -14,7 +14,7 @@ PROVIDES_sharprom-compatible = "\
   virtual/arm-linux-libc-for-gcc \
   virtual/arm-linux-gcc-intermediate \
   virtual/arm-linux-gcc-initial "
-FILE_PR = "r2"
+PR = "r2"
 
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
diff --git a/packages/shfs/shfs-modules_0.35.bb b/packages/shfs/shfs-modules_0.35.bb
index f7c860d546..5151e25aef 100644
--- a/packages/shfs/shfs-modules_0.35.bb
+++ b/packages/shfs/shfs-modules_0.35.bb
@@ -3,7 +3,7 @@ It supports some nice features like number of different caches for access speedu
 SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/shfs/shfs-${PV}.tar.gz"
 S = "${WORKDIR}/shfs-${PV}/shfs/Linux-2.4"
diff --git a/packages/shorewall/shorewall_2.0.9.bb b/packages/shorewall/shorewall_2.0.9.bb
index 275bfe0d67..ff92ac458e 100644
--- a/packages/shorewall/shorewall_2.0.9.bb
+++ b/packages/shorewall/shorewall_2.0.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.shorewall.net/"
 LICENSE = "GPL"
 SECTION = "network"
 PRIORITY = "optional"
-FILE_PR = "r3"
+PR = "r3"
 
 RDEPENDS = "iptables"
 RRECOMMENDS = "kernel-module-ip-tables kernel-module-ip-conntrack kernel-module-ipt-conntrack kernel-module-ipt-multiport kernel-module-ipt-log kernel-module-ipt-mac kernel-module-ipt-mark kernel-module-ipt-masquerade kernel-module-ipt-pkttype kernel-module-ipt-reject kernel-module-ipt-state kernel-module-ipt-tos kernel-module-iptable-filter kernel-module-iptable-mangle kernel-module-iptable-nat"
diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index 0489406ab3..9929aa8c9f 100644
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sidplayer.sourceforge.net/"
 DEPENDS = "libsidplay"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://sidplayer.sourceforge.net/sidplayer.tar.gz \
            file://use-external-libsidplay.patch;patch=1 \
diff --git a/packages/simh/simh_3.7-1.bb b/packages/simh/simh_3.7-1.bb
index 1d7f2de3f5..6240fed4f9 100644
--- a/packages/simh/simh_3.7-1.bb
+++ b/packages/simh/simh_3.7-1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://simh.trailing-edge.com/"
 SECTION = "console/misc"
 LICENSE = "as-is"
 DEPENDS = "libpcap"
-FILE_PR = "r0"
+PR = "r0"
 
 URIPV = "${@bb.data.getVar('PV',d,1).replace('.','')}"
 SRC_URI = "http://simh.trailing-edge.com/sources/simhv${URIPV}.zip \
diff --git a/packages/simpad-utilities/genboot-native.bb b/packages/simpad-utilities/genboot-native.bb
index 39956f6a07..47b9b34640 100644
--- a/packages/simpad-utilities/genboot-native.bb
+++ b/packages/simpad-utilities/genboot-native.bb
@@ -1,5 +1,5 @@
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "Console utility for generating a SIMpad boot image for the proprietary SIEMENS Switzerland bootloader"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/genboot"
 SRC_URI = "file://gen_boot.c file://arnold_boot.h file://simpad-make-flashimg"
diff --git a/packages/sipsak/sipsak_0.9.6.bb b/packages/sipsak/sipsak_0.9.6.bb
index db509b569a..1d5cf8479b 100644
--- a/packages/sipsak/sipsak_0.9.6.bb
+++ b/packages/sipsak/sipsak_0.9.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "sipsak is a small command line tool for developers and administra
 of Session Initiation Protocol (SIP) applications."
 HOMEPAGE="sipsak.org"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "http://download.berlios.de/sipsak/sipsak-${PV}-1.tar.gz\
            file://sipsak.patch;patch=1"
 
diff --git a/packages/slang/slang_1.4.9.bb b/packages/slang/slang_1.4.9.bb
index fbc5fc3c83..492bd7d9a0 100644
--- a/packages/slang/slang_1.4.9.bb
+++ b/packages/slang/slang_1.4.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "slang is a library of text functions used in editors like slrn etc."
 SECTION = "libs"
 PRIORITY = "optional"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL Artistic"
 SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2 \
            file://configure.patch;patch=1 \
diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb
index 9e147af2eb..f026845228 100644
--- a/packages/slcalc/slcalc_1.2.1.bb
+++ b/packages/slcalc/slcalc_1.2.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Scientific calculator with user definable constants and functions
 HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm"
 SECTION = "opie/applications"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 APPTYPE = "binary"
 APPDESKTOP = "${S}"
diff --git a/packages/sliderulez/sliderulez_0.92.bb b/packages/sliderulez/sliderulez_0.92.bb
index c164a09a5a..e35e765310 100644
--- a/packages/sliderulez/sliderulez_0.92.bb
+++ b/packages/sliderulez/sliderulez_0.92.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gelhaus.net/cgi-bin/showpage.py?zaurus/+sliderulez.html"
 AUTHOR = "Matthew Gelhaus"
 SECTION = "opie/applications"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 APPTYPE = "binary"
 APPDESKTOP = "pkg/opt/QtPalmtop/apps/Applications"
diff --git a/packages/slrn/slrn_0.9.8.0.bb b/packages/slrn/slrn_0.9.8.0.bb
index eedcf5dc9b..b491023112 100644
--- a/packages/slrn/slrn_0.9.8.0.bb
+++ b/packages/slrn/slrn_0.9.8.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "slrn - console news reader"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "slang"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/slrn/slrn-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1 \
diff --git a/packages/slsnif/slsnif_0.4.4.bb b/packages/slsnif/slsnif_0.4.4.bb
index cb654f8fab..35e8e790a9 100644
--- a/packages/slsnif/slsnif_0.4.4.bb
+++ b/packages/slsnif/slsnif_0.4.4.bb
@@ -4,7 +4,7 @@ slsnif works transparently for both the device connected to the serial port \
 and the controlling software for this device."
 LICENSE = "GPL"
 SECTION = "console"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.dakotacom.net/~ymg/files/slsnif-${PV}.tar.gz"
 
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index f2a4907f65..67367d5192 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-FILE_PR = "r12"
+PR = "r12"
 
 RDEPENDS = "perl"
 
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 5d0a9b3270..2523e2e703 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-FILE_PR = "r90"
+PR = "r90"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index 972d9effb1..37b82c582c 100644
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb
index 79a9238a3d..4babf89d61 100644
--- a/packages/slugos-init/slugos-init_5.0.bb
+++ b/packages/slugos-init/slugos-init_5.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/slugtool/slugtool.bb b/packages/slugtool/slugtool.bb
index a8f5dc6a19..fb7497931f 100644
--- a/packages/slugtool/slugtool.bb
+++ b/packages/slugtool/slugtool.bb
@@ -1,7 +1,7 @@
 SECTION = "unknown"
 DESCRIPTION = "Slugtool is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device."
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 SRC_URI = "http://www.lantz.com/filemgmt_data/files/slugtool.tar.gz \
 	   file://redboot_typo.patch;patch=1"
diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb
index 7eca0f5c36..8b7d6f6ce9 100644
--- a/packages/slutils/slutils_0.1.0.bb
+++ b/packages/slutils/slutils_0.1.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION_sltime = "A ustility to save and restore the time on Sharp Linux bas
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit qmake update-rc.d
 
diff --git a/packages/snes232/snes232_cvs.bb b/packages/snes232/snes232_cvs.bb
index d27958aa1b..1424f86dfe 100644
--- a/packages/snes232/snes232_cvs.bb
+++ b/packages/snes232/snes232_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "unknown"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "GPL"
 INHIBIT_PACKAGE_STRIP = "1"
 
diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index ac6175605b..00e9fa0791 100644
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -3,7 +3,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 DEPENDS = "libsdl-qpe"
 LICENSE = "snes9x"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
 	   file://compile.patch;patch=1"
diff --git a/packages/snes9x/snes9x-sdl_1.39.bb b/packages/snes9x/snes9x-sdl_1.39.bb
index fa29f1a2de..ea4eb44666 100644
--- a/packages/snes9x/snes9x-sdl_1.39.bb
+++ b/packages/snes9x/snes9x-sdl_1.39.bb
@@ -3,7 +3,7 @@ SECTION = "games"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl zlib"
 LICENSE = "snes9x"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
 	   file://compile.patch;patch=1 \
diff --git a/packages/snes9x/snes9x_1.43-WIP1.bb b/packages/snes9x/snes9x_1.43-WIP1.bb
index 2c66f48a4d..0b746795f2 100644
--- a/packages/snes9x/snes9x_1.43-WIP1.bb
+++ b/packages/snes9x/snes9x_1.43-WIP1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/games"
-FILE_PR = "r3"
+PR = "r3"
 LICENSE = "snes9x"
 DEPENDS = "libxxf86dga libxxf86vm"
 DEPENDS_append_i686 = " nasm-native"
diff --git a/packages/socat/socat_1.3.2.1.bb b/packages/socat/socat_1.3.2.1.bb
index 0df124de9b..612987858b 100644
--- a/packages/socat/socat_1.3.2.1.bb
+++ b/packages/socat/socat_1.3.2.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "openssl"
 DESCRIPTION = "Socat is a relay for bidirectional data \
 transfer between two independent data channels."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
            file://xioopen.patch;patch=1 \
diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb
index 0d3f3121a5..accc58784f 100644
--- a/packages/sofia-sip/sofia-sip_1.11.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.11.7.bb
@@ -1,3 +1,3 @@
 require sofia-sip.inc
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/sofia-sip/sofia-sip_1.12.7.bb b/packages/sofia-sip/sofia-sip_1.12.7.bb
index 287e81e109..4c3eff14df 100644
--- a/packages/sofia-sip/sofia-sip_1.12.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.12.7.bb
@@ -1,3 +1,3 @@
 require sofia-sip.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
index f469568ebf..8070b89270 100644
--- a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
+++ b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Music composition program in the style of AMIGA Impulse Tracker"
 DEPENDS = "gtk+ libgnomeui audiofile esound alsa-lib"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2"
 S = "${WORKDIR}/soundtracker-${PV}.gtk2"
diff --git a/packages/soundtracker/soundtracker_0.6.8.bb b/packages/soundtracker/soundtracker_0.6.8.bb
index b56955d08e..a1afe70f29 100644
--- a/packages/soundtracker/soundtracker_0.6.8.bb
+++ b/packages/soundtracker/soundtracker_0.6.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.soundtracker.org"
 DEPENDS = "gtk+-1.2"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "http://www.soundtracker.org/dl/v0.6/soundtracker-${PV}.tar.gz"
diff --git a/packages/sox/sox_13.0.0.bb b/packages/sox/sox_13.0.0.bb
index b4508995e7..f5c554799d 100644
--- a/packages/sox/sox_13.0.0.bb
+++ b/packages/sox/sox_13.0.0.bb
@@ -4,7 +4,7 @@ and can apply different effects and filters to the audio data."
 HOMEPAGE = "http://sox.sourceforge.net"
 SECTION = "audio"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
          file://src-Makefile.am.patch;patch=1"
diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb
index deaafe5c36..cb43962def 100644
--- a/packages/spandsp/spandsp_0.0.3.bb
+++ b/packages/spandsp/spandsp_0.0.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
diff --git a/packages/spandsp/spandsp_0.0.4-pre16.bb b/packages/spandsp/spandsp_0.0.4-pre16.bb
index d4683535f3..cacdbc6ec7 100644
--- a/packages/spandsp/spandsp_0.0.4-pre16.bb
+++ b/packages/spandsp/spandsp_0.0.4-pre16.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz"
 
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
index 110d97f909..105c32312f 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
 RPROVIDES_${PN} += "speechd"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools update-rc.d
 
diff --git a/packages/speex/speex_1.2.bb b/packages/speex/speex_1.2.bb
index 723e56539e..9701646b1e 100644
--- a/packages/speex/speex_1.2.bb
+++ b/packages/speex/speex_1.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
 BETA = "1.2rc1"
 PV = "1.1+${BETA}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${BETA}.tar.gz"
 S = "${WORKDIR}/speex-${BETA}"
diff --git a/packages/sphyrna/sphyrna-python_svn.bb b/packages/sphyrna/sphyrna-python_svn.bb
index a284059c1c..011c496fe4 100644
--- a/packages/sphyrna/sphyrna-python_svn.bb
+++ b/packages/sphyrna/sphyrna-python_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna"
 LICENSE = "GPLv2"
 DEPENDS = "readline"
 PV = "0.0+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna"
 
diff --git a/packages/splashutils/splashutils_1.5.4.2.bb b/packages/splashutils/splashutils_1.5.4.2.bb
index adde9c00d8..36c11ab2de 100644
--- a/packages/splashutils/splashutils_1.5.4.2.bb
+++ b/packages/splashutils/splashutils_1.5.4.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Framebuffer splash utilities."
 SECTION = "media-gfx"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-${PV}.tar.bz2"
 
diff --git a/packages/sqlite/sqlite3_3.6.2.bb b/packages/sqlite/sqlite3_3.6.2.bb
index 39907a7b08..479516d261 100644
--- a/packages/sqlite/sqlite3_3.6.2.bb
+++ b/packages/sqlite/sqlite3_3.6.2.bb
@@ -1,3 +1,3 @@
 require sqlite3.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/sqlite/sqlite_2.8.17.bb b/packages/sqlite/sqlite_2.8.17.bb
index 4f28e16e08..b5939d9848 100644
--- a/packages/sqlite/sqlite_2.8.17.bb
+++ b/packages/sqlite/sqlite_2.8.17.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses"
 LICENSE = "PD"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
        file://mainmk_build_dynamic.patch;patch=1 \
diff --git a/packages/squashfs-tools/squashfs-lzma-tools_3.1r2.bb b/packages/squashfs-tools/squashfs-lzma-tools_3.1r2.bb
index 76abae1563..109ac95646 100644
--- a/packages/squashfs-tools/squashfs-lzma-tools_3.1r2.bb
+++ b/packages/squashfs-tools/squashfs-lzma-tools_3.1r2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
 DEPENDS = "lzma"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
 	   file://Makefile-3.1.patch;patch=1 \
diff --git a/packages/squashfs-tools/squashfs-tools-native_3.3.bb b/packages/squashfs-tools/squashfs-tools-native_3.3.bb
index 3f97b6ce36..87ba761ce4 100644
--- a/packages/squashfs-tools/squashfs-tools-native_3.3.bb
+++ b/packages/squashfs-tools/squashfs-tools-native_3.3.bb
@@ -1,5 +1,5 @@
 require squashfs-tools_${PV}.bb
-FILE_PR = "r0"
+PR = "r0"
 
 inherit native
 
diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
index 4d2bc42a67..25be0837d2 100644
--- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 DEPENDS = "lzma"
 SECTION = "base"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
 	   file://flags.patch;patch=1 \
diff --git a/packages/squashfs-tools/squashfs-tools_2.2r2.bb b/packages/squashfs-tools/squashfs-tools_2.2r2.bb
index a2a94fdc04..af1cc17e4f 100644
--- a/packages/squashfs-tools/squashfs-tools_2.2r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.2r2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 DEPENDS = "lzma"
 SECTION = "base"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
 	   file://Makefile-2.2.patch;patch=1 \
diff --git a/packages/squashfs-tools/squashfs-tools_3.1r2.bb b/packages/squashfs-tools/squashfs-tools_3.1r2.bb
index 00cf1ce56c..a4edad97b1 100644
--- a/packages/squashfs-tools/squashfs-tools_3.1r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_3.1r2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "zlib"
 
diff --git a/packages/squashfs-tools/squashfs-tools_3.3.bb b/packages/squashfs-tools/squashfs-tools_3.3.bb
index 61d3ca0807..2bf0a98ccb 100644
--- a/packages/squashfs-tools/squashfs-tools_3.3.bb
+++ b/packages/squashfs-tools/squashfs-tools_3.3.bb
@@ -1,5 +1,5 @@
 require squashfs-tools.inc
-FILE_PR = "r0"
+PR = "r0"
 
 # some release have .tgz, some have .tar.gz, so keep that outside the .inc file
 
diff --git a/packages/squeezeclient/squeezeslave_svn.bb b/packages/squeezeclient/squeezeslave_svn.bb
index 2db3a2b928..03fbb0ede0 100644
--- a/packages/squeezeclient/squeezeslave_svn.bb
+++ b/packages/squeezeclient/squeezeslave_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "command line audio playback client for SlimServer"
 LICENSE = "GPL"
 DEPENDS += "libmad flac libvorbis"
 PV = "3.0+svn-${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \
            file://varinit.patch;patch=1 \
diff --git a/packages/squid/squid_2.6.STABLE14.bb b/packages/squid/squid_2.6.STABLE14.bb
index 3c37f2e200..10c20c505e 100644
--- a/packages/squid/squid_2.6.STABLE14.bb
+++ b/packages/squid/squid_2.6.STABLE14.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 DEPENDS = "squid-native-${PV}"
 
 SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2 \
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index 7bc952d1d3..c8461ab29c 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DEPENDS = "openssl"
 DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
 LICENSE = "GPL"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
            file://ldflags.patch;patch=1 \
diff --git a/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb
index c98136ea52..5708045e73 100644
--- a/packages/stage-manager/stagemanager-native_0.0.1.bb
+++ b/packages/stage-manager/stagemanager-native_0.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Helper script for packaged-staging.bbclass"
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "file://stage-manager \
            file://stage-manager-ipkg \
diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb
index 59797604db..d16a3fe300 100644
--- a/packages/starling/starling_svn.bb
+++ b/packages/starling/starling_svn.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup libhandoff"
 PV = "0.2+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit gpe autotools
 
diff --git a/packages/strace/strace_4.5.11.bb b/packages/strace/strace_4.5.11.bb
index 5fc40aa1e6..8570172782 100644
--- a/packages/strace/strace_4.5.11.bb
+++ b/packages/strace/strace_4.5.11.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
-FILE_PR = "r2"
+PR = "r2"
 
 DESCRIPTION = "strace is a system call tracing tool."
 
diff --git a/packages/strace/strace_4.5.12.bb b/packages/strace/strace_4.5.12.bb
index 4ff869ebcc..3a15563100 100644
--- a/packages/strace/strace_4.5.12.bb
+++ b/packages/strace/strace_4.5.12.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 DESCRIPTION = "strace is a system call tracing tool."
 
diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb
index bfacd97879..cb697008b8 100644
--- a/packages/strace/strace_4.5.14.bb
+++ b/packages/strace/strace_4.5.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
 LICENSE = "GPL"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://glibc-2.5.patch;patch=1 \
diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb
index bc4172d73e..65b84bcf79 100644
--- a/packages/subapplet/subapplet_1.0.8.bb
+++ b/packages/subapplet/subapplet_1.0.8.bb
@@ -5,7 +5,7 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \
 	file://toolbar-resize-fix.patch;patch=1"
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index d02cea42cb..79e5e67d7b 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 DEPENDS = "apr-util-0.9.12 neon"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index 5c93499171..305b13c6a4 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "apr-util neon"
 RDEPENDS = "neon"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb
index 7a3172b96e..4871674cc8 100644
--- a/packages/subversion/subversion_1.4.3.bb
+++ b/packages/subversion/subversion_1.4.3.bb
@@ -5,7 +5,7 @@ RDEPENDS = "neon"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb
index 545a3ab0f8..d4f290590f 100644
--- a/packages/subversion/subversion_1.4.5.bb
+++ b/packages/subversion/subversion_1.4.5.bb
@@ -5,7 +5,7 @@ RDEPENDS = "neon"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
diff --git a/packages/sudo/sudo_1.6.8p12.bb b/packages/sudo/sudo_1.6.8p12.bb
index c88fc383cb..f3fa0c6880 100644
--- a/packages/sudo/sudo_1.6.8p12.bb
+++ b/packages/sudo/sudo_1.6.8p12.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
            file://nonrootinstall.patch;patch=1 \
diff --git a/packages/sugar/sugar-artwork_0.82.0.bb b/packages/sugar/sugar-artwork_0.82.0.bb
index 6da2eca211..4a1ab847e5 100644
--- a/packages/sugar/sugar-artwork_0.82.0.bb
+++ b/packages/sugar/sugar-artwork_0.82.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Sugar artwork"
 LICENSE = "GPLv2"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "sugar icon-slicer-native"
 
diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb
index 7d38d4ab0e..15c4e11f9d 100644
--- a/packages/sugar/sugar-base_0.82.0.bb
+++ b/packages/sugar/sugar-base_0.82.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-FILE_PR = "r11"
+PR = "r11"
 
 DEPENDS = "python-pygtk sugar-toolkit"
 RDEPENDS = "librsvg-gtk \
diff --git a/packages/sugar/sugar-datastore_0.82.0.bb b/packages/sugar/sugar-datastore_0.82.0.bb
index 6be2d32396..918a8d01e8 100644
--- a/packages/sugar/sugar-datastore_0.82.0.bb
+++ b/packages/sugar/sugar-datastore_0.82.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Sugar datastore"
 LICENSE = "GPLv2"
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "sugar-toolkit python-xappy "
 RDEPENDS = "sugar-toolkit sugar-base python-xappy"
diff --git a/packages/sugar/sugar_0.82.0.bb b/packages/sugar/sugar_0.82.0.bb
index f6d5de2350..480ec5001f 100644
--- a/packages/sugar/sugar_0.82.0.bb
+++ b/packages/sugar/sugar_0.82.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Sugar base system"
 LICENSE = "GPLv2"
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = "sugar-toolkit libxml2 gtk+"
 RDEPENDS = "sugar-toolkit sugar-base"
diff --git a/packages/supertux/supertux-qvga_0.1.3.bb b/packages/supertux/supertux-qvga_0.1.3.bb
index 04e04b9bbb..a38b8efbec 100644
--- a/packages/supertux/supertux-qvga_0.1.3.bb
+++ b/packages/supertux/supertux-qvga_0.1.3.bb
@@ -4,7 +4,7 @@ SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libsdl-gfx imagemagick-native pngcrush-native"
-FILE_PR = "r0.20"
+PR = "r0.20"
 
 APPIMAGE = "${WORKDIR}/supertux.png"
 APPDESKTOP = "${WORKDIR}/supertux.desktop"
diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb
index 337c791528..3afa425f1a 100644
--- a/packages/supertux/supertux_0.1.2.bb
+++ b/packages/supertux/supertux_0.1.2.bb
@@ -3,7 +3,7 @@ in a style similar to the original SuperMario games."
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 APPIMAGE = "${WORKDIR}/supertux.png"
 APPDESKTOP = "${WORKDIR}/supertux.desktop"
diff --git a/packages/supertux/supertux_0.1.3.bb b/packages/supertux/supertux_0.1.3.bb
index b75388c648..f90670738a 100644
--- a/packages/supertux/supertux_0.1.3.bb
+++ b/packages/supertux/supertux_0.1.3.bb
@@ -3,7 +3,7 @@ in a style similar to the original SuperMario games."
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 APPIMAGE = "${WORKDIR}/supertux.png"
 APPDESKTOP = "${WORKDIR}/supertux.desktop"
diff --git a/packages/swfdec/swfdec-mozilla_0.7.2.bb b/packages/swfdec/swfdec-mozilla_0.7.2.bb
index b8ebd51cbd..63499cfbd3 100644
--- a/packages/swfdec/swfdec-mozilla_0.7.2.bb
+++ b/packages/swfdec/swfdec-mozilla_0.7.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
 RDEPENDS = "gst-ffmpeg"
diff --git a/packages/sword/sword_1.5.10.bb b/packages/sword/sword_1.5.10.bb
index c4faf104d1..151bba366d 100644
--- a/packages/sword/sword_1.5.10.bb
+++ b/packages/sword/sword_1.5.10.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 HOMEPAGE = "http://www.e-sword.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
 
diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb
index 64ce89079c..303d7f9fcc 100644
--- a/packages/sword/sword_1.5.9.bb
+++ b/packages/sword/sword_1.5.9.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 HOMEPAGE = "http://www.e-sword.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz \
            file://gcc-visibility.patch;patch=1"
diff --git a/packages/swt/swt3.3-gtk_3.3.1.bb b/packages/swt/swt3.3-gtk_3.3.1.bb
index 2b8b96b54c..82860edfb3 100644
--- a/packages/swt/swt3.3-gtk_3.3.1.bb
+++ b/packages/swt/swt3.3-gtk_3.3.1.bb
@@ -1,6 +1,6 @@
 require swt-gtk.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip \
            file://Makefile"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.4.bb b/packages/swt/swt3.4-gtk-hildon_3.4.bb
index 789223b320..667e516fa0 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.4.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.4.bb
@@ -1,6 +1,6 @@
 require swt3.4-gtk_${PV}.bb
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "libhildon libhildonfm"
 
diff --git a/packages/swt/swt3.4-gtk_3.4.bb b/packages/swt/swt3.4-gtk_3.4.bb
index e976608e36..b6eafcad8c 100644
--- a/packages/swt/swt3.4-gtk_3.4.bb
+++ b/packages/swt/swt3.4-gtk_3.4.bb
@@ -1,6 +1,6 @@
 require swt-gtk.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \
            file://Makefile"
diff --git a/packages/sylpheed/claws-mail_3.3.0.bb b/packages/sylpheed/claws-mail_3.3.0.bb
index caa5e860aa..29e7a5bc63 100644
--- a/packages/sylpheed/claws-mail_3.3.0.bb
+++ b/packages/sylpheed/claws-mail_3.3.0.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ libetpan openssl aspell"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2	\
diff --git a/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb b/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb
index a71519bc58..5ca95d9dfb 100644
--- a/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb
+++ b/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "claws-mail gtkhtml2 curl"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
 
diff --git a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
index dd3b9b3314..cfa26a464e 100644
--- a/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
+++ b/packages/sylpheed/claws-plugin-mailmbox_1.14.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "claws-mail"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
 
diff --git a/packages/sylpheed/claws-plugin-rssyl_0.18.bb b/packages/sylpheed/claws-plugin-rssyl_0.18.bb
index 6ce21abb22..29fc245ac4 100644
--- a/packages/sylpheed/claws-plugin-rssyl_0.18.bb
+++ b/packages/sylpheed/claws-plugin-rssyl_0.18.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent plugins"
 DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
 
diff --git a/packages/sylpheed/sylpheed_2.2.9.bb b/packages/sylpheed/sylpheed_2.2.9.bb
index ac913663fa..b22512b32f 100644
--- a/packages/sylpheed/sylpheed_2.2.9.bb
+++ b/packages/sylpheed/sylpheed_2.2.9.bb
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \
 	file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index ccd258cbbf..2aa7152425 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 SECTION = "x11/utils"
 # NOTE: This depends on full x11, not diet-x11
 DEPENDS = "libx11 libxtst"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"
 
diff --git a/packages/synergy/synergy_1.3.1.bb b/packages/synergy/synergy_1.3.1.bb
index e9e36a1cc0..d46cb47203 100644
--- a/packages/synergy/synergy_1.3.1.bb
+++ b/packages/synergy/synergy_1.3.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 SECTION = "x11/utils"
 # NOTE: This depends on full x11, not diet-x11
 DEPENDS = "libx11 libxtst"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz \
            file://synergy-1.3.1+gcc-4.3.patch;patch=1"
diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb
index 36fa96bae0..608868f197 100644
--- a/packages/sysconf/sysconf_0.1.bb
+++ b/packages/sysconf/sysconf_0.1.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "devio cpio findutils diffutils"
-FILE_PR = "r10"
+PR = "r10"
 
 # Currently, the scripts only support ixp4xx machines.
 # Feel free to add to the scripts ...
diff --git a/packages/sysfsutils/sysfsutils_1.3.0.bb b/packages/sysfsutils/sysfsutils_1.3.0.bb
index 369bf2b11b..11e4ca7e9a 100644
--- a/packages/sysfsutils/sysfsutils_1.3.0.bb
+++ b/packages/sysfsutils/sysfsutils_1.3.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r2"
+PR = "r2"
 SECTION = "base"
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
diff --git a/packages/sysfsutils/sysfsutils_2.0.0.bb b/packages/sysfsutils/sysfsutils_2.0.0.bb
index dfa25b4708..f59dfa0feb 100644
--- a/packages/sysfsutils/sysfsutils_2.0.0.bb
+++ b/packages/sysfsutils/sysfsutils_2.0.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
 LICENSE = "GPLv2"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
 S = "${WORKDIR}/sysfsutils-${PV}"
diff --git a/packages/sysfsutils/sysfsutils_2.1.0.bb b/packages/sysfsutils/sysfsutils_2.1.0.bb
index 8de48e59c4..4f540d5181 100644
--- a/packages/sysfsutils/sysfsutils_2.1.0.bb
+++ b/packages/sysfsutils/sysfsutils_2.1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
 	   file://get_mnt_path_check.patch;patch=1"
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index f35321fb9a..6fe5491e6d 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -1,4 +1,4 @@
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \
          file://edx_assume_zero.patch;patch=1"
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
index b077f468dc..4eb8c4f075 100644
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -1,4 +1,4 @@
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 "
 
diff --git a/packages/syslog-ng/syslog-ng_1.6.11.bb b/packages/syslog-ng/syslog-ng_1.6.11.bb
index 4bb9d29c00..794ad5335c 100644
--- a/packages/syslog-ng/syslog-ng_1.6.11.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.11.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
           file://syslog-ng.conf \
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index 4aebdf897f..d8e02d0da2 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r9"
+PR = "r9"
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 
diff --git a/packages/syslog-ng/syslog-ng_2.0.5.bb b/packages/syslog-ng/syslog-ng_2.0.5.bb
index 7518576ad2..80f0fc59c6 100644
--- a/packages/syslog-ng/syslog-ng_2.0.5.bb
+++ b/packages/syslog-ng/syslog-ng_2.0.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex eventlog glib-2.0"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/${P}.tar.gz \
           file://syslog-ng.conf \
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index d271caf51e..64090bf80f 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-FILE_PR = "r42"
+PR = "r42"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb
index c38c144410..5da31f7d09 100644
--- a/packages/t1lib/t1lib_5.0.2.bb
+++ b/packages/t1lib/t1lib_5.0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A Type1 Font Rastering Library"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "LGPL GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb
index 1524507776..e50eeb6490 100644
--- a/packages/taglib/taglib_1.4.bb
+++ b/packages/taglib/taglib_1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve
 SECTION = "libs/multimedia"
 HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
            file://taglib_1.4-8.diff.gz;patch=1"
diff --git a/packages/tangogps/tangogps_0.9.3.bb b/packages/tangogps/tangogps_0.9.3.bb
index dee2525477..59020fd6bd 100644
--- a/packages/tangogps/tangogps_0.9.3.bb
+++ b/packages/tangogps/tangogps_0.9.3.bb
@@ -1,3 +1,3 @@
 require tangogps.inc
-FILE_PR = "r3"
+PR = "r3"
 
diff --git a/packages/tapioca/libjingle-tapioca_0.3.10.bb b/packages/tapioca/libjingle-tapioca_0.3.10.bb
index e40e00132f..9ea27e691b 100644
--- a/packages/tapioca/libjingle-tapioca_0.3.10.bb
+++ b/packages/tapioca/libjingle-tapioca_0.3.10.bb
@@ -1,7 +1,7 @@
 LICENSE = "BERKLEY"
 DEPENDS = "openssl ortp speex expat"
 PROVIDES = "libjingle"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/libjingle-${PV}.tar.gz"
 
diff --git a/packages/tapioca/tapiocaui_0.3.9.1.bb b/packages/tapioca/tapiocaui_0.3.9.1.bb
index b321cfb5a5..5cbae99477 100644
--- a/packages/tapioca/tapiocaui_0.3.9.1.bb
+++ b/packages/tapioca/tapiocaui_0.3.9.1.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 dbus gconf tapioca-xmpp tapioca farsight gst-plugins-farsight"
 RDEPENDS = "tapioca-xmpp"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/${P}.tar.gz"
 
diff --git a/packages/tar/tar_1.13.93.bb b/packages/tar/tar_1.13.93.bb
index ad7b70fe0e..6c7139595f 100644
--- a/packages/tar/tar_1.13.93.bb
+++ b/packages/tar/tar_1.13.93.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "GNU tar saves many files together into a single tape \
 or disk archive, and can restore individual files from the archive."
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/tar/tar-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
index 257c022bf4..cf505370e9 100644
--- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb
+++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz"
 
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 48584aa649..57a711577c 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 08c062f74b..4c17eeaa04 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-FILE_PR = "r45"
+PR = "r45"
 
 inherit task
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index 25c3c2c1a1..f2d25e32ac 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 7ed360405e..e93a66273f 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta-package for DVB application"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit task
 
diff --git a/packages/tasks/task-e-x11.bb b/packages/tasks/task-e-x11.bb
index 828f1a2b69..3663532527 100644
--- a/packages/tasks/task-e-x11.bb
+++ b/packages/tasks/task-e-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tasks for Enlightenment/X11"
-FILE_PR = "r10"
+PR = "r10"
 
 inherit task
 
diff --git a/packages/tasks/task-efl.bb b/packages/tasks/task-efl.bb
index 8533009dc7..20c8954754 100644
--- a/packages/tasks/task-efl.bb
+++ b/packages/tasks/task-efl.bb
@@ -16,6 +16,6 @@ RDEPENDS = "\
   etk \
   epdf \
 "
-FILE_PR = "r0"
+PR = "r0"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-fonts-truetype.bb b/packages/tasks/task-fonts-truetype.bb
index 7cff6f9c98..cd8000316c 100644
--- a/packages/tasks/task-fonts-truetype.bb
+++ b/packages/tasks/task-fonts-truetype.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Install one of these tasks to get support for truetype fonts."
 SECTION = "fonts"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit task
 
diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb
index c331d7a8d0..a3dcfe9c8d 100644
--- a/packages/tasks/task-fso-compliance.bb
+++ b/packages/tasks/task-fso-compliance.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The freesmartphone.org framework -- install this task to make you
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit task
 
diff --git a/packages/tasks/task-gmae.bb b/packages/tasks/task-gmae.bb
index 2aae904e66..73710f8ffa 100644
--- a/packages/tasks/task-gmae.bb
+++ b/packages/tasks/task-gmae.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNOME Mobile & Embedded Initiative"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
index 8a6a360d07..058a3fd6b1 100644
--- a/packages/tasks/task-gpe-apps.bb
+++ b/packages/tasks/task-gpe-apps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Application task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index 11e88df4cf..66031ffce7 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
-FILE_PR = "r9"
+PR = "r9"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
index 1be974aec4..7babc03c56 100644
--- a/packages/tasks/task-gpe-connectivity.bb
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
index 1dad036881..25c055f446 100644
--- a/packages/tasks/task-gpe-desktopapps.bb
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
index 62a99b2b3e..335f64031e 100644
--- a/packages/tasks/task-gpe-games.bb
+++ b/packages/tasks/task-gpe-games.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Games task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
index 02517325a2..c6e6c22e6c 100644
--- a/packages/tasks/task-gpe-pim.bb
+++ b/packages/tasks/task-gpe-pim.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
index 1815a1bf91..84302fdf5a 100644
--- a/packages/tasks/task-gpe-settings.bb
+++ b/packages/tasks/task-gpe-settings.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Settings task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
index 900767bd88..674dd86224 100644
--- a/packages/tasks/task-gpe-web.bb
+++ b/packages/tasks/task-gpe-web.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index 6415494339..bc5105f6a8 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index e3eba8f077..a77233bedc 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-FILE_PR = "r10"
+PR = "r10"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-java-gtk.bb b/packages/tasks/task-java-gtk.bb
index 9fd813dd5f..b4f75920f3 100644
--- a/packages/tasks/task-java-gtk.bb
+++ b/packages/tasks/task-java-gtk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task package for Java GTK applications"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-java.bb b/packages/tasks/task-java.bb
index ea6ac12cc6..be94662d40 100644
--- a/packages/tasks/task-java.bb
+++ b/packages/tasks/task-java.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Base task package for Java"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-maemo.bb b/packages/tasks/task-maemo.bb
index 74715b83a8..a4f16ac3a4 100644
--- a/packages/tasks/task-maemo.bb
+++ b/packages/tasks/task-maemo.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Task package for maemo environment"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGES = "\
     maemo-task-base \
diff --git a/packages/tasks/task-mamona-base.bb b/packages/tasks/task-mamona-base.bb
index 4a90d7505a..76f84ccaac 100644
--- a/packages/tasks/task-mamona-base.bb
+++ b/packages/tasks/task-mamona-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "task mamona base"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-devel.bb b/packages/tasks/task-mamona-devel.bb
index fb943bc54b..a1d8d2398d 100644
--- a/packages/tasks/task-mamona-devel.bb
+++ b/packages/tasks/task-mamona-devel.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for development"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-e.bb b/packages/tasks/task-mamona-e.bb
index afaa78e21c..cc8af8b3f9 100644
--- a/packages/tasks/task-mamona-e.bb
+++ b/packages/tasks/task-mamona-e.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for Enlightenment on Mamona"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-extras.bb b/packages/tasks/task-mamona-extras.bb
index dd6b6c00f1..7a5e7a6a29 100644
--- a/packages/tasks/task-mamona-extras.bb
+++ b/packages/tasks/task-mamona-extras.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona extras: Dummy package to build extra packages to mamona repository"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-noemu.bb b/packages/tasks/task-mamona-noemu.bb
index 9a3927ac4d..73659593dd 100644
--- a/packages/tasks/task-mamona-noemu.bb
+++ b/packages/tasks/task-mamona-noemu.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Noemu packages are i386 packages thar run inside ARM chroot environment"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-nokia-it.bb b/packages/tasks/task-mamona-nokia-it.bb
index 8c6d20c12b..05bc7e773c 100644
--- a/packages/tasks/task-mamona-nokia-it.bb
+++ b/packages/tasks/task-mamona-nokia-it.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for Mamona run on Nokia Internet Tablets"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 ALLOW_EMPTY = "1"
 
 RDEPENDS = "\
diff --git a/packages/tasks/task-mamona.bb b/packages/tasks/task-mamona.bb
index fb12bd8771..67c8ed524f 100644
--- a/packages/tasks/task-mamona.bb
+++ b/packages/tasks/task-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona: Build and Install Mamona Platform"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 6048b314bc..1575b41780 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit task
 
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index 3efeb0de99..1a89d1b792 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta-package for MythTV diskless frontend"
-FILE_PR = "r16"
+PR = "r16"
 
 inherit task
 
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
index 5304a88207..6924ff5388 100644
--- a/packages/tasks/task-nas-server.bb
+++ b/packages/tasks/task-nas-server.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for a Network Attached Storage server"
 LICENSE = "MIT"
 PROVIDES = "task-nas-server-everything"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index 32a9a2ae5e..61b6fc0279 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -5,7 +5,7 @@ RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \
 	    make virtual-libc-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
 	    patch patchutils diffstat diffutils libstdc++-dev"
-FILE_PR = "r3"
+PR = "r3"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index faf6961ebb..34739285ec 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 0f645795d0..964b623dca 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r59"
+PR = "r59"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
index 55d2c87797..b8efd5e01e 100644
--- a/packages/tasks/task-openmoko-examples.bb
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
\ No newline at end of file
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index c87ad47f91..40e97585ea 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r42"
+PR = "r42"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
index df10fa8d85..c4aaa70779 100644
--- a/packages/tasks/task-openmoko-games.bb
+++ b/packages/tasks/task-openmoko-games.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r72"
+PR = "r72"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
index b29a3d6d38..da787c62c0 100644
--- a/packages/tasks/task-openmoko-linux.bb
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb
index 507e18d30e..56f6824df4 100644
--- a/packages/tasks/task-openmoko-native-sdk.bb
+++ b/packages/tasks/task-openmoko-native-sdk.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Native SDK"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r58"
+PR = "r58"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
index 1df4788116..d58b05aa62 100644
--- a/packages/tasks/task-openmoko-net.bb
+++ b/packages/tasks/task-openmoko-net.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index fc43c52545..306ff058dd 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
index 09c50f1941..eb3195dffb 100644
--- a/packages/tasks/task-openmoko-pim.bb
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r72"
+PR = "r72"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index f09679ed74..a493183865 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
index 1fe996d999..d243481010 100644
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb
index fb24b2935c..142990602c 100644
--- a/packages/tasks/task-openmoko-toolchain-target.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
index b86d65de98..71020afef6 100644
--- a/packages/tasks/task-openmoko-ui.bb
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: GUI for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index dfeb6a2d6b..6c195ba078 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openprotium.bb b/packages/tasks/task-openprotium.bb
index 7f09cde157..4c5d762f8f 100644
--- a/packages/tasks/task-openprotium.bb
+++ b/packages/tasks/task-openprotium.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image for openprotium"
 HOMEPAGE = "http://www.openprotium.org"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
index 6d6a1d0711..859a0f5feb 100644
--- a/packages/tasks/task-opie-16mb.bb
+++ b/packages/tasks/task-opie-16mb.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit task
 
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 06c4ef68db..9f1403f050 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"

 SECTION = "opie/base"

 LICENSE = "MIT"

-FILE_PR = "r2"

+PR = "r2"

 

 inherit task

 

diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
index 0cad796022..4449c7aaae 100644
--- a/packages/tasks/task-opie-games.bb
+++ b/packages/tasks/task-opie-games.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"

 SECTION = "opie/base"

 LICENSE = "MIT"

-FILE_PR = "r1"

+PR = "r1"

 

 inherit task

 

diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 6e09ebf224..41dd92ac7a 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
 
-FILE_PR = "r12"
+PR = "r12"
 
 inherit task
 
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index e890a2a55f..6e1cd5d895 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Full versions of tools provided by busybox"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit task
 
diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
index 3fd803d78d..34efbeab6b 100644
--- a/packages/tasks/task-python-efl-examples.bb
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -10,6 +10,6 @@ RDEPENDS = "\
   python-epsilon-examples \
   python-math python-textutils \
 "
-FILE_PR = "ml4"
+PR = "ml4"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-efl.bb b/packages/tasks/task-python-efl.bb
index 191c1bd3a0..d7b2d694dd 100644
--- a/packages/tasks/task-python-efl.bb
+++ b/packages/tasks/task-python-efl.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
 RDEPENDS = "python-evas python-ecore python-emotion python-edje python-etk python-epsilon python-edbus"
-FILE_PR = "ml3"
+PR = "ml3"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index b47d2a24fe..6c8e21ebd9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-FILE_PR = "ml34"
+PR = "ml34"
 
 RDEPENDS = "\
 		python-ao 		\
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index 3659d938bd..5dbd59d18a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Everything Python for SharpROM"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-FILE_PR = "ml6"
+PR = "ml6"
 
 NONWORKING = "\
 		python-codes		\
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 1bac3442de..c13b5d48ef 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r10"
+PR = "r10"
 
 inherit task
 
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
index 61505ad9c1..4041b27536 100644
--- a/packages/tasks/task-sdk-base.bb
+++ b/packages/tasks/task-sdk-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic SDK development packages"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
index 6f75985391..efb12c3cfb 100644
--- a/packages/tasks/task-sdk-extra.bb
+++ b/packages/tasks/task-sdk-extra.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-FILE_PR = "r8"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb
index 3f3f9c4c61..56b398b04e 100644
--- a/packages/tasks/task-sdk-gpephone.bb
+++ b/packages/tasks/task-sdk-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for GPE Phone Edition"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-host.bb b/packages/tasks/task-sdk-host.bb
index 2683bef79d..a8ac3706c4 100644
--- a/packages/tasks/task-sdk-host.bb
+++ b/packages/tasks/task-sdk-host.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
index 853e88b1f7..a38e58385f 100644
--- a/packages/tasks/task-sdk-opie.bb
+++ b/packages/tasks/task-sdk-opie.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages for Opie"
-FILE_PR = "r7"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb
index 2cb8892746..930de7cd2e 100644
--- a/packages/tasks/task-sdk-sbox-gpe.bb
+++ b/packages/tasks/task-sdk-sbox-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
index 6df7e5bb96..2d73fe2716 100644
--- a/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index 80cd071f79..79e9fefc2a 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-FILE_PR = "r8"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdl.bb b/packages/tasks/task-sdl.bb
index 31e14275a6..3cda723e87 100644
--- a/packages/tasks/task-sdl.bb
+++ b/packages/tasks/task-sdl.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tasks for SDL stuff"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit task
 
diff --git a/packages/tasks/task-slugos-toolchain-host.bb b/packages/tasks/task-slugos-toolchain-host.bb
index fd358c7c7f..7550301bfd 100644
--- a/packages/tasks/task-slugos-toolchain-host.bb
+++ b/packages/tasks/task-slugos-toolchain-host.bb
@@ -1,5 +1,5 @@
 require task-sdk-host.bb
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Packages for a standalone SlugOS external toolchain"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 23ce32cba1..e1092b68d9 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-FILE_PR = "r21"
+PR = "r21"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb
index b84efec516..a477c6e8c5 100644
--- a/packages/tasks/task-x11-illume.bb
+++ b/packages/tasks/task-x11-illume.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Illume Windowing Environment -- install this task to get the
 SECTION = "x11/wm"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 # WORK IN PROGRESS
 
diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb
index ce1fa79bba..ad5ca3a412 100644
--- a/packages/tasks/task-x11.bb
+++ b/packages/tasks/task-x11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 # WORK IN PROGRESS
 
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index b734341c54..239725feaa 100644
--- a/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "All packages required for an base XFCE installation"
 LICENSE = "MIT"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit task
 
diff --git a/packages/tasks/task-xterminal.bb b/packages/tasks/task-xterminal.bb
index 588ccc79a6..f2975132e9 100644
--- a/packages/tasks/task-xterminal.bb
+++ b/packages/tasks/task-xterminal.bb
@@ -1,6 +1,6 @@
 PACKAGES = "task-xterminal"
 DESCRIPTION = "Meta-package for diskless X terminal"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb
index c65bbff8ce..4bf3efd786 100644
--- a/packages/tcltk/tcl_8.4.11.bb
+++ b/packages/tcltk/tcl_8.4.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language"
 LICENSE = "tcl"
 SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
            file://tcl-add-soname.patch;patch=1 \
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index 02ab7725df..85b5124173 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -4,7 +4,7 @@ SECTION = "devel/tcltk"
 HOMEPAGE = "http://tcl.sourceforge.net"
 DEPENDS = "tcl virtual/libx11 libxt"
 RDEPENDS = "tcl"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
            file://disable-xim.patch;patch=1;pnum=0 \
diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
index aee9706ceb..a047c55a26 100644
--- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
 LICENSE = "tcp-wrappers"
 PRIORITY = "optional"
 SECTION = "console/network"
-FILE_PR ="r2"
+PR ="r2"
 
 
 PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
diff --git a/packages/tcptraceroute/tcptraceroute_1.5beta6.bb b/packages/tcptraceroute/tcptraceroute_1.5beta6.bb
index fbe66b2d8c..29b7830a26 100644
--- a/packages/tcptraceroute/tcptraceroute_1.5beta6.bb
+++ b/packages/tcptraceroute/tcptraceroute_1.5beta6.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://michael.toren.net/code/tcptraceroute/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 DEPENDS = "libnet-1.1"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://michael.toren.net/code/tcptraceroute/tcptraceroute-${PV}.tar.gz \
 	   file://configure.ac.patch;patch=1"
diff --git a/packages/tea/tea_17.3.5.bb b/packages/tea/tea_17.3.5.bb
index 42e2d6b5a3..c8dac8c94f 100644
--- a/packages/tea/tea_17.3.5.bb
+++ b/packages/tea/tea_17.3.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tea - a GTK based text editor with highlighting and a lot of proc
 SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gtksourceview"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/telepathy/empathy_0.1.bb b/packages/telepathy/empathy_0.1.bb
index bc1b120bcc..d76f17051c 100644
--- a/packages/telepathy/empathy_0.1.bb
+++ b/packages/telepathy/empathy_0.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \
         file://no-gnome.diff;patch=1"
diff --git a/packages/telepathy/empathy_0.14.bb b/packages/telepathy/empathy_0.14.bb
index 047e0aaf74..6c3c15ef2c 100644
--- a/packages/telepathy/empathy_0.14.bb
+++ b/packages/telepathy/empathy_0.14.bb
@@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
-FILE_PR ="r0"
+PR ="r0"
 
 inherit gnome
 
diff --git a/packages/telepathy/empathy_0.4.bb b/packages/telepathy/empathy_0.4.bb
index 06e88428f3..97df361d3d 100644
--- a/packages/telepathy/empathy_0.4.bb
+++ b/packages/telepathy/empathy_0.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
-FILE_PR ="r0"
+PR ="r0"
 
 inherit gnome
 
diff --git a/packages/telepathy/empathy_0.5.bb b/packages/telepathy/empathy_0.5.bb
index 15de647357..6774b6b027 100644
--- a/packages/telepathy/empathy_0.5.bb
+++ b/packages/telepathy/empathy_0.5.bb
@@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
-FILE_PR ="r1"
+PR ="r1"
 
 inherit gnome
 
diff --git a/packages/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb
index 4971a91d77..ff304f918e 100644
--- a/packages/telepathy/empathy_2.23.90.bb
+++ b/packages/telepathy/empathy_2.23.90.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "telepathy-gabble"
 inherit gnome
 
 PARALLEL_MAKE = ""
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGES =+ "empathy-scrollkeeper-junk"
 FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
diff --git a/packages/telepathy/libtelepathy_0.0.53.bb b/packages/telepathy/libtelepathy_0.0.53.bb
index 0708220e43..f3e4f37521 100644
--- a/packages/telepathy/libtelepathy_0.0.53.bb
+++ b/packages/telepathy/libtelepathy_0.0.53.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz"
 
diff --git a/packages/telepathy/libtelepathy_0.2.0.bb b/packages/telepathy/libtelepathy_0.2.0.bb
index fdd310366c..d30b301d38 100644
--- a/packages/telepathy/libtelepathy_0.2.0.bb
+++ b/packages/telepathy/libtelepathy_0.2.0.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz"
 
diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb
index 23d7fc9cdf..3f34081379 100644
--- a/packages/telepathy/libtelepathy_0.3.3.bb
+++ b/packages/telepathy/libtelepathy_0.3.3.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "telepathy-glib glib-2.0 dbus"
 LICENSE = "LGPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz"
 
diff --git a/packages/telepathy/telepathy-mission-control_4.21.bb b/packages/telepathy/telepathy-mission-control_4.21.bb
index 0e865b5fc7..6d43b805bd 100644
--- a/packages/telepathy/telepathy-mission-control_4.21.bb
+++ b/packages/telepathy/telepathy-mission-control_4.21.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://mission-control.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "libtelepathy dbus-glib gconf"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
 
diff --git a/packages/telepathy/telepathy-mission-control_4.22.bb b/packages/telepathy/telepathy-mission-control_4.22.bb
index 59f686b570..a0afbb068f 100644
--- a/packages/telepathy/telepathy-mission-control_4.22.bb
+++ b/packages/telepathy/telepathy-mission-control_4.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://mission-control.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "libtelepathy dbus-glib gconf"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
 
diff --git a/packages/telepathy/telepathy-mission-control_4.45.bb b/packages/telepathy/telepathy-mission-control_4.45.bb
index 59f686b570..a0afbb068f 100644
--- a/packages/telepathy/telepathy-mission-control_4.45.bb
+++ b/packages/telepathy/telepathy-mission-control_4.45.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://mission-control.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "libtelepathy dbus-glib gconf"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
 
diff --git a/packages/telepathy/telepathy-mission-control_4.67.bb b/packages/telepathy/telepathy-mission-control_4.67.bb
index 6dd1fdadb9..418a265512 100644
--- a/packages/telepathy/telepathy-mission-control_4.67.bb
+++ b/packages/telepathy/telepathy-mission-control_4.67.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://mission-control.sourceforge.net/"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "libtelepathy dbus-glib gconf"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
 
diff --git a/packages/teleport/teleport_0.33.bb b/packages/teleport/teleport_0.33.bb
index 16c2a08248..8ebb7801e6 100644
--- a/packages/teleport/teleport_0.33.bb
+++ b/packages/teleport/teleport_0.33.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
 SECTION = "gpe"
 PRIORITY = "optional"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI =+ "file://crypt.c \
 		file://fix-desktop.patch;patch=1 \
diff --git a/packages/thc/hydra_4.4.bb b/packages/thc/hydra_4.4.bb
index 3834f0c753..4794027f2b 100644
--- a/packages/thc/hydra_4.4.bb
+++ b/packages/thc/hydra_4.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A very fast network logon cracker which support many different se
 SECTION = "console/network"
 DEPENDS = "openssl"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://thc.org/releases/hydra-${PV}-src.tar.gz"
 S = "${WORKDIR}/hydra-${PV}-src"
diff --git a/packages/thc/hydra_4.5.bb b/packages/thc/hydra_4.5.bb
index 2d20869d7e..fa7063687c 100644
--- a/packages/thc/hydra_4.5.bb
+++ b/packages/thc/hydra_4.5.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://thc.org/thc-hydra/"
 SECTION = "console/network"
 DEPENDS = "openssl"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://thc.org/releases/hydra-${PV}-src.tar.gz"
 S = "${WORKDIR}/hydra-${PV}-src"
diff --git a/packages/thc/thcrut_1.2.5.bb b/packages/thc/thcrut_1.2.5.bb
index 46dc213ed1..f4e2b5bd7c 100644
--- a/packages/thc/thcrut_1.2.5.bb
+++ b/packages/thc/thcrut_1.2.5.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 DEPENDS = "libpcre openssl libnet libpcap"
 HOMEPAGE = "http://thc.org/thc-rut/"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz \
 	   file://configure_in.patch;patch=1;pnum=0"
diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb
index a88a416bbd..6beb01f3d6 100644
--- a/packages/thttpd/thttpd_2.25b.bb
+++ b/packages/thttpd/thttpd_2.25b.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server."
 LICENSE = "BSD"
 HOMEPAGE = "http://www.acme.com/software/thttpd/"
-FILE_PR ="r6"
+PR ="r6"
 
 SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \
 	   file://install.patch;patch=1 \
diff --git a/packages/tickypip/tickypip-levels_1.1.bb b/packages/tickypip/tickypip-levels_1.1.bb
index 3cf27a6731..c24044a168 100644
--- a/packages/tickypip/tickypip-levels_1.1.bb
+++ b/packages/tickypip/tickypip-levels_1.1.bb
@@ -6,7 +6,7 @@ SRC_DISTRIBUTE_LICENSES += "${PN}"
 AUTHOR = "NetWalk Group <netwalkgroup@hotmail.com>"
 RDEPENDS = "tickypip"
 PACKAGE_ARCH = "all"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/tickypip-levels_${PV}.tar.bz2"
 
diff --git a/packages/tickypip/tickypip_0.1.2.bb b/packages/tickypip/tickypip_0.1.2.bb
index f670595b36..782803ba96 100644
--- a/packages/tickypip/tickypip_0.1.2.bb
+++ b/packages/tickypip/tickypip_0.1.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 AUTHOR = "Christian Hammond"
 HOMEPAGE = "http://www.chipx86.com/projects/tickypip/"
 RRECOMMENDS = "tickypip-levels"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.chipx86.com/packages/ipkg/tickypip-0.1.2.tar.gz \
            file://tickypip.desktop \
diff --git a/packages/timesleuth/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb
index 2166df3f9e..655e9fd50c 100644
--- a/packages/timesleuth/timesleuth_1.0.5.bb
+++ b/packages/timesleuth/timesleuth_1.0.5.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 AUTHOR = "Dafydd Walters"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-TimeSleuth.html"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/timesleuth_V1.05ern.tar.gz "
 
diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb
index 589058e6b6..3adfc536df 100644
--- a/packages/tin/tin_1.9.1.bb
+++ b/packages/tin/tin_1.9.1.bb
@@ -1,6 +1,6 @@
 require tin.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
diff --git a/packages/tinc/tinc_1.0.2.bb b/packages/tinc/tinc_1.0.2.bb
index 0cc6764726..26a97ed38a 100644
--- a/packages/tinc/tinc_1.0.2.bb
+++ b/packages/tinc/tinc_1.0.2.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION ="tinc is a Virtual Private Network (VPN) daemon"
 HOMEPAGE = "http://www.tinc-vpn.org/"
 LICENSE = "GPLv2"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI="http://www.tinc-vpn.org/packages/tinc-1.0.2.tar.gz \
 	file://mtu-vlan.diff;patch=1 \
diff --git a/packages/tinylogin/tinylogin_1.4.bb b/packages/tinylogin/tinylogin_1.4.bb
index 814cdea415..43a7f10755 100644
--- a/packages/tinylogin/tinylogin_1.4.bb
+++ b/packages/tinylogin/tinylogin_1.4.bb
@@ -5,7 +5,7 @@ changing passwords, and otherwise maintaining users \
 and groups on an embedded system."
 HOMEPAGE = "http://tinylogin.tinylogin.net/"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "http://tinylogin.tinylogin.net/downloads/tinylogin-${PV}.tar.bz2 \
 	file://cvs-20040608.patch;patch=1;pnum=1 \
diff --git a/packages/tinymail/libtinymail_svn.bb b/packages/tinymail/libtinymail_svn.bb
index 623fa7ce33..7d396fe968 100644
--- a/packages/tinymail/libtinymail_svn.bb
+++ b/packages/tinymail/libtinymail_svn.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
 PV = "0.0.5+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/tinymail/tmut_1.1.0.bb b/packages/tinymail/tmut_1.1.0.bb
index 10f0ad8c57..d3f84f057a 100644
--- a/packages/tinymail/tmut_1.1.0.bb
+++ b/packages/tinymail/tmut_1.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail"
 SECTION = "x11/utils"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://tinymail.org/files/tmut/releases/v1.1/v${PV}/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/tinymail/tmut_svn.bb b/packages/tinymail/tmut_svn.bb
index 9815dfc18b..abe7417898 100644
--- a/packages/tinymail/tmut_svn.bb
+++ b/packages/tinymail/tmut_svn.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 LICENSE = "LGPL"
 DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail"
 PV = "0.0.0+svnr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/tn5250/tn5250_0.16.5.bb b/packages/tn5250/tn5250_0.16.5.bb
index dca7f56610..5e12dadeb1 100644
--- a/packages/tn5250/tn5250_0.16.5.bb
+++ b/packages/tn5250/tn5250_0.16.5.bb
@@ -4,7 +4,7 @@ to IBM's AS/400 (now known as eServer iSeries) midrange computers."
 HOMEPAGE = "http://tn5250.sourceforge.net/"
 LICENSE = "LGPL"
 DEPENDS = "ncurses openssl"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \
 	   file://compile.patch;patch=1"
diff --git a/packages/totem/totem_2.23.4.bb b/packages/totem/totem_2.23.4.bb
index e5ca220288..f2e945fd87 100644
--- a/packages/totem/totem_2.23.4.bb
+++ b/packages/totem/totem_2.23.4.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "A GTK2 based media player"
 HOMEPAGE = "http://www.gnome.org/projects/totem/"
 LICENSE = "GPL"
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
 RDEPENDS_${PN} += "iso-codes"
diff --git a/packages/tracker/tracker_0.5.4.bb b/packages/tracker/tracker_0.5.4.bb
index 7aa30d261c..e9a7c79a80 100644
--- a/packages/tracker/tracker_0.5.4.bb
+++ b/packages/tracker/tracker_0.5.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata ab
 LICENSE = "GPLv2"
 DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \
            file://no-ioprio.patch;patch=1" 
diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb
index 46c0b908a2..666b6c2563 100644
--- a/packages/tremor/tremor_20041119.bb
+++ b/packages/tremor/tremor_20041119.bb
@@ -4,7 +4,7 @@ DEPENDS = "libogg"
 DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
 LICENSE = "BSD"
 SRCDATE = "${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
 
diff --git a/packages/tsclient/tsclient_0.132.bb b/packages/tsclient/tsclient_0.132.bb
index 994d759f4a..4dbadf9956 100644
--- a/packages/tsclient/tsclient_0.132.bb
+++ b/packages/tsclient/tsclient_0.132.bb
@@ -2,7 +2,7 @@
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-FILE_PR ="r1"
+PR ="r1"
 
 DESCRIPTION="Terminal Server Client (tsclient) is a frontend for rdesktop and other remote desktop tools"
 HOMEPAGE="http://www.gnomepro.com/tsclient/"
diff --git a/packages/tsclient/tsclient_0.140.bb b/packages/tsclient/tsclient_0.140.bb
index 515758cbd6..9a80b54f00 100644
--- a/packages/tsclient/tsclient_0.140.bb
+++ b/packages/tsclient/tsclient_0.140.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnomepro.com/tsclient/"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ gnome-panel rdesktop"
 RDEPENDS = "rdesktop"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.gnomepro.com/tsclient/${P}.tar.gz"
 
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index ea6124a0b6..c707eecb27 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
-FILE_PR = "r20"
+PR = "r20"
 
 SRC_URI = "\
   http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
diff --git a/packages/ttf-fonts/ttf-arphic-uming_20080216.bb b/packages/ttf-fonts/ttf-arphic-uming_20080216.bb
index 46b8ad0487..172dba2db2 100644
--- a/packages/ttf-fonts/ttf-arphic-uming_20080216.bb
+++ b/packages/ttf-fonts/ttf-arphic-uming_20080216.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/CJKUnifonts"
 LICENSE = "${PN}"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 RPROVIDES = "virtual/chinese-font"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = \
 "http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.${PV}.1.orig.tar.gz"
diff --git a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
index a5397ed5b8..a19d879d0f 100644
--- a/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -2,7 +2,7 @@ require ttf.inc
 
 DESCRIPTION = "The Bitstream Vera fonts - TTF Edition"
 LICENSE = "Bitstream Vera"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
 
diff --git a/packages/ttf-fonts/ttf-dejavu_2.23.bb b/packages/ttf-fonts/ttf-dejavu_2.23.bb
index 862125b86c..c2d06c4d5e 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.23.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.23.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://dejavu.sourceforge.net/wiki/"
 LICENSE = "Bitstream Vera"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb
index e349f514a6..873ba1638f 100644
--- a/packages/ttf-fonts/ttf-gentium_1.02.bb
+++ b/packages/ttf-fonts/ttf-gentium_1.02.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Gentium fonts - TTF Version"
 HOMEPAGE = "http://scripts.sil.org/gentium"
 LICENSE = "SIL Open Font License"
 LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \
            file://OFL.gz"
diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
index 378da2c8c8..0987af58ee 100644
--- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
+++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
@@ -3,7 +3,7 @@ require ttf.inc
 DESCRIPTION = "Hunky fonts - TTF Version"
 HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts"
 LICENSE = "LGPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2"
 
diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb
index 906a1e39a3..c9737152da 100644
--- a/packages/ttf-fonts/ttf-liberation_0.2.bb
+++ b/packages/ttf-fonts/ttf-liberation_0.2.bb
@@ -3,7 +3,7 @@ require ttf.inc
 DESCRIPTION = "Liberation fonts - TTF Version"
 HOMEPAGE = "https://www.redhat.com/promo/fonts/"
 LICENSE = "Liberation"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz"
 S = "${WORKDIR}/liberation-fonts-${PV}"
diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb
index 9feb4e4d85..852966ac58 100644
--- a/packages/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://sourceforge.jp/projects/efont/"
 LICENSE = "${PN}"
 SRC_DISTRIBUTE_LICENSES += "${PN}"
 RPROVIDES = "virtual/japanese-font"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
 S = "${WORKDIR}/sazanami-20040629"
diff --git a/packages/ttyconv/ttyconv_0.2.3.bb b/packages/ttyconv/ttyconv_0.2.3.bb
index 1955669984..1b38d31328 100644
--- a/packages/ttyconv/ttyconv_0.2.3.bb
+++ b/packages/ttyconv/ttyconv_0.2.3.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.bedroomlan.org/~alexios/coding_ttyconv.html"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.bedroomlan.org/~alexios/files/SOFTWARE/ttyconv/ttyconv_${PV}.tar.gz"
 S = "${WORKDIR}/ttyconv"
diff --git a/packages/ttyrec/ttyrec_1.0.8.bb b/packages/ttyrec/ttyrec_1.0.8.bb
index 308497214d..bf58f245cb 100644
--- a/packages/ttyrec/ttyrec_1.0.8.bb
+++ b/packages/ttyrec/ttyrec_1.0.8.bb
@@ -12,7 +12,7 @@ HOMEPAGE = "http://0xcc.net/ttyrec/index.html.en"
 
 ######################################################################################
 
-FILE_PR = "r0"
+PR = "r0"
 
 ######################################################################################
 
diff --git a/packages/tuxnes/tuxnes_0.75.bb b/packages/tuxnes/tuxnes_0.75.bb
index f63efb4b2a..f542f73ac4 100644
--- a/packages/tuxnes/tuxnes_0.75.bb
+++ b/packages/tuxnes/tuxnes_0.75.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/tuxnes/tuxnes-0.75.tar.gz"
 LICENSE = "GPLv2"
 SECTION = "x/games"
 PRIORITY = "optional"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz"
 
diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb
index c5f421fbc7..31da8117f7 100644
--- a/packages/txdrug/txdrug_0.1.bb
+++ b/packages/txdrug/txdrug_0.1.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "sqlite"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \
            file://${FILESDIR}/opt/QtPalmtop"
diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb
index 44e7dbf007..1911e4fb51 100644
--- a/packages/tximage/tximage_0.2.bb
+++ b/packages/tximage/tximage_0.2.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://community.zaurus.com/projects/tximage/"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.openzaurus.org/mirror/tximage-${PV}.tar.gz \
            file://gcc3.patch;patch=1 \
diff --git a/packages/tzcode/tzcode-native_2007k.bb b/packages/tzcode/tzcode-native_2007k.bb
index ccda8ac79a..8e721d6d9a 100644
--- a/packages/tzcode/tzcode-native_2007k.bb
+++ b/packages/tzcode/tzcode-native_2007k.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
            ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb
index 1b68f5eeaf..76bbfe9ca3 100644
--- a/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-FILE_PR = "r3"
+PR = "r3"
 
 RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
              timezone-arctic timezone-asia timezone-atlantic \
diff --git a/packages/u-boot/u-boot-env.bb b/packages/u-boot/u-boot-env.bb
index ff1e5733a3..1bee272d82 100644
--- a/packages/u-boot/u-boot-env.bb
+++ b/packages/u-boot/u-boot-env.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Dummy package to get uboot env image into deploy"
 
-FILE_PR = "r1"
+PR = "r1"
 
 inherit kernel-arch
 
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
index eef35c5b60..8b5564c14c 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
@@ -3,7 +3,7 @@ require u-boot-openmoko_git.bb
 inherit native
 
 PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
diff --git a/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb
index 6c731d501b..af0d0a14a7 100644
--- a/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb
+++ b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-FILE_PR ="r1"
+PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz \
diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb
index 2bd2dc91f1..5be3657fba 100644
--- a/packages/u-boot/u-boot-omap3_git.bb
+++ b/packages/u-boot/u-boot-omap3_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M
 SRCREV = "c492706ba046124333323273f6fc21123360cb50"
 
 PV = "2008.10-rc1+${PR}+git${SRCREV}"
-FILE_PR ="r1"
+PR ="r1"
 
 SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \
           "
diff --git a/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb b/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb
index e02a95c7dd..f29292feb8 100644
--- a/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb
+++ b/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-FILE_PR ="r1"
+PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.sakoman.net/omap3/u-boot.tar.gz \
diff --git a/packages/u-boot/u-boot-openmoko.inc b/packages/u-boot/u-boot-openmoko.inc
index 65390ab465..c25afd38f6 100644
--- a/packages/u-boot/u-boot-openmoko.inc
+++ b/packages/u-boot/u-boot-openmoko.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+gitr${SRCREV}"
 PV = "1.3.1${LOCALVERSION}"
-FILE_PR = "r0"
+PR = "r0"
 
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
 
diff --git a/packages/u-boot/u-boot-utils-native_1.2.0.bb b/packages/u-boot/u-boot-utils-native_1.2.0.bb
index bc29ddbd5c..b04b366ffe 100644
--- a/packages/u-boot/u-boot-utils-native_1.2.0.bb
+++ b/packages/u-boot/u-boot-utils-native_1.2.0.bb
@@ -3,7 +3,7 @@ SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
diff --git a/packages/u-boot/u-boot-utils_1.2.0.bb b/packages/u-boot/u-boot-utils_1.2.0.bb
index 94ede71c6f..1734b41a0e 100644
--- a/packages/u-boot/u-boot-utils_1.2.0.bb
+++ b/packages/u-boot/u-boot-utils_1.2.0.bb
@@ -3,7 +3,7 @@ SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "mtd-utils"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
         file://fw_env.c.patch;patch=1 \
diff --git a/packages/u-boot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb
index 72c706ed51..8287d35a1d 100644
--- a/packages/u-boot/u-boot_1.1.2.bb
+++ b/packages/u-boot/u-boot_1.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 require u-boot.inc
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
diff --git a/packages/u-boot/u-boot_1.1.4.bb b/packages/u-boot/u-boot_1.1.4.bb
index 07cd745f17..df6a357c63 100644
--- a/packages/u-boot/u-boot_1.1.4.bb
+++ b/packages/u-boot/u-boot_1.1.4.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/u-boot/u-boot_1.1.6.bb b/packages/u-boot/u-boot_1.1.6.bb
index 3c75eb8d2c..e003c69d7b 100644
--- a/packages/u-boot/u-boot_1.1.6.bb
+++ b/packages/u-boot/u-boot_1.1.6.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \
            file://devkit-idp.patch;patch=1 \
diff --git a/packages/u-boot/u-boot_1.2.0.bb b/packages/u-boot/u-boot_1.2.0.bb
index 2efd974254..7c6aff8920 100644
--- a/packages/u-boot/u-boot_1.2.0.bb
+++ b/packages/u-boot/u-boot_1.2.0.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \
 	"
diff --git a/packages/u-boot/u-boot_1.3.1.bb b/packages/u-boot/u-boot_1.3.1.bb
index 67a082c61d..5c32b9a156 100644
--- a/packages/u-boot/u-boot_1.3.1.bb
+++ b/packages/u-boot/u-boot_1.3.1.bb
@@ -2,7 +2,7 @@ require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
            file://mpc8313e-rdb-autoboot.patch;patch=1 \
diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb
index 6ffbcef491..d610526081 100644
--- a/packages/u-boot/u-boot_1.3.2.bb
+++ b/packages/u-boot/u-boot_1.3.2.bb
@@ -2,7 +2,7 @@ require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb
index 2f17cbddee..7a7d5be531 100644
--- a/packages/u-boot/u-boot_git.bb
+++ b/packages/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-FILE_PR ="r18"
+PR ="r18"
 
 SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
diff --git a/packages/uae/e-uae_0.8.28.bb b/packages/uae/e-uae_0.8.28.bb
index 630c29ed62..f8f95e846a 100644
--- a/packages/uae/e-uae_0.8.28.bb
+++ b/packages/uae/e-uae_0.8.28.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl zlib"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1"
diff --git a/packages/ubahnnav/ubahnnav_0.4.1.bb b/packages/ubahnnav/ubahnnav_0.4.1.bb
index daaafc60de..9d6f85889e 100644
--- a/packages/ubahnnav/ubahnnav_0.4.1.bb
+++ b/packages/ubahnnav/ubahnnav_0.4.1.bb
@@ -10,7 +10,7 @@ LICENSE = "GPL"
 APPNAME = "ubahnnav"
 APPTYPE = "binary"
 APPDESKTOP = "${S}/src/ubahnnav"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
 	   file://qmake.patch;patch=1"
diff --git a/packages/uclibc++/uclibc++_0.1.9.bb b/packages/uclibc++/uclibc++_0.1.9.bb
index 789bc68e0c..aaa9447f92 100644
--- a/packages/uclibc++/uclibc++_0.1.9.bb
+++ b/packages/uclibc++/uclibc++_0.1.9.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 SECTION = "libs"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2 \
 	   file://nobash.patch;patch=1 \
diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb
index 891ff87328..7ab3e8ae61 100644
--- a/packages/uclibc/bfin-uclibc_svn.bb
+++ b/packages/uclibc/bfin-uclibc_svn.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-FILE_PR = "r4"
+PR = "r4"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 
 require uclibc.inc
diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb
index f4b7aa3c28..add217efb0 100644
--- a/packages/uclibc/uclibc_0.9.26.bb
+++ b/packages/uclibc/uclibc_0.9.26.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r12"
+PR = "r12"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb
index 049017b2fb..1357e58345 100644
--- a/packages/uclibc/uclibc_0.9.27.bb
+++ b/packages/uclibc/uclibc_0.9.27.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-FILE_PR = "r12"
+PR = "r12"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index 9b6c342080..1b0f2e0006 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-FILE_PR = "r17"
+PR = "r17"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 7d659160f4..16b168715f 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-FILE_PR = "r29"
+PR = "r29"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb
index b441cb821f..1cebe7b112 100644
--- a/packages/uclibc/uclibc_nptl.bb
+++ b/packages/uclibc/uclibc_nptl.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-FILE_PR = "r3"
+PR = "r3"
 #DEFAULT_PREFERENCE = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index d643b43769..29dca64c2a 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-FILE_PR = "r17"
+PR = "r17"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
diff --git a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
index 8cf59a7b20..4076cb2dd6 100644
--- a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
+++ b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
 card one sweet day."
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = " file://50-hostap_cs.rules "
 
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 027c0aa4e5..250b1d306f 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-FILE_PR = "r22"
+PR = "r22"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index f8a905c161..397d3b9f2a 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index 4ad34063ee..1cd3c41e82 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-FILE_PR = "r12"
+PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb
index 6e296533eb..20fef83d74 100644
--- a/packages/udev/udev_118.bb
+++ b/packages/udev/udev_118.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-118"
 
diff --git a/packages/udev/udev_124.bb b/packages/udev/udev_124.bb
index eb1e9b9c27..e34da011dc 100644
--- a/packages/udev/udev_124.bb
+++ b/packages/udev/udev_124.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index bb40751419..1674353145 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
            file://fix-makefile.patch;patch=1 \
diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb
index ca62da603b..11b0c506dc 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.5.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
 DEPENDS = "qmake-native"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
            file://no-examples.patch;patch=1 \
diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc
index 340cf51c97..1a49fd92b5 100644
--- a/packages/uicmoc/uicmoc4-native.inc
+++ b/packages/uicmoc/uicmoc4-native.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://configure-fix.patch;patch=1"
diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb
index bcbffaad35..f23f6bd945 100644
--- a/packages/uim/uim-native_1.3.1.bb
+++ b/packages/uim/uim-native_1.3.1.bb
@@ -1,7 +1,7 @@
 require uim.inc
 DEPENDS = "gtk+ anthy intltool-native"
 inherit native autotools pkgconfig
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/uim-${PV}"
 
diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb
index 0673a431dd..fce91c30e3 100644
--- a/packages/uim/uim_1.3.1.bb
+++ b/packages/uim/uim_1.3.1.bb
@@ -1,7 +1,7 @@
 require uim.inc
 DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
 SECTION_uim-gtk2.0 = "x11/inputmethods"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://uim-module-manager.patch;patch=1"
 
diff --git a/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
index bfcfcb8b69..5ef98de4b2 100644
--- a/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
+++ b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://ulxmlrpcpp.sf.net"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "expat"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ulxmlrpcpp/ulxmlrpcpp-${PV}-src.tar.bz2 \
            file://disable-docs.patch;patch=1 \
diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb
index c5140fea83..6a7d880720 100644
--- a/packages/unionfs/unionfs-modules_1.0.13.bb
+++ b/packages/unionfs/unionfs-modules_1.0.13.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 PARALLEL_MAKE = ""
 
 require unionfs-modules.inc
diff --git a/packages/unionfs/unionroot-utils_0.1.1.bb b/packages/unionfs/unionroot-utils_0.1.1.bb
index 1929c00668..0da9c9a731 100644
--- a/packages/unionfs/unionroot-utils_0.1.1.bb
+++ b/packages/unionfs/unionroot-utils_0.1.1.bb
@@ -6,7 +6,7 @@ RDEPENDS = "ipkg-collateral unionroot busybox"
 SECTION = "base"
 PRIORITY = "optional"
 
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "file://mount.unionroot \
 	   file://umount.unionroot"
diff --git a/packages/units/units_1.80.bb b/packages/units/units_1.80.bb
index be3fe1cc1a..0f94f80638 100644
--- a/packages/units/units_1.80.bb
+++ b/packages/units/units_1.80.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU units converts between different systems of units."
 DEPENDS = "readline"
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 LICENSE = "GPL"
 SRC_URI = "${GNU_MIRROR}/units/units-${PV}.tar.gz \
diff --git a/packages/unzip/unzip_552.bb b/packages/unzip/unzip_552.bb
index b34c5da0a7..2f06e1b1c6 100644
--- a/packages/unzip/unzip_552.bb
+++ b/packages/unzip/unzip_552.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A (de)compression library for the ZIP format"
 SECTION = "console/utils"
 LICENSE = "Info-ZIP"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tar.gz"
 S = "${WORKDIR}/unzip-5.52"
diff --git a/packages/update-alternatives/update-alternatives-cworth.inc b/packages/update-alternatives/update-alternatives-cworth.inc
index 089dc24e3b..f23bfe8bb4 100644
--- a/packages/update-alternatives/update-alternatives-cworth.inc
+++ b/packages/update-alternatives/update-alternatives-cworth.inc
@@ -4,4 +4,4 @@ SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVa
 S = "${WORKDIR}/ipkg/C"
 PACKAGE_ARCH = "all"
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/update-modules/update-modules_1.0.bb b/packages/update-modules/update-modules_1.0.bb
index e888da6683..0c2d1894ac 100644
--- a/packages/update-modules/update-modules_1.0.bb
+++ b/packages/update-modules/update-modules_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
 RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26",  "module-init-tools-depmod","modutils-depmod",d)} "
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "file://update-modules"
 
diff --git a/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb
index b3d70c27b0..dd370e6ff8 100644
--- a/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/packages/update-rc.d/update-rc.d_0.7.bb
@@ -3,7 +3,7 @@ PRIORITY = "standard"
 DESCRIPTION = "Manage symlinks in /etc/rcN.d"
 LICENSE = "GPL"
 S = "${WORKDIR}/update-rc.d"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7 \
            file://add-verbose.patch;patch=1"
diff --git a/packages/upnp/libupnp_1.6.5.bb b/packages/upnp/libupnp_1.6.5.bb
index c8a02ed348..245575ed28 100644
--- a/packages/upnp/libupnp_1.6.5.bb
+++ b/packages/upnp/libupnp_1.6.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The portable SDK for UPnP* Devices (libupnp) provides developers
 HOMEPAGE = "http://pupnp.sourceforge.net/"
 LICENSE = "BSD"
 
-FILE_PR = "r1"
+PR = "r1"
 
 LEAD_SONAME = "libupnp"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${P}.tar.bz2"
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 2ff957eb23..02c41eb42b 100644
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -1,6 +1,6 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index b68a985dd6..e0d7f2b708 100644
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -1,6 +1,6 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 0dee1116ee..1450cf26a0 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -1,6 +1,6 @@
 # This package builds the 'upslug2' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool (version 2)"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
 SECTION = "console/network"
diff --git a/packages/upstart/upstart_0.3.8.bb b/packages/upstart/upstart_0.3.8.bb
index f1730e03e7..5a4cf872a8 100644
--- a/packages/upstart/upstart_0.3.8.bb
+++ b/packages/upstart/upstart_0.3.8.bb
@@ -3,5 +3,5 @@ require upstart.inc
 SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
 file://autoconf_version.patch;patch=1"
 
-FILE_PR = "r1"
+PR = "r1"
 
diff --git a/packages/uqm/uqm_0.3.bb b/packages/uqm/uqm_0.3.bb
index bb01204023..b5b80ddc58 100644
--- a/packages/uqm/uqm_0.3.bb
+++ b/packages/uqm/uqm_0.3.bb
@@ -6,7 +6,7 @@ SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/uqm-${PV}"
 
diff --git a/packages/uqm/uqm_0.5.0.bb b/packages/uqm/uqm_0.5.0.bb
index 858ab28207..089922a472 100644
--- a/packages/uqm/uqm_0.5.0.bb
+++ b/packages/uqm/uqm_0.5.0.bb
@@ -6,7 +6,7 @@ SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/uqm-${PV}"
 
diff --git a/packages/usb-gadget-mode/usb-gadget-mode.bb b/packages/usb-gadget-mode/usb-gadget-mode.bb
index 82cf092467..d1fab638f2 100644
--- a/packages/usb-gadget-mode/usb-gadget-mode.bb
+++ b/packages/usb-gadget-mode/usb-gadget-mode.bb
@@ -14,7 +14,7 @@ LICENSE = "GPL"
 ######################################################################################
 
 PV = "0.0.2"
-FILE_PR = "r0"
+PR = "r0"
 
 ######################################################################################
 
diff --git a/packages/usbutils/usbutils_0.70.bb b/packages/usbutils/usbutils_0.70.bb
index 7342a39fdc..891d66f381 100644
--- a/packages/usbutils/usbutils_0.70.bb
+++ b/packages/usbutils/usbutils_0.70.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 DEFAULT_PREFERENCE = "1"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz"
 S = "${WORKDIR}/usbutils-${PV}"
diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb
index cedab844be..5de33bbca3 100644
--- a/packages/usbutils/usbutils_cvs.bb
+++ b/packages/usbutils/usbutils_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS += "libusb-compat"
 LICENSE = "GPL"
 PRIORITY = "optional"
 PV = "0.71+cvs${SRCDATE}"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "cvs://anonymous@linux-usb.cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils"
 S = "${WORKDIR}/usbutils"
diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb
index 25e64fb5ac..b5b2d1f4bc 100644
--- a/packages/ushare/ushare_0.9.7.bb
+++ b/packages/ushare/ushare_0.9.7.bb
@@ -4,6 +4,6 @@ HOMEPAGE = "http://ushare.geexbox.org/"
 DEPENDS = "libupnp virtual/libiconv virtual/libintl"
 SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2"
 S = "${WORKDIR}/ushare-${PV}"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit autotools
diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb
index 9c833f4905..55ca84857a 100644
--- a/packages/usrp/usrp_0.12.bb
+++ b/packages/usrp/usrp_0.12.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://comsec.com/wiki?UniversalSoftwareRadioPeripheral"
 SECTION = "devel"
 DEPENDS = "swig-native sdcc-native libusb-compat python boost"
 RDEPENDS = "python-core"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \
            file://fix_compile_h.patch;patch=1;pnum=3 \
diff --git a/packages/util-linux-ng/util-linux-ng_2.13.1.bb b/packages/util-linux-ng/util-linux-ng_2.13.1.bb
index be20ebf256..c10792e8ec 100644
--- a/packages/util-linux-ng/util-linux-ng_2.13.1.bb
+++ b/packages/util-linux-ng/util-linux-ng_2.13.1.bb
@@ -4,4 +4,4 @@ require util-linux-ng.inc
 #SRC_URI += "file://glibc-fix.patch;patch=1"
 #SRC_URI += "file://glibc-umount2.patch;patch=1"
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/util-linux-ng/util-linux-ng_2.14.bb b/packages/util-linux-ng/util-linux-ng_2.14.bb
index eee741972a..1223aa72e8 100644
--- a/packages/util-linux-ng/util-linux-ng_2.14.bb
+++ b/packages/util-linux-ng/util-linux-ng_2.14.bb
@@ -1,6 +1,6 @@
 require util-linux-ng.inc
 
-FILE_PR = "r3"
+PR = "r3"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \
diff --git a/packages/util-linux/util-linux_2.12.bb b/packages/util-linux/util-linux_2.12.bb
index 1e22823577..5787e655ba 100644
--- a/packages/util-linux/util-linux_2.12.bb
+++ b/packages/util-linux/util-linux_2.12.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r5"
+PR = "r5"
 
 require util-linux.inc
 
diff --git a/packages/util-linux/util-linux_2.12o.bb b/packages/util-linux/util-linux_2.12o.bb
index 29c9a2a41e..bb874d9573 100644
--- a/packages/util-linux/util-linux_2.12o.bb
+++ b/packages/util-linux/util-linux_2.12o.bb
@@ -1,3 +1,3 @@
 require util-linux.inc
 
-FILE_PR = "r8"
+PR = "r8"
diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb
index c4ad87dd9b..5313ee838f 100644
--- a/packages/util-linux/util-linux_2.12q.bb
+++ b/packages/util-linux/util-linux_2.12q.bb
@@ -4,4 +4,4 @@ ARM_INSTRUCTION_SET = "arm"
 
 require util-linux.inc
 
-FILE_PR = "r7"
+PR = "r7"
diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb
index 179ea63cdb..0498253a8d 100644
--- a/packages/util-linux/util-linux_2.12r.bb
+++ b/packages/util-linux/util-linux_2.12r.bb
@@ -6,4 +6,4 @@ SRC_URI += "file://glibc-umount2.patch;patch=1"
 SRC_URI += "file://fdiskbsdlabel-avr32.patch;patch=1" 
 SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;patch=1" 
 
-FILE_PR = "r15"
+PR = "r15"
diff --git a/packages/uucp/uucp_1.07.bb b/packages/uucp/uucp_1.07.bb
index f6159e85f3..ddc16d94f2 100644
--- a/packages/uucp/uucp_1.07.bb
+++ b/packages/uucp/uucp_1.07.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "UUCP is used to transfer mail, news and random files between syst
 HOMEPAGE = "http://www.airs.com/ian/uucp.html"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit autotools
 
diff --git a/packages/v86d/v86d_0.1.8.bb b/packages/v86d/v86d_0.1.8.bb
index f6a65568d5..bb91e386a1 100644
--- a/packages/v86d/v86d_0.1.8.bb
+++ b/packages/v86d/v86d_0.1.8.bb
@@ -3,7 +3,7 @@ SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.
            file://fbsetup"
 DEPENDS = "virtual/kernel klibc"
 LICENSE = "GPLv2"
-FILE_PR = "r0"
+PR = "r0"
 
 RRECOMMENDS_${PN} = "kernel-module-uvesafb"
 
diff --git a/packages/valgrind/valgrind_3.2.1.bb b/packages/valgrind/valgrind_3.2.1.bb
index 38aabd5f81..fedce377a8 100644
--- a/packages/valgrind/valgrind_3.2.1.bb
+++ b/packages/valgrind/valgrind_3.2.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.valgrind.org/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2"
 
diff --git a/packages/valgrind/valgrind_3.2.3.bb b/packages/valgrind/valgrind_3.2.3.bb
index b1347bbea4..6cc835a9f4 100644
--- a/packages/valgrind/valgrind_3.2.3.bb
+++ b/packages/valgrind/valgrind_3.2.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.valgrind.org/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2"
 
diff --git a/packages/vectoroids/vectoroids_1.1.0.bb b/packages/vectoroids/vectoroids_1.1.0.bb
index c4f1c98f9a..bc3883390a 100644
--- a/packages/vectoroids/vectoroids_1.1.0.bb
+++ b/packages/vectoroids/vectoroids_1.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Clone of the classic arcade game Asteroids - SDL edition."
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 APPIMAGE = "data/images/icon.png"
 APPNAME = "vectoroids-${PV}"
diff --git a/packages/vim/gvim_7.0.bb b/packages/vim/gvim_7.0.bb
index 44d9bad095..78a0c54f9d 100644
--- a/packages/vim/gvim_7.0.bb
+++ b/packages/vim/gvim_7.0.bb
@@ -3,7 +3,7 @@ VIMVER = "70"
 require vim.inc
 
 DEPENDS += "gtk+ xt"
-FILE_PR = "r1"
+PR = "r1"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
diff --git a/packages/vim/vim_7.0.bb b/packages/vim/vim_7.0.bb
index f6edbd74ef..c821f6e974 100644
--- a/packages/vim/vim_7.0.bb
+++ b/packages/vim/vim_7.0.bb
@@ -2,7 +2,7 @@ VIMVER = "70"
 
 require vim.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 EXTRA_OECONF = "--enable-gui=none --disable-gtktest \
 		--disable-xim --with-features=big \
diff --git a/packages/vincent/vincent_svn.bb b/packages/vincent/vincent_svn.bb
index d533617c21..f872f727be 100644
--- a/packages/vincent/vincent_svn.bb
+++ b/packages/vincent/vincent_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://sourceforge.net/projects/ogl-es/"
 LICENSE = "BSD"
 
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://ogl-es.svn.sourceforge.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https"
 
diff --git a/packages/visiscript/visiscript_0.3.2.bb b/packages/visiscript/visiscript_0.3.2.bb
index 59070b9657..5f4e5d500a 100644
--- a/packages/visiscript/visiscript_0.3.2.bb
+++ b/packages/visiscript/visiscript_0.3.2.bb
@@ -4,7 +4,7 @@ VisiScript runs on the Qtopia desktop environment of the Zaurus."
 SECTION = "opie/applications"
 DEPENDS = "qscintilla"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 APPNAME = "visiscript"
 APPTYPE = "binary"
diff --git a/packages/visual-boot/visual-boot.bb b/packages/visual-boot/visual-boot.bb
index 00d0153eb7..1336971c54 100644
--- a/packages/visual-boot/visual-boot.bb
+++ b/packages/visual-boot/visual-boot.bb
@@ -12,7 +12,7 @@ LICENSE = "GPL"
 ######################################################################################
 
 PV = "0.0.1"
-FILE_PR = "r1"
+PR = "r1"
 
 ######################################################################################
 
diff --git a/packages/vlan/vlan_1.8.bb b/packages/vlan/vlan_1.8.bb
index dff5e0564a..2b8d1d18a8 100644
--- a/packages/vlan/vlan_1.8.bb
+++ b/packages/vlan/vlan_1.8.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "802.1q vlan support program"
 RRECOMMENDS = "kernel-module-8021q"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/vlan/"
 
diff --git a/packages/vlan/vlan_1.9.bb b/packages/vlan/vlan_1.9.bb
index 1edcef937b..3a10e898ab 100644
--- a/packages/vlan/vlan_1.9.bb
+++ b/packages/vlan/vlan_1.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "802.1q vlan support program"
 RRECOMMENDS = "kernel-module-8021q"
-FILE_PR = "r0"
+PR = "r0"
 
 S = "${WORKDIR}/vlan/"
 
diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 45d03f86f1..4c6b19231b 100644
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -6,7 +6,7 @@ SECTION = "multimedia"
 
 SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c"
 
-FILE_PR = "r5"
+PR = "r5"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"
 
diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb
index 7784a8b2be..224b88096e 100644
--- a/packages/vlc/vlc-gpe_0.7.2.bb
+++ b/packages/vlc/vlc-gpe_0.7.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index a67b7181fe..0c83b6036c 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-FILE_PR = "r5"
+PR = "r5"
 
 DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb
index 782f588029..f53aa6b45f 100644
--- a/packages/vlc/vlc-gpe_0.8.4.bb
+++ b/packages/vlc/vlc-gpe_0.8.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb
index dbae18e069..f50c5dd304 100644
--- a/packages/vlc/vlc_0.9.2.bb
+++ b/packages/vlc/vlc_0.9.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
diff --git a/packages/vnc/fbvncserver-kmodule_0.9.4.bb b/packages/vnc/fbvncserver-kmodule_0.9.4.bb
index 8cf5973c41..4abdb6c7b0 100644
--- a/packages/vnc/fbvncserver-kmodule_0.9.4.bb
+++ b/packages/vnc/fbvncserver-kmodule_0.9.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Framebuffer VNC server keyboard events module"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
diff --git a/packages/vnc/fbvncserver2_cvs.bb b/packages/vnc/fbvncserver2_cvs.bb
index 834f9f4c70..29ce53274b 100644
--- a/packages/vnc/fbvncserver2_cvs.bb
+++ b/packages/vnc/fbvncserver2_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "libvncserver jpeg zlib gmp tslib"
 RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev"
 RCONFLICTS = "fbvncserver, fbvncserver-kmodule"
 PV = "0.0.0+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg"
 S = "${WORKDIR}/ipkg/src/"
diff --git a/packages/vnc/fbvncserver_0.9.4.bb b/packages/vnc/fbvncserver_0.9.4.bb
index 106645bdc7..4e6ee15a86 100644
--- a/packages/vnc/fbvncserver_0.9.4.bb
+++ b/packages/vnc/fbvncserver_0.9.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libvncserver jpeg zlib"
 RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
diff --git a/packages/vnc/libvncserver_0.9.1.bb b/packages/vnc/libvncserver_0.9.1.bb
index de7fc4e12b..a6027e7918 100644
--- a/packages/vnc/libvncserver_0.9.1.bb
+++ b/packages/vnc/libvncserver_0.9.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "zlib jpeg"
-FILE_PR = "r1"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/vnc/libvncserver_0.9.bb b/packages/vnc/libvncserver_0.9.bb
index 20f22c6ffe..7aca752c0b 100644
--- a/packages/vnc/libvncserver_0.9.bb
+++ b/packages/vnc/libvncserver_0.9.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg libxext"
 PROVIDES = "x11vnc"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
 S = "${WORKDIR}/LibVNCServer-${PV}"
diff --git a/packages/vnc/tightvnc_1.3.9.bb b/packages/vnc/tightvnc_1.3.9.bb
index 7ceeb15d37..ec6a7057d9 100644
--- a/packages/vnc/tightvnc_1.3.9.bb
+++ b/packages/vnc/tightvnc_1.3.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tightvnc.com/"
 DEPENDS = "virtual/libx11 zlib libxmu libxaw"
 LICENSE = "GPL"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/vnc-tight/${PN}-${PV}_unixsrc.tar.gz \
            file://Makefile"
diff --git a/packages/vnc/x11vnc_0.9.4.bb b/packages/vnc/x11vnc_0.9.4.bb
index f37d1b46ff..400abc8904 100644
--- a/packages/vnc/x11vnc_0.9.4.bb
+++ b/packages/vnc/x11vnc_0.9.4.bb
@@ -5,7 +5,7 @@ SECTION = "x11/utils"
 LICENSE = "GPL"
 DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
 
diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
index 189699375e..9991156dcd 100644
--- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb
+++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
@@ -4,7 +4,7 @@ vorbiscomment (ogg comment editor)."
 LICENSE = "GPL"
 DEPENDS = "libogg libvorbis libao curl"
 SECTION = "console/multimedia"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \
            file://m4.patch;patch=1 \
diff --git a/packages/vpnc/vpnc_0.3.2.bb b/packages/vpnc/vpnc_0.3.2.bb
index d45a27fd17..1a3f7fc011 100644
--- a/packages/vpnc/vpnc_0.3.2.bb
+++ b/packages/vpnc/vpnc_0.3.2.bb
@@ -1,5 +1,5 @@
 require vpnc.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz"
diff --git a/packages/vpnc/vpnc_0.3.3.bb b/packages/vpnc/vpnc_0.3.3.bb
index 17fe22f25b..3c8397607b 100644
--- a/packages/vpnc/vpnc_0.3.3.bb
+++ b/packages/vpnc/vpnc_0.3.3.bb
@@ -1,6 +1,6 @@
 require vpnc.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
            file://vpnc-script.patch;patch=1 \
diff --git a/packages/vpnc/vpnc_0.5.1.bb b/packages/vpnc/vpnc_0.5.1.bb
index a45f0231e8..35919847c1 100644
--- a/packages/vpnc/vpnc_0.5.1.bb
+++ b/packages/vpnc/vpnc_0.5.1.bb
@@ -1,6 +1,6 @@
 require vpnc.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
            file://makeman.patch;patch=1 \
diff --git a/packages/vsftpd/vsftpd-charconv_2.0.5.bb b/packages/vsftpd/vsftpd-charconv_2.0.5.bb
index b5e9a4a611..cc559c6259 100644
--- a/packages/vsftpd/vsftpd-charconv_2.0.5.bb
+++ b/packages/vsftpd/vsftpd-charconv_2.0.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Secure ftp daemon with filename charconv"
 SECTION = "console/network"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 FILESPATH_append = ":${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vsftpd-2.0.5"
 
diff --git a/packages/vsftpd/vsftpd_2.0.5.bb b/packages/vsftpd/vsftpd_2.0.5.bb
index 4d86be6264..fc10d27f08 100644
--- a/packages/vsftpd/vsftpd_2.0.5.bb
+++ b/packages/vsftpd/vsftpd_2.0.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
            file://makefile.patch;patch=1 \
diff --git a/packages/vtun/vtun_2.6.bb b/packages/vtun/vtun_2.6.bb
index aad5b3eec1..72dd3a4b9f 100644
--- a/packages/vtun/vtun_2.6.bb
+++ b/packages/vtun/vtun_2.6.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib lzo"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/vtun/vtun-${PV}.tar.gz \
 	file://init \
diff --git a/packages/vtype-utils/vtype-utils_0.6.bb b/packages/vtype-utils/vtype-utils_0.6.bb
index 6213a13a1e..2f988c77e4 100644
--- a/packages/vtype-utils/vtype-utils_0.6.bb
+++ b/packages/vtype-utils/vtype-utils_0.6.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 inherit gpe
 
diff --git a/packages/w3cam/w3cam_0.7.2.bb b/packages/w3cam/w3cam_0.7.2.bb
index a6567cb74e..73fa406c6f 100644
--- a/packages/w3cam/w3cam_0.7.2.bb
+++ b/packages/w3cam/w3cam_0.7.2.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS="jpeg"
 LICENSE = "GPLV2"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://mpx.freeshell.net/w3cam-0.7.2.tar.gz \
 	   file://staticpaths.patch;patch=1"
diff --git a/packages/wakelan/wakelan_1.1.bb b/packages/wakelan/wakelan_1.1.bb
index d9aaf13e70..80f36c5ae5 100644
--- a/packages/wakelan/wakelan_1.1.bb
+++ b/packages/wakelan/wakelan_1.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Wakelan sends a magic packet to wake up remote PC's"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/misc/${PN}-${PV}.tar.gz"
 
diff --git a/packages/watchdog/watchdog_5.2.6.bb b/packages/watchdog/watchdog_5.2.6.bb
index 40b2e68369..46f52d5627 100644
--- a/packages/watchdog/watchdog_5.2.6.bb
+++ b/packages/watchdog/watchdog_5.2.6.bb
@@ -1,7 +1,7 @@
 #CONFFILES = "${sysconfdir}/watchdog.conf"
 DESCRIPTION = "Software watchdog"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${P}.tar.gz"
 
diff --git a/packages/watchdog/watchdog_5.3.1.bb b/packages/watchdog/watchdog_5.3.1.bb
index 9575d07425..fd8e756619 100644
--- a/packages/watchdog/watchdog_5.3.1.bb
+++ b/packages/watchdog/watchdog_5.3.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "System watchdog daemon"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}_${PV}.tar.gz"
 
diff --git a/packages/web/web_svn.bb b/packages/web/web_svn.bb
index d22482f4c4..da4a6f2f9a 100644
--- a/packages/web/web_svn.bb
+++ b/packages/web/web_svn.bb
@@ -4,7 +4,7 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js"
 DESCRIPTION = "Web is a multi-platform web browsing application."
 
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
 
diff --git a/packages/webcam-server/webcam-server_0.50.bb b/packages/webcam-server/webcam-server_0.50.bb
index a22e426133..db28520606 100644
--- a/packages/webcam-server/webcam-server_0.50.bb
+++ b/packages/webcam-server/webcam-server_0.50.bb
@@ -11,7 +11,7 @@ DESCRIPTION = "webcam_server is a program that allows others to view your webcam
 HOMEPAGE = "http://webcamserver.sourceforge.net/"
 LICENSE = "GPL"
 
-FILE_PR = "r1"
+PR = "r1"
 
 ######################################################################################
 
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 2371d019e7..b78844fc53 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -5,7 +5,7 @@ SRCREV_FORMAT = "webcore-rwebkit"
 
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc
index ab4c071f08..5522a7cf53 100644
--- a/packages/webkit/webkit-qt.inc
+++ b/packages/webkit/webkit-qt.inc
@@ -8,7 +8,7 @@ RDEPENDS += "openssl"
 
 require webkit.inc
 
-FILE_PR = "r6"
+PR = "r6"
 SRC_URI += " file://qt-api-changes.diff;patch=0;pnum=0 \
              file://qtwebkit-use-image-decoders.patch;patch=0 "
 
diff --git a/packages/wesnoth/wesnoth_1.4.5.bb b/packages/wesnoth/wesnoth_1.4.5.bb
index eead0eb363..2c08a89bee 100644
--- a/packages/wesnoth/wesnoth_1.4.5.bb
+++ b/packages/wesnoth/wesnoth_1.4.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 DEPENDS = "freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost imagemagick-native"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wesnoth/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb
index db1b04b120..d3858e4e47 100644
--- a/packages/wget/wget_1.9.1.bb
+++ b/packages/wget/wget_1.9.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
 SECTION = "console/network"
 DEPENDS = ""
-FILE_PR = "r7"
+PR = "r7"
 LICENSE = "GPL"
 
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb
index eaadd5d595..57eb9e33fb 100644
--- a/packages/wifi-radar/wifi-radar_1.9.6.bb
+++ b/packages/wifi-radar/wifi-radar_1.9.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION="WiFi Radar is a Python/PyGTK2  utility for managing WiFi profiles."
 HOMEPAGE="http://www.bitbuilder.com/wifi_radar/"
 LICENSE = "GPL"
 
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/wifistix/wifistix-modules_5.0.16.p0.bb b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
index 2573726130..0eb6877558 100644
--- a/packages/wifistix/wifistix-modules_5.0.16.p0.bb
+++ b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gumstix.com"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
 			file://wifistix.conf \
diff --git a/packages/wiggle/wiggle_0.6.bb b/packages/wiggle/wiggle_0.6.bb
index bb944a76aa..8fd54a587a 100644
--- a/packages/wiggle/wiggle_0.6.bb
+++ b/packages/wiggle/wiggle_0.6.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Wiggle is a program for applying patches that patch cannot \
 apply because of conflicting changes."
 SECTION = "console/utils"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/wiggle-${PV}.tar.gz \
 	   file://001NoQuietTime;patch=1 \
diff --git a/packages/wireless-tools/wireless-tools_29.bb b/packages/wireless-tools/wireless-tools_29.bb
index 4a0032c841..7f08db81c7 100644
--- a/packages/wireless-tools/wireless-tools_29.bb
+++ b/packages/wireless-tools/wireless-tools_29.bb
@@ -1,3 +1,3 @@
 require wireless-tools.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/wireshark/wireshark_0.99.4.bb b/packages/wireshark/wireshark_0.99.4.bb
index a05b6d6447..e34ca849d4 100644
--- a/packages/wireshark/wireshark_0.99.4.bb
+++ b/packages/wireshark/wireshark_0.99.4.bb
@@ -4,7 +4,7 @@ SECTION = "x11/network"
 LICENSE = "GPL"
 DEPENDS = "perl-native gtk+ gnutls libpcap pcre expat"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
            file://use-our-lemon.patch;patch=1 \
diff --git a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb
index e34b57cfce..8a39503073 100644
--- a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb
+++ b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb
@@ -1,6 +1,6 @@
 COMPILE_HERMES = "1"
 DESCRIPTION = "A driver from Agera (a card manufacturer) for wireless LAN cards based on Hermes ${COMPILE_HERMES} cards."
-FILE_PR = "r1"
+PR = "r1"
 
 inherit module
 
diff --git a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb
index f17c85212c..0906d05eb0 100644
--- a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb
+++ b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb
@@ -1,6 +1,6 @@
 COMPILE_HERMES = "2"
 DESCRIPTION = "A driver from Agera (a card manufacturer) for wireless LAN cards based on Hermes ${COMPILE_HERMES} cards."
-FILE_PR = "r1"
+PR = "r1"
 
 inherit module
 
diff --git a/packages/wlags-modules/wlags-modules_718.inc b/packages/wlags-modules/wlags-modules_718.inc
index f8750f7f62..c3f49872d6 100644
--- a/packages/wlags-modules/wlags-modules_718.inc
+++ b/packages/wlags-modules/wlags-modules_718.inc
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 DEPENDS = "virtual/kernel"
 LICENSE = "BSD"
-FILE_PR = "r1"
+PR = "r1"
 
 TARFILE = "wl_lkm_${PV}_release.tar.gz"
 
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
index 5a2f6d9185..a0113e9ae4 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	    file://2.6.22-fixes.patch;patch=1"
diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index 8ccf13a930..c455181c6b 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 PV = "0.2.8+svnr${SRCREV}"
 
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
index 8114796b3f..9946a4b670 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -7,4 +7,4 @@ SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.b
 
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
-FILE_PR = "r3"
+PR = "r3"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
index 626e360ca3..15d5e70f8e 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
@@ -7,4 +7,4 @@ SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.b
 
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
-FILE_PR = "r2"
+PR = "r2"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index a464c4fe9a..096ac22055 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -1,6 +1,6 @@
 require wlan-ng-utils.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 PV = "0.2.8+svnr${SRCREV}"
 
diff --git a/packages/wmctrl/wmctrl_1.07.bb b/packages/wmctrl/wmctrl_1.07.bb
index 04c70c3b76..c6cc507f5d 100644
--- a/packages/wmctrl/wmctrl_1.07.bb
+++ b/packages/wmctrl/wmctrl_1.07.bb
@@ -8,7 +8,7 @@
 DESCRIPTION = "A UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"
 HOMEPAGE = "http://sweb.cz/tripie/utils/wmctrl/"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 ######################################################################################
 
diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
index 571c5cb76c..4678ba79a2 100644
--- a/packages/wpa-supplicant/wpa-gui_0.4.8.bb
+++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb
@@ -6,7 +6,7 @@ SECTION = "network"
 LICENSE = "GPL BSD"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 RDEPENDS = "wpa-supplicant"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz "
 
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
index 8da78a572a..412c65dc06 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 DEPENDS_append_mtx-1 = " madwifi-modules"
 DEPENDS_append_mtx-2 = " madwifi-modules"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.8.bb
index 8824292f91..81dd5f8457 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.8.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.4.8.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 RCONFLICTS_${PN} = "wpa-supplicant-nossl"
 RREPLACES_${PN} = "wpa-supplicant-nossl"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.9.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.9.bb
index 47500c50c5..f0f5c48c1c 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.9.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.4.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
 RCONFLICTS_${PN} = "wpa-supplicant-nossl"
 RREPLACES_${PN} = "wpa-supplicant-nossl"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
index 1d5f6c64f4..d20ccaa9fe 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
index 1d5f6c64f4..d20ccaa9fe 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/wt/wt_2.2.0.bb b/packages/wt/wt_2.2.0.bb
index 16d8c55d2e..564d4b2552 100644
--- a/packages/wt/wt_2.2.0.bb
+++ b/packages/wt/wt_2.2.0.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "boost"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
 	file://cmakelist.patch;patch=1"
diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb
index 85d77d4025..7f06f587c4 100644
--- a/packages/wv/wv_1.2.0.bb
+++ b/packages/wv/wv_1.2.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Programs for accessing Microsoft Word documents"
 HOMEPAGE = "http://wvware.sourceforge.net/"
 LICENSE = "GPLv2"
 DEPENDS = "libgsf glib-2.0"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
            file://pkgconfig.patch;patch=1"
diff --git a/packages/wview/wview-sim_3.1.3.bb b/packages/wview/wview-sim_3.1.3.bb
index 193dde6a16..86ccf00458 100644
--- a/packages/wview/wview-sim_3.1.3.bb
+++ b/packages/wview/wview-sim_3.1.3.bb
@@ -1,4 +1,4 @@
 require wview-common.inc
 require wview.inc
 EXTRA_OECONF += " --enable-station-sim"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/wview/wview-vpro_3.1.3.bb b/packages/wview/wview-vpro_3.1.3.bb
index f4e61711be..ae72f6a286 100644
--- a/packages/wview/wview-vpro_3.1.3.bb
+++ b/packages/wview/wview-vpro_3.1.3.bb
@@ -1,4 +1,4 @@
 require wview-common.inc
 require wview.inc
 EXTRA_OECONF += " --enable-station-vpro"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/wview/wview-wxt510_3.1.3.bb b/packages/wview/wview-wxt510_3.1.3.bb
index 45b13f2f48..0c8bb5b5da 100644
--- a/packages/wview/wview-wxt510_3.1.3.bb
+++ b/packages/wview/wview-wxt510_3.1.3.bb
@@ -1,4 +1,4 @@
 require wview-common.inc
 require wview.inc
 EXTRA_OECONF += " --enable-station-wxt510"
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/wvstreams/wvstreams_4.4.1.bb b/packages/wvstreams/wvstreams_4.4.1.bb
index 190a60840d..285edcfcd7 100644
--- a/packages/wvstreams/wvstreams_4.4.1.bb
+++ b/packages/wvstreams/wvstreams_4.4.1.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 DESCRIPTION = "WvStreams is a network programming library in C++"
 DEPENDS = "zlib openssl (>= 0.9.8)"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
            file://build-fixes-and-sanity.patch;patch=1 "
diff --git a/packages/wxwidgets/wxbase_2.6.4.bb b/packages/wxwidgets/wxbase_2.6.4.bb
index 347c2bd192..c8350d8aa5 100644
--- a/packages/wxwidgets/wxbase_2.6.4.bb
+++ b/packages/wxwidgets/wxbase_2.6.4.bb
@@ -1,6 +1,6 @@
 require wxbase.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 EXTRA_OECONF = "--enable-largefile"
 
diff --git a/packages/wxwidgets/wxbase_2.8.9.bb b/packages/wxwidgets/wxbase_2.8.9.bb
index d1b13055fc..bb46a52a88 100644
--- a/packages/wxwidgets/wxbase_2.8.9.bb
+++ b/packages/wxwidgets/wxbase_2.8.9.bb
@@ -2,7 +2,7 @@ require wxbase.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://Makefile.in.patch;patch=1"
 
diff --git a/packages/wxwidgets/wxwidgets_2.6.4.bb b/packages/wxwidgets/wxwidgets_2.6.4.bb
index cd2aea3345..775cf90587 100644
--- a/packages/wxwidgets/wxwidgets_2.6.4.bb
+++ b/packages/wxwidgets/wxwidgets_2.6.4.bb
@@ -1,6 +1,6 @@
 require wxwidgets.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 LEAD_SONAME = "libwx_gtk2_core-2.6.so"
 
diff --git a/packages/wxwidgets/wxwidgets_2.8.9.bb b/packages/wxwidgets/wxwidgets_2.8.9.bb
index e27761ee0c..8e8d3565fd 100644
--- a/packages/wxwidgets/wxwidgets_2.8.9.bb
+++ b/packages/wxwidgets/wxwidgets_2.8.9.bb
@@ -1,6 +1,6 @@
 require wxwidgets.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 LEAD_SONAME = "libwx_gtk2_core-2.8.so"
 
diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb
index 42da96fd50..439262c048 100644
--- a/packages/x-load/x-load_git.bb
+++ b/packages/x-load/x-load_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE
 SRCREV = "73eb0caf065b3b3f407d8af5c4836624e5cc7b69"
 
 PV = "1.42+${PR}+git${SRCREV}"
-FILE_PR ="r7"
+PR ="r7"
 
 SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
 
diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb
index bf0a68fa6a..22cedeb296 100644
--- a/packages/xaos/xaos_3.2.3.bb
+++ b/packages/xaos/xaos_3.2.3.bb
@@ -4,7 +4,7 @@ SECTION = "graphics"
 LICENSE = "GPLv2"
 DEPENDS = "aalib libx11 zlib libpng"
 RDEPENDS += "libxxf86dga"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \
            file://fix-build.patch;patch=1 \
diff --git a/packages/xapian/xapian-core_1.0.5.bb b/packages/xapian/xapian-core_1.0.5.bb
index 8ccf9366aa..2af709324f 100644
--- a/packages/xapian/xapian-core_1.0.5.bb
+++ b/packages/xapian/xapian-core_1.0.5.bb
@@ -4,7 +4,7 @@ SECTION = "devel/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-${PV}.tar.gz"
 
diff --git a/packages/xapian/xapian-core_1.0.7.bb b/packages/xapian/xapian-core_1.0.7.bb
index bc878e4c54..289cae4ead 100644
--- a/packages/xapian/xapian-core_1.0.7.bb
+++ b/packages/xapian/xapian-core_1.0.7.bb
@@ -4,7 +4,7 @@ SECTION = "devel/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz"
 
diff --git a/packages/xapian/xapian-quickstartindex_1.0.bb b/packages/xapian/xapian-quickstartindex_1.0.bb
index 02bbda0e0f..7a17f7b354 100644
--- a/packages/xapian/xapian-quickstartindex_1.0.bb
+++ b/packages/xapian/xapian-quickstartindex_1.0.bb
@@ -1,4 +1,4 @@
 require xapian-quickstart.inc
 
 DESCRIPTION += "This package provides the tool for creating the index."
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/xapian/xapian-quickstartsearch_1.0.bb b/packages/xapian/xapian-quickstartsearch_1.0.bb
index bc87452aae..c3381f6abd 100644
--- a/packages/xapian/xapian-quickstartsearch_1.0.bb
+++ b/packages/xapian/xapian-quickstartsearch_1.0.bb
@@ -1,4 +1,4 @@
 require xapian-quickstart.inc
 
 DESCRIPTION += "This package provides the tool for searching the index."
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/xautomation/xautomation_1.00.bb b/packages/xautomation/xautomation_1.00.bb
index cbf5670c31..6cad1c7ba0 100644
--- a/packages/xautomation/xautomation_1.00.bb
+++ b/packages/xautomation/xautomation_1.00.bb
@@ -1,3 +1,3 @@
 require xautomation.inc
 
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcalibrateext/xcalibrateext_git.bb b/packages/xcalibrateext/xcalibrateext_git.bb
index a459bcebbd..51649c9be3 100644
--- a/packages/xcalibrateext/xcalibrateext_git.bb
+++ b/packages/xcalibrateext/xcalibrateext_git.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-X"
 DESCRIPTION = "XCalibrate extension headers"
 
 PV = "0.0+gita1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
 S = "${WORKDIR}/git"
diff --git a/packages/xcb/libxcb_0.9.91.bb b/packages/xcb/libxcb_0.9.91.bb
index 64c718a376..a1ab9fe143 100644
--- a/packages/xcb/libxcb_0.9.91.bb
+++ b/packages/xcb/libxcb_0.9.91.bb
@@ -1,2 +1,2 @@
 include libxcb.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/libxcb_0.9.92.bb b/packages/xcb/libxcb_0.9.92.bb
index 64c718a376..a1ab9fe143 100644
--- a/packages/xcb/libxcb_0.9.92.bb
+++ b/packages/xcb/libxcb_0.9.92.bb
@@ -1,2 +1,2 @@
 include libxcb.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb
index 06de234697..b74243e898 100644
--- a/packages/xcb/libxcb_0.9.93.bb
+++ b/packages/xcb/libxcb_0.9.93.bb
@@ -1,4 +1,4 @@
 include libxcb.inc
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES =+ "libxcb-xinerama"
diff --git a/packages/xcb/libxcb_0.9.bb b/packages/xcb/libxcb_0.9.bb
index fd28320923..40eb256714 100644
--- a/packages/xcb/libxcb_0.9.bb
+++ b/packages/xcb/libxcb_0.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-FILE_PR = "r0"
+PR = "r0"
 
 PARALLEL_MAKE = ""
 DEPENDS = "xcb-proto xproto libxau"
diff --git a/packages/xcb/libxcb_1.0.bb b/packages/xcb/libxcb_1.0.bb
index a3701f723b..dd88a5390f 100644
--- a/packages/xcb/libxcb_1.0.bb
+++ b/packages/xcb/libxcb_1.0.bb
@@ -1,5 +1,5 @@
 include libxcb.inc
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "libpthread-stubs"
 
diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb
index e78bca38ad..cb7326efa0 100644
--- a/packages/xcb/libxcb_git.bb
+++ b/packages/xcb/libxcb_git.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 
 include libxcb.inc
 PV = "1.0+git"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS += "libpthread-stubs"
 
diff --git a/packages/xcb/xcb-demo_0.1.bb b/packages/xcb/xcb-demo_0.1.bb
index c76cce6c02..c52b30feb7 100644
--- a/packages/xcb/xcb-demo_0.1.bb
+++ b/packages/xcb/xcb-demo_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XCB: an X protocol C binding"
 SECTION = "x11"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libxcb xcb-util"
 
diff --git a/packages/xcb/xcb-demo_git.bb b/packages/xcb/xcb-demo_git.bb
index cbe0b25ca0..469f5f9042 100644
--- a/packages/xcb/xcb-demo_git.bb
+++ b/packages/xcb/xcb-demo_git.bb
@@ -5,7 +5,7 @@ SECTION = "x11"
 LICENSE = "MIT-X"
 HOMEPAGE = "http://xcb.freedesktop.org"
 PV = "0.1+git"
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libxcb xcb-util"
 
diff --git a/packages/xcb/xcb-proto_0.9.91.bb b/packages/xcb/xcb-proto_0.9.91.bb
index 775624d844..7ca4463402 100644
--- a/packages/xcb/xcb-proto_0.9.91.bb
+++ b/packages/xcb/xcb-proto_0.9.91.bb
@@ -1,2 +1,2 @@
 include xcb-proto.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-proto_0.9.92.bb b/packages/xcb/xcb-proto_0.9.92.bb
index 775624d844..7ca4463402 100644
--- a/packages/xcb/xcb-proto_0.9.92.bb
+++ b/packages/xcb/xcb-proto_0.9.92.bb
@@ -1,2 +1,2 @@
 include xcb-proto.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-proto_0.9.93.bb b/packages/xcb/xcb-proto_0.9.93.bb
index 775624d844..7ca4463402 100644
--- a/packages/xcb/xcb-proto_0.9.93.bb
+++ b/packages/xcb/xcb-proto_0.9.93.bb
@@ -1,2 +1,2 @@
 include xcb-proto.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb
index cc6fd5fcf2..b483c426d3 100644
--- a/packages/xcb/xcb-proto_0.9.bb
+++ b/packages/xcb/xcb-proto_0.9.bb
@@ -1,2 +1,2 @@
 include xcb-proto.bb
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-proto_1.0.bb b/packages/xcb/xcb-proto_1.0.bb
index 775624d844..7ca4463402 100644
--- a/packages/xcb/xcb-proto_1.0.bb
+++ b/packages/xcb/xcb-proto_1.0.bb
@@ -1,2 +1,2 @@
 include xcb-proto.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb
index 1867da3823..26b6ce7d01 100644
--- a/packages/xcb/xcb-proto_git.bb
+++ b/packages/xcb/xcb-proto_git.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 
 include xcb-proto.inc
 PV = "1.0+git"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
 S = "${WORKDIR}/git/xcb-proto"
diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb
index 656ee3f428..5f3057f489 100644
--- a/packages/xcb/xcb-util_0.1.bb
+++ b/packages/xcb/xcb-util_0.1.bb
@@ -1,2 +1,2 @@
 include xcb-util.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-util_0.2.bb b/packages/xcb/xcb-util_0.2.bb
index 656ee3f428..5f3057f489 100644
--- a/packages/xcb/xcb-util_0.2.bb
+++ b/packages/xcb/xcb-util_0.2.bb
@@ -1,2 +1,2 @@
 include xcb-util.inc
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb
index d8abaad720..8806081b75 100644
--- a/packages/xcb/xcb-util_git.bb
+++ b/packages/xcb/xcb-util_git.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
 
 include xcb-util.inc
 PV = "0.2+git"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
 S = "${WORKDIR}/git/xcb-util"
diff --git a/packages/xchat/xchat_2.6.8.bb b/packages/xchat/xchat_2.6.8.bb
index 2c91d3990b..4c6dc732d4 100644
--- a/packages/xchat/xchat_2.6.8.bb
+++ b/packages/xchat/xchat_2.6.8.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
 
diff --git a/packages/xchat/xchat_2.8.4.bb b/packages/xchat/xchat_2.8.4.bb
index d5634f7f39..6626f67ed1 100644
--- a/packages/xchat/xchat_2.8.4.bb
+++ b/packages/xchat/xchat_2.8.4.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
 DEPENDS += "gdk-pixbuf-csource-native"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2"
 
diff --git a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index c2dea17a71..e87a72ab19 100644
--- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DESCRIPTION = "Transparent xcursor theme for handheld systems"
 SECTION = "x11/base"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch;patch=1 \
diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
index 8d42dbead5..c1fad3aeed 100644
--- a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
+++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch
 SECTION = "x11/base"
 RREPLACES = "xcursor-transparent-theme"
 RPROVIDES = "xcursor-transparent-theme"
-FILE_PR ="r4"
+PR ="r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch;patch=1 \
diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb
index b35490161e..4f72e9dc77 100644
--- a/packages/xerces-c/xerces-c_2.8.0.bb
+++ b/packages/xerces-c/xerces-c_2.8.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://xerces.apache.org/xerces-c/"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz"
 S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
diff --git a/packages/xfce/thunar_0.9.0.bb b/packages/xfce/thunar_0.9.0.bb
index 4c5f02565e..8638b5add3 100644
--- a/packages/xfce/thunar_0.9.0.bb
+++ b/packages/xfce/thunar_0.9.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
 inherit xfce pkgconfig
 
 SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
-FILE_PR = 'r1'
+PR = 'r1'
 
 S = "${WORKDIR}/Thunar-${PV}/"
 
diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index 8ad747b3bc..4edbf9d13b 100644
--- a/packages/xfce/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -5,7 +5,7 @@
 DESCRIPTION="XFCE4 Settings manager."
 DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
 SECTION = "x11"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit xfce 
 
diff --git a/packages/xfce/xfdesktop_4.4.2.bb b/packages/xfce/xfdesktop_4.4.2.bb
index 5b01c16e34..2e6a9365f3 100644
--- a/packages/xfce/xfdesktop_4.4.2.bb
+++ b/packages/xfce/xfdesktop_4.4.2.bb
@@ -5,7 +5,7 @@
 DESCRIPTION="xfce4 Desktop Background Manager"
 SECTION = "x11/base"
 DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel thunar"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit xfce
 
diff --git a/packages/xfsprogs/xfsprogs_2.8.16.bb b/packages/xfsprogs/xfsprogs_2.8.16.bb
index c01054f4f8..603b6cbb08 100644
--- a/packages/xfsprogs/xfsprogs_2.8.16.bb
+++ b/packages/xfsprogs/xfsprogs_2.8.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XFS Filesystem Utilities"
 HOMEPAGE = "http://oss.sgi.com/projects/xfs"
 LICENSE = "GPL"
 SECTION = "base"
-FILE_PR = "r2"
+PR = "r2"
 DEPENDS = "e2fsprogs-libs"
 
 SRC_URI = "ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/xfsprogs_2.8.16-1.tar.gz"
diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb
index ede3170940..d6d42223d0 100644
--- a/packages/xinetd/xinetd_2.3.13.bb
+++ b/packages/xinetd/xinetd_2.3.13.bb
@@ -1,6 +1,6 @@
 DEPENDS = ""
 DESCRIPTION = "Highly configurable, modular and secure inetd"
-FILE_PR ="r4"
+PR ="r4"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
 	  file://xinetd.init \
diff --git a/packages/xkbd/xkbd-layout-ru_0.1.1.bb b/packages/xkbd/xkbd-layout-ru_0.1.1.bb
index 7eda0e758c..53fbb3c7aa 100644
--- a/packages/xkbd/xkbd-layout-ru_0.1.1.bb
+++ b/packages/xkbd/xkbd-layout-ru_0.1.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
-FILE_PR = "r1"
+PR = "r1"
 RDEPENDS = "xkbd"
 
 #SRC_URI = "http://whitenoise.ssrlab.com/pda/xkbd/xkbd-ru-en-123_0.1.1.tar.gz" 
diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb
index 1f4038808a..370d1eaa85 100644
--- a/packages/xkbd/xkbd_0.8.15.bb
+++ b/packages/xkbd/xkbd_0.8.15.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/xkbd-${PV}-CVS.
 	   file://differentiate-desktop-name.patch;patch=1 \
 	   file://xkbd.png"
 LICENSE = "GPL"
-FILE_PR = "r4"
+PR = "r4"
 
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"
diff --git a/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
index f59db3e78a..cb448be243 100644
--- a/packages/xkeyboard-config/xkeyboard-config_1.3.bb
+++ b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 Keyboard layouts"
 LICENSE = "MIT"
 DEPENDS = "intltool xkbcomp-native"
 RDEPENDS = "xkbcomp"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
 
diff --git a/packages/xmlpull/xmlpull_1.1.3.4c.bb b/packages/xmlpull/xmlpull_1.1.3.4c.bb
index ced765d6c7..1ba09f79b6 100644
--- a/packages/xmlpull/xmlpull_1.1.3.4c.bb
+++ b/packages/xmlpull/xmlpull_1.1.3.4c.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.xmlpull.org"
 PRIORITY = "optional"
 SECTION = "libs"
 LICENSE = "public domain"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit java-library
 
diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb
index f19866aabb..d429449435 100644
--- a/packages/xmms-embedded/xmms-embedded_20040327.bb
+++ b/packages/xmms-embedded/xmms-embedded_20040327.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plu
 SECTION = "opie/multimedia"
 DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod"
 LICENSE = "GPL"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \
            file://bogusincdir.patch;patch=1 \
diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb
index dfde697809..3fe2983b12 100644
--- a/packages/xmms/xmms_1.2.10.bb
+++ b/packages/xmms/xmms_1.2.10.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \
            file://xmms-config-dequote.patch;patch=1 \
 	   file://acinclude.m4 \
            file://xmms.sh"
-FILE_PR = "r3"
+PR = "r3"
 
 RRECOMMENDS_${PN} = "xmms-plugin-output-oss xmms-plugin-output-alsa \
                     xmms-mad xmms-tremor"
diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb
index fc24a4312b..813a390c7c 100644
--- a/packages/xmonobut/xmonobut_0.4.1.bb
+++ b/packages/xmonobut/xmonobut_0.4.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "utility to allow middle and right clicking with a stylus"
 SECTION = "x11/utils"
 DEPENDS = "virtual/libx11 libxext libxpm libmatchbox"
diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb
index ca303ad2d5..97ebcbd84c 100644
--- a/packages/xmonobut/xmonobut_0.4.bb
+++ b/packages/xmonobut/xmonobut_0.4.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 DESCRIPTION = "utility to allow middle and right clicking with a stylus"
 SECTION = "x11/utils"
 DEPENDS = "virtual/libx11 libxext libxpm"
diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb
index e3a8725f04..e9cd7ee9b7 100644
--- a/packages/xoo/xoo_svn.bb
+++ b/packages/xoo/xoo_svn.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://projects.o-hand.com/xoo"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat"
 PV = "0.7+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
            file://*.png \
diff --git a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
index eff4a4bbf2..24ff14e01a 100644
--- a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
+++ b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "mkbold-mkitalic : make bold and italic fonts from normal fonts"
 HOMEPAGE = "http://hp.vector.co.jp/authors/VA013651/freeSoftware/mkbold-mkitalic.html"
 PRIORITY = "optional"
 LICENSE = "MIT/X"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://hp.vector.co.jp/authors/VA013651/lib/mkbold-mkitalic-${PV}.tar.bz2 \
            file://makebifonts"
diff --git a/packages/xorg-app/mkfontdir-native_1.0.3.bb b/packages/xorg-app/mkfontdir-native_1.0.3.bb
index bd6801e702..1c62b85a1d 100644
--- a/packages/xorg-app/mkfontdir-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir-native_1.0.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native mkfontscale-native"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 S = "${WORKDIR}/mkfontdir-${PV}"
diff --git a/packages/xorg-app/x11perf_1.4.1.bb b/packages/xorg-app/x11perf_1.4.1.bb
index 363d37133e..35680e7925 100644
--- a/packages/xorg-app/x11perf_1.4.1.bb
+++ b/packages/xorg-app/x11perf_1.4.1.bb
@@ -2,5 +2,5 @@ require xorg-app-common.inc
 
 DESCRIPTION = "X11 server performance test program"
 DEPENDS += "libxmu libxrender libxft libxext fontconfig"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-app/xauth_1.0.2.bb b/packages/xorg-app/xauth_1.0.2.bb
index c9c252c013..93ddf7e828 100644
--- a/packages/xorg-app/xauth_1.0.2.bb
+++ b/packages/xorg-app/xauth_1.0.2.bb
@@ -2,5 +2,5 @@ require xorg-app-common.inc
 
 DESCRIPTION = "X authority file utility"
 DEPENDS += "libxau libxext libxmu"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb
index b02d2078e3..4764a7089f 100644
--- a/packages/xorg-app/xdpyinfo_1.0.2.bb
+++ b/packages/xorg-app/xdpyinfo_1.0.2.bb
@@ -3,7 +3,7 @@ require xorg-app-common.inc
 DESCRIPTION = "X display information utility"
 LICENSE = "MIT"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch;patch=1"
diff --git a/packages/xorg-app/xrandr_1.2.0.bb b/packages/xorg-app/xrandr_1.2.0.bb
index 8ee93a302a..b730f6ce79 100644
--- a/packages/xorg-app/xrandr_1.2.0.bb
+++ b/packages/xorg-app/xrandr_1.2.0.bb
@@ -5,5 +5,5 @@ LICENSE= "BSD-X"
 
 DEPENDS += " libxrandr libxrender virtual/libx11"
 PE = "1"
-FILE_PR = "r2"
+PR = "r2"
 
diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.2.bb b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb
index af63bb8a42..bf50e87839 100644
--- a/packages/xorg-driver/xf86-video-nsc_2.8.2.bb
+++ b/packages/xorg-driver/xf86-video-nsc_2.8.2.bb
@@ -1,6 +1,6 @@
 require xorg-driver-video.inc
 PE = "1"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS += " xf86dgaproto"
 
diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb
index 34ce3de4ff..9be61695ae 100644
--- a/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/packages/xorg-driver/xf86-video-omapfb_git.bb
@@ -2,7 +2,7 @@ require xorg-driver-video.inc
 
 DESCRIPTION = "X.Org X server -- OMAP display driver"
 
-FILE_PR ="r10"
+PR ="r10"
 
 SRCREV = "7bf64be8e809d00c10c6bdae6933bdc71c642ea4"
 PV = "0.0.1+${PR}+git${SRCREV}"
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index 2a9f8c126c..a75e409c8c 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "X driver"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/drivers"
 LICENSE = "MIT-X"
-FILE_PR = "r2"
+PR = "r2"
 
 DEPENDS = "randrproto xorg-server xproto"
 
diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb
index d83d45515f..3ba1c05a29 100644
--- a/packages/xorg-font/font-util_1.0.1.bb
+++ b/packages/xorg-font/font-util_1.0.1.bb
@@ -7,5 +7,5 @@ DESCRIPTION = "X font utils."
 DEPENDS = "encodings"
 RDEPENDS = "mkfontdir mkfontscale encodings"
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
index e01ea3d3d2..78068e0534 100644
--- a/packages/xorg-font/xfonts-xorg_6.8.bb
+++ b/packages/xorg-font/xfonts-xorg_6.8.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
-FILE_PR = "r1"
+PR = "r1"
 # XXX Is this true?  These fonts are from X.org.
 LICENSE = "XFree86"
 
diff --git a/packages/xorg-font/xorg-minimal-fonts.bb b/packages/xorg-font/xorg-minimal-fonts.bb
index ff970e6c37..d91c6d772d 100644
--- a/packages/xorg-font/xorg-minimal-fonts.bb
+++ b/packages/xorg-font/xorg-minimal-fonts.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "file://misc"
 
diff --git a/packages/xorg-lib/libapplewm_1.0.0.bb b/packages/xorg-lib/libapplewm_1.0.0.bb
index a05d2eaedb..bc502fb505 100644
--- a/packages/xorg-lib/libapplewm_1.0.0.bb
+++ b/packages/xorg-lib/libapplewm_1.0.0.bb
@@ -1,7 +1,7 @@
 require xorg-lib-common.inc
 
 DEPENDS += "libxext applewmproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libAppleWM"
diff --git a/packages/xorg-lib/libdmx_1.0.2.bb b/packages/xorg-lib/libdmx_1.0.2.bb
index f6dc91dead..9b66101563 100644
--- a/packages/xorg-lib/libdmx_1.0.2.bb
+++ b/packages/xorg-lib/libdmx_1.0.2.bb
@@ -2,5 +2,5 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Distributed Multihead extension library"
 DEPENDS += "libxext dmxproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb
index 5d91e9a632..654fc72eca 100644
--- a/packages/xorg-lib/libfontenc_1.0.4.bb
+++ b/packages/xorg-lib/libfontenc_1.0.4.bb
@@ -3,5 +3,5 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 font encoding library"
 LICENSE = "BSD-X"
 DEPENDS += "zlib xproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-lib/libfs_1.0.0.bb b/packages/xorg-lib/libfs_1.0.0.bb
index 460771ef2b..010aa311e0 100644
--- a/packages/xorg-lib/libfs_1.0.0.bb
+++ b/packages/xorg-lib/libfs_1.0.0.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Font Services library"
 DEPENDS += "xproto fontsproto xtrans"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libFS"
diff --git a/packages/xorg-lib/libice_1.0.3.bb b/packages/xorg-lib/libice_1.0.3.bb
index 3f35b8dbc4..e4a6557397 100644
--- a/packages/xorg-lib/libice_1.0.3.bb
+++ b/packages/xorg-lib/libice_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Inter-Client Exchange library"
 DEPENDS += "xproto xtrans"
 PROVIDES = "ice"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
diff --git a/packages/xorg-lib/libice_1.0.4.bb b/packages/xorg-lib/libice_1.0.4.bb
index 3f35b8dbc4..e4a6557397 100644
--- a/packages/xorg-lib/libice_1.0.4.bb
+++ b/packages/xorg-lib/libice_1.0.4.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Inter-Client Exchange library"
 DEPENDS += "xproto xtrans"
 PROVIDES = "ice"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
diff --git a/packages/xorg-lib/libsm_1.0.3.bb b/packages/xorg-lib/libsm_1.0.3.bb
index fd7ac1806e..edb6ff45ca 100644
--- a/packages/xorg-lib/libsm_1.0.3.bb
+++ b/packages/xorg-lib/libsm_1.0.3.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Session management library"
 DEPENDS += "libice xproto xtrans"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libSM"
diff --git a/packages/xorg-lib/libx11-trim_1.1.5.bb b/packages/xorg-lib/libx11-trim_1.1.5.bb
index c3f005e9b1..e99b2a07b0 100644
--- a/packages/xorg-lib/libx11-trim_1.1.5.bb
+++ b/packages/xorg-lib/libx11-trim_1.1.5.bb
@@ -9,7 +9,7 @@ DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfont
 PROVIDES = "virtual/libx11"
 
 PE = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "libX11"
 LEAD_SONAME = "libX11.so"
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 78afda8bfa..5b1e304d51 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,6 +1,6 @@
 require xorg-lib-common.inc
 PE = "1"
-FILE_PR = "r5"
+PR = "r5"
 
 DESCRIPTION = "Base X libs."
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index c5b17e1b78..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 XORG_PN = "libX11"
 
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
index c5b17e1b78..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.3.bb
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 XORG_PN = "libX11"
 
diff --git a/packages/xorg-lib/libx11_1.1.4.bb b/packages/xorg-lib/libx11_1.1.4.bb
index 60aa7ab98e..7ab3a7bb94 100644
--- a/packages/xorg-lib/libx11_1.1.4.bb
+++ b/packages/xorg-lib/libx11_1.1.4.bb
@@ -5,7 +5,7 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
 PROVIDES = "virtual/libx11"
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 XORG_PN = "libX11"
 
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index 2622accafe..f2929624e8 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -6,7 +6,7 @@ LICENSE = "XFree86"
 DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
 PROVIDES = "virtual/libx11"
 RPROVIDES = "virtual/libx11"
-FILE_PR = "r1"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/packages/xorg-lib/libxau-native_1.0.3.bb b/packages/xorg-lib/libxau-native_1.0.3.bb
index 06389be2c8..3fc07b6ab6 100644
--- a/packages/xorg-lib/libxau-native_1.0.3.bb
+++ b/packages/xorg-lib/libxau-native_1.0.3.bb
@@ -2,7 +2,7 @@ require libxau_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
 PROVIDES = ""
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "libXau"
 
diff --git a/packages/xorg-lib/libxaw_1.0.3.bb b/packages/xorg-lib/libxaw_1.0.3.bb
index 33646910ce..f45431e79e 100644
--- a/packages/xorg-lib/libxaw_1.0.3.bb
+++ b/packages/xorg-lib/libxaw_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 PROVIDES = "xaw"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXaw"
diff --git a/packages/xorg-lib/libxaw_1.0.4.bb b/packages/xorg-lib/libxaw_1.0.4.bb
index 33646910ce..f45431e79e 100644
--- a/packages/xorg-lib/libxaw_1.0.4.bb
+++ b/packages/xorg-lib/libxaw_1.0.4.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
 PROVIDES = "xaw"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXaw"
diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb
index 4ca7990a9a..4713eccc48 100644
--- a/packages/xorg-lib/libxcursor_1.1.8.bb
+++ b/packages/xorg-lib/libxcursor_1.1.8.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
 DEPENDS += "libxrender libxfixes"
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "libXcursor"
diff --git a/packages/xorg-lib/libxcursor_1.1.9.bb b/packages/xorg-lib/libxcursor_1.1.9.bb
index 4ca7990a9a..4713eccc48 100644
--- a/packages/xorg-lib/libxcursor_1.1.9.bb
+++ b/packages/xorg-lib/libxcursor_1.1.9.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
 DEPENDS += "libxrender libxfixes"
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "libXcursor"
diff --git a/packages/xorg-lib/libxdamage_1.1.1.bb b/packages/xorg-lib/libxdamage_1.1.1.bb
index e7798cebbb..e56d1d0954 100644
--- a/packages/xorg-lib/libxdamage_1.1.1.bb
+++ b/packages/xorg-lib/libxdamage_1.1.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 damaged region extension library"
 LICENSE= "BSD-X"
 DEPENDS += "damageproto libxfixes"
 PROVIDES = "xdamage"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdamage"
diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
index 9b33bea80c..873e9397d7 100644
--- a/packages/xorg-lib/libxdmcp-native_1.0.2.bb
+++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb
@@ -1,7 +1,7 @@
 require libxdmcp_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdmcp"
diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb
index 6ec1a738a8..0aa95b4677 100644
--- a/packages/xorg-lib/libxdmcp_1.0.2.bb
+++ b/packages/xorg-lib/libxdmcp_1.0.2.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Display Manager Control Protocol library"
 DEPENDS += "xproto"
 PROVIDES = "xdmcp"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdmcp"
diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb
index 5777fcca7b..6c6b4595aa 100644
--- a/packages/xorg-lib/libxevie_1.0.2.bb
+++ b/packages/xorg-lib/libxevie_1.0.2.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 EvIE extension library"
 DEPENDS += "libxext evieext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXevie"
diff --git a/packages/xorg-lib/libxext_1.0.3.bb b/packages/xorg-lib/libxext_1.0.3.bb
index 594e102385..81231a866c 100644
--- a/packages/xorg-lib/libxext_1.0.3.bb
+++ b/packages/xorg-lib/libxext_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 PROVIDES = "xext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxext_1.0.4.bb b/packages/xorg-lib/libxext_1.0.4.bb
index 594e102385..81231a866c 100644
--- a/packages/xorg-lib/libxext_1.0.4.bb
+++ b/packages/xorg-lib/libxext_1.0.4.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 PROVIDES = "xext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
diff --git a/packages/xorg-lib/libxfont_1.3.0.bb b/packages/xorg-lib/libxfont_1.3.0.bb
index 97b8d93144..d452d9796d 100644
--- a/packages/xorg-lib/libxfont_1.3.0.bb
+++ b/packages/xorg-lib/libxfont_1.3.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 font rasterisation library"
 LICENSE= "BSD-X"
 DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 PROVIDES = "xfont"
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
 
 SRC_URI += "file://no-scalable-crash.patch;patch=1 \
diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb
index b06b95ed07..ee999de4f5 100644
--- a/packages/xorg-lib/libxfontcache_1.0.4.bb
+++ b/packages/xorg-lib/libxfontcache_1.0.4.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X-TrueType font cache extension client library"
 DEPENDS += "libxext fontcacheproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXfontcache"
diff --git a/packages/xorg-lib/libxft_2.1.12.bb b/packages/xorg-lib/libxft_2.1.12.bb
index 6127812a83..c113951406 100644
--- a/packages/xorg-lib/libxft_2.1.12.bb
+++ b/packages/xorg-lib/libxft_2.1.12.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "FreeType-based font drawing library for X"
 DEPENDS += "libxrender freetype fontconfig"
 PROVIDES = "xft"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXft"
diff --git a/packages/xorg-lib/libxi_1.1.2.bb b/packages/xorg-lib/libxi_1.1.2.bb
index 19935ccd8a..31e3b4906d 100644
--- a/packages/xorg-lib/libxi_1.1.2.bb
+++ b/packages/xorg-lib/libxi_1.1.2.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxi_1.1.3.bb b/packages/xorg-lib/libxi_1.1.3.bb
index 19935ccd8a..31e3b4906d 100644
--- a/packages/xorg-lib/libxi_1.1.3.bb
+++ b/packages/xorg-lib/libxi_1.1.3.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index b3dcf35ccf..b7135bc28e 100644
--- a/packages/xorg-lib/libxinerama_1.0.2.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Xinerama extension library"
 DEPENDS += "libxext xineramaproto"
 PROVIDES = "xinerama"
-FILE_PR = "r3"
+PR = "r3"
 PE = "1"
 
 XORG_PN = "libXinerama"
diff --git a/packages/xorg-lib/libxinerama_1.0.3.bb b/packages/xorg-lib/libxinerama_1.0.3.bb
index b3dcf35ccf..b7135bc28e 100644
--- a/packages/xorg-lib/libxinerama_1.0.3.bb
+++ b/packages/xorg-lib/libxinerama_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Xinerama extension library"
 DEPENDS += "libxext xineramaproto"
 PROVIDES = "xinerama"
-FILE_PR = "r3"
+PR = "r3"
 PE = "1"
 
 XORG_PN = "libXinerama"
diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb
index caf241b456..a404180d49 100644
--- a/packages/xorg-lib/libxkbfile_1.0.4.bb
+++ b/packages/xorg-lib/libxkbfile_1.0.4.bb
@@ -3,5 +3,5 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 kbproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-lib/libxkbfile_1.0.5.bb b/packages/xorg-lib/libxkbfile_1.0.5.bb
index caf241b456..a404180d49 100644
--- a/packages/xorg-lib/libxkbfile_1.0.5.bb
+++ b/packages/xorg-lib/libxkbfile_1.0.5.bb
@@ -3,5 +3,5 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 kbproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-lib/libxkbui_1.0.2.bb b/packages/xorg-lib/libxkbui_1.0.2.bb
index ac772f8845..9a3f5f1327 100644
--- a/packages/xorg-lib/libxkbui_1.0.2.bb
+++ b/packages/xorg-lib/libxkbui_1.0.2.bb
@@ -4,5 +4,5 @@ DESCRIPTION = "X11 keyboard UI presentation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 libxt libxkbfile"
 PROVIDES = "xkbui"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb
index e487b320e2..9a02bf82be 100644
--- a/packages/xorg-lib/libxmu_1.0.3.bb
+++ b/packages/xorg-lib/libxmu_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous utility library"
 DEPENDS += "libxt libxext"
 PROVIDES = "xmu"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXmu"
diff --git a/packages/xorg-lib/libxmu_1.0.4.bb b/packages/xorg-lib/libxmu_1.0.4.bb
index e487b320e2..9a02bf82be 100644
--- a/packages/xorg-lib/libxmu_1.0.4.bb
+++ b/packages/xorg-lib/libxmu_1.0.4.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous utility library"
 DEPENDS += "libxt libxext"
 PROVIDES = "xmu"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXmu"
diff --git a/packages/xorg-lib/libxp_1.0.0.bb b/packages/xorg-lib/libxp_1.0.0.bb
index d4157a5fba..53fb47c054 100644
--- a/packages/xorg-lib/libxp_1.0.0.bb
+++ b/packages/xorg-lib/libxp_1.0.0.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Printing Extension (Xprint) client library"
 DEPENDS += "libxext libxau printproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXp"
diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb
index 556cbebf49..75c10bf2c9 100644
--- a/packages/xorg-lib/libxpm_3.5.6.bb
+++ b/packages/xorg-lib/libxpm_3.5.6.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
 DEPENDS += "libxext libsm libxt"
-FILE_PR = "r3"
+PR = "r3"
 PE = "1"
 
 XORG_PN = "libXpm"
diff --git a/packages/xorg-lib/libxpm_3.5.7.bb b/packages/xorg-lib/libxpm_3.5.7.bb
index 556cbebf49..75c10bf2c9 100644
--- a/packages/xorg-lib/libxpm_3.5.7.bb
+++ b/packages/xorg-lib/libxpm_3.5.7.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
 DEPENDS += "libxext libsm libxt"
-FILE_PR = "r3"
+PR = "r3"
 PE = "1"
 
 XORG_PN = "libXpm"
diff --git a/packages/xorg-lib/libxprintapputil_1.0.1.bb b/packages/xorg-lib/libxprintapputil_1.0.1.bb
index 28930099b6..3a24a888d1 100644
--- a/packages/xorg-lib/libxprintapputil_1.0.1.bb
+++ b/packages/xorg-lib/libxprintapputil_1.0.1.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "Xprint job utility client library"
 DEPENDS += "libxp libxt libxprintutil"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXprintAppUtil"
diff --git a/packages/xorg-lib/libxprintutil_1.0.1.bb b/packages/xorg-lib/libxprintutil_1.0.1.bb
index 7f6f3c27eb..327138e7fd 100644
--- a/packages/xorg-lib/libxprintutil_1.0.1.bb
+++ b/packages/xorg-lib/libxprintutil_1.0.1.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "Xprint printer utility client library"
 DEPENDS += "libxp libxt"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXprintUtil"
diff --git a/packages/xorg-lib/libxrandr_1.2.1.bb b/packages/xorg-lib/libxrandr_1.2.1.bb
index 8b36a0c676..611859fd52 100644
--- a/packages/xorg-lib/libxrandr_1.2.1.bb
+++ b/packages/xorg-lib/libxrandr_1.2.1.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrandr"
diff --git a/packages/xorg-lib/libxrandr_1.2.2.bb b/packages/xorg-lib/libxrandr_1.2.2.bb
index 8b36a0c676..611859fd52 100644
--- a/packages/xorg-lib/libxrandr_1.2.2.bb
+++ b/packages/xorg-lib/libxrandr_1.2.2.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrandr"
diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb
index 4eb5739564..f8b9c37b50 100644
--- a/packages/xorg-lib/libxrender_0.9.2.bb
+++ b/packages/xorg-lib/libxrender_0.9.2.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxrender_0.9.3.bb b/packages/xorg-lib/libxrender_0.9.3.bb
index 95faccea11..0a345b951c 100644
--- a/packages/xorg-lib/libxrender_0.9.3.bb
+++ b/packages/xorg-lib/libxrender_0.9.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto"
-FILE_PR = "r0"
+PR = "r0"
 PE = "1"
 
 XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxrender_0.9.4.bb b/packages/xorg-lib/libxrender_0.9.4.bb
index 2e12e945e7..ad833a8259 100644
--- a/packages/xorg-lib/libxrender_0.9.4.bb
+++ b/packages/xorg-lib/libxrender_0.9.4.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrender"
diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb
index 553b6d9998..02a0cae0d8 100644
--- a/packages/xorg-lib/libxres_1.0.3.bb
+++ b/packages/xorg-lib/libxres_1.0.3.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Resource extension library"
 DEPENDS += "libxext resourceproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXres"
diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
index 8b8be6c27f..ff22c337a0 100644
--- a/packages/xorg-lib/libxscrnsaver_1.1.2.bb
+++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS += "libxext scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxscrnsaver_1.1.3.bb b/packages/xorg-lib/libxscrnsaver_1.1.3.bb
index 8b8be6c27f..ff22c337a0 100644
--- a/packages/xorg-lib/libxscrnsaver_1.1.3.bb
+++ b/packages/xorg-lib/libxscrnsaver_1.1.3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS += "libxext scrnsaverproto"
 PROVIDES = "libxss"
 RREPLACES = "libxss"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXScrnSaver"
diff --git a/packages/xorg-lib/libxt_1.0.5.bb b/packages/xorg-lib/libxt_1.0.5.bb
index 55632cfdcf..1c215da51d 100644
--- a/packages/xorg-lib/libxt_1.0.5.bb
+++ b/packages/xorg-lib/libxt_1.0.5.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 toolkit intrinsics library"
 DEPENDS += "libsm virtual/libx11 kbproto"
 PROVIDES = "xt"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXt"
diff --git a/packages/xorg-lib/libxtrap_1.0.0.bb b/packages/xorg-lib/libxtrap_1.0.0.bb
index fddabbb16d..7a25ae5bce 100644
--- a/packages/xorg-lib/libxtrap_1.0.0.bb
+++ b/packages/xorg-lib/libxtrap_1.0.0.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 event trapping extension library"
 DEPENDS += "libxt trapproto libxext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXTrap"
diff --git a/packages/xorg-lib/libxtst_1.0.2.bb b/packages/xorg-lib/libxtst_1.0.2.bb
index ec5a2d7ba8..14e10ff285 100644
--- a/packages/xorg-lib/libxtst_1.0.2.bb
+++ b/packages/xorg-lib/libxtst_1.0.2.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Test Extension: client side library"
 DEPENDS += "libxext recordproto inputproto"
 PROVIDES = "xtst"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXtst"
diff --git a/packages/xorg-lib/libxtst_1.0.3.bb b/packages/xorg-lib/libxtst_1.0.3.bb
index ec5a2d7ba8..14e10ff285 100644
--- a/packages/xorg-lib/libxtst_1.0.3.bb
+++ b/packages/xorg-lib/libxtst_1.0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Test Extension: client side library"
 DEPENDS += "libxext recordproto inputproto"
 PROVIDES = "xtst"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXtst"
diff --git a/packages/xorg-lib/libxv_1.0.3.bb b/packages/xorg-lib/libxv_1.0.3.bb
index 8a3373e08e..6014326e90 100644
--- a/packages/xorg-lib/libxv_1.0.3.bb
+++ b/packages/xorg-lib/libxv_1.0.3.bb
@@ -3,6 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext videoproto"
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "libXv"
diff --git a/packages/xorg-lib/libxv_1.0.4.bb b/packages/xorg-lib/libxv_1.0.4.bb
index 8a3373e08e..6014326e90 100644
--- a/packages/xorg-lib/libxv_1.0.4.bb
+++ b/packages/xorg-lib/libxv_1.0.4.bb
@@ -3,6 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext videoproto"
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "libXv"
diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb
index eeb4a337b6..64943ce9bd 100644
--- a/packages/xorg-lib/libxvmc_1.0.4.bb
+++ b/packages/xorg-lib/libxvmc_1.0.4.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Video Motion Compensation extension library"
 DEPENDS += "libxext libxv videoproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXvMC"
diff --git a/packages/xorg-lib/libxxf86dga_1.0.1.bb b/packages/xorg-lib/libxxf86dga_1.0.1.bb
index f16b5e5783..47492d7108 100644
--- a/packages/xorg-lib/libxxf86dga_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86dga_1.0.1.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Direct Graphics Access extension library"
 DEPENDS += "libxext xf86dgaproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86dga_1.0.2.bb b/packages/xorg-lib/libxxf86dga_1.0.2.bb
index f16b5e5783..47492d7108 100644
--- a/packages/xorg-lib/libxxf86dga_1.0.2.bb
+++ b/packages/xorg-lib/libxxf86dga_1.0.2.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Direct Graphics Access extension library"
 DEPENDS += "libxext xf86dgaproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86dga"
diff --git a/packages/xorg-lib/libxxf86misc_1.0.1.bb b/packages/xorg-lib/libxxf86misc_1.0.1.bb
index 8578ccd466..d1f8719cde 100644
--- a/packages/xorg-lib/libxxf86misc_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86misc_1.0.1.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 XFree86 miscellaneous extension library"
 DEPENDS += "libxext xf86miscproto"
 PROVIDES = "xxf86misc"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86misc"
diff --git a/packages/xorg-lib/libxxf86vm_1.0.1.bb b/packages/xorg-lib/libxxf86vm_1.0.1.bb
index f68136f888..efb90d4854 100644
--- a/packages/xorg-lib/libxxf86vm_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86vm_1.0.1.bb
@@ -2,7 +2,7 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 video mode extension library"
 DEPENDS += "libxext xf86vidmodeproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86vm"
diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb
index 1cb758655f..239684e71f 100644
--- a/packages/xorg-lib/pixman_0.11.8.bb
+++ b/packages/xorg-lib/pixman_0.11.8.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
-FILE_PR = "r4"
+PR = "r4"
 
 SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
            file://pixman-arm.patch;patch=1 \
diff --git a/packages/xorg-lib/pixman_0.9.4.bb b/packages/xorg-lib/pixman_0.9.4.bb
index 6e9fc524b9..08b29fedef 100644
--- a/packages/xorg-lib/pixman_0.9.4.bb
+++ b/packages/xorg-lib/pixman_0.9.4.bb
@@ -2,5 +2,5 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "Library for lowlevel pixel operations"
 DEPENDS = "virtual/libx11"
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/xorg-lib/xtrans_1.2.1.bb b/packages/xorg-lib/xtrans_1.2.1.bb
index 43d37c4fe1..75ba93c783 100644
--- a/packages/xorg-lib/xtrans_1.2.1.bb
+++ b/packages/xorg-lib/xtrans_1.2.1.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "network API translation layer to insulate X applications and \
 libraries from OS network vageries."
 PE = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
 
diff --git a/packages/xorg-proto/applewmproto_1.0.3.bb b/packages/xorg-proto/applewmproto_1.0.3.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/applewmproto_1.0.3.bb
+++ b/packages/xorg-proto/applewmproto_1.0.3.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
index ab59bb4f4e..e86417195d 100644
--- a/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
+++ b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
@@ -1,6 +1,6 @@
 require bigreqsproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "bigreqsproto"
 
diff --git a/packages/xorg-proto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_1.0.2.bb
index 35341f6ed4..ffe3bce8d8 100644
--- a/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "bigreqsproto"
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index 66bb0f4d49..02d20b5038 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -3,7 +3,7 @@ require xorg-proto-common.inc
 DESCRIPTION = "Touchscreen calibration protocol"
 
 PV = "0.0+git${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
 S = "${WORKDIR}/git"
diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb
index eb40a579d0..e7abb316ed 100644
--- a/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/packages/xorg-proto/damageproto_1.1.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "damageext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "damageproto"
diff --git a/packages/xorg-proto/dmxproto_2.2.2.bb b/packages/xorg-proto/dmxproto_2.2.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/dmxproto_2.2.2.bb
+++ b/packages/xorg-proto/dmxproto_2.2.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/evieext_1.0.2.bb b/packages/xorg-proto/evieext_1.0.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/evieext_1.0.2.bb
+++ b/packages/xorg-proto/evieext_1.0.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_4.0.bb
index d7580ac7ef..f9bc9d9e3c 100644
--- a/packages/xorg-proto/fixesproto_4.0.bb
+++ b/packages/xorg-proto/fixesproto_4.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "fixesext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "fixesproto"
diff --git a/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
index b9da879a1e..f6df67f59e 100644
--- a/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
+++ b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -1,6 +1,6 @@
 require fontcacheproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "fontcacheproto"
 
diff --git a/packages/xorg-proto/fontcacheproto_0.1.2.bb b/packages/xorg-proto/fontcacheproto_0.1.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/fontcacheproto_0.1.2.bb
+++ b/packages/xorg-proto/fontcacheproto_0.1.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/fontsproto-native_2.0.2.bb b/packages/xorg-proto/fontsproto-native_2.0.2.bb
index 6bf0b90e4e..4371a07836 100644
--- a/packages/xorg-proto/fontsproto-native_2.0.2.bb
+++ b/packages/xorg-proto/fontsproto-native_2.0.2.bb
@@ -1,6 +1,6 @@
 require fontsproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "fontsproto"
 
diff --git a/packages/xorg-proto/fontsproto_2.0.2.bb b/packages/xorg-proto/fontsproto_2.0.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/fontsproto_2.0.2.bb
+++ b/packages/xorg-proto/fontsproto_2.0.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/glproto_1.4.8.bb
+++ b/packages/xorg-proto/glproto_1.4.8.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/glproto_1.4.9.bb b/packages/xorg-proto/glproto_1.4.9.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/glproto_1.4.9.bb
+++ b/packages/xorg-proto/glproto_1.4.9.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/inputproto-native_1.4.2.bb b/packages/xorg-proto/inputproto-native_1.4.2.bb
index 5a384a9ca4..11e0dae601 100644
--- a/packages/xorg-proto/inputproto-native_1.4.2.bb
+++ b/packages/xorg-proto/inputproto-native_1.4.2.bb
@@ -1,6 +1,6 @@
 require inputproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "inputproto"
 
diff --git a/packages/xorg-proto/inputproto_1.4.2.bb b/packages/xorg-proto/inputproto_1.4.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/inputproto_1.4.2.bb
+++ b/packages/xorg-proto/inputproto_1.4.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/inputproto_1.4.4.bb b/packages/xorg-proto/inputproto_1.4.4.bb
index bad5313ecb..e3a8b09f2b 100644
--- a/packages/xorg-proto/inputproto_1.4.4.bb
+++ b/packages/xorg-proto/inputproto_1.4.4.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "inputproto"
diff --git a/packages/xorg-proto/kbproto-native_1.0.3.bb b/packages/xorg-proto/kbproto-native_1.0.3.bb
index 892a07fb31..68c677c07b 100644
--- a/packages/xorg-proto/kbproto-native_1.0.3.bb
+++ b/packages/xorg-proto/kbproto-native_1.0.3.bb
@@ -1,6 +1,6 @@
 require kbproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "kbproto"
 
diff --git a/packages/xorg-proto/kbproto_1.0.3.bb b/packages/xorg-proto/kbproto_1.0.3.bb
index 220689e1fa..b3e9ffc365 100644
--- a/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/packages/xorg-proto/kbproto_1.0.3.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "kbproto"
diff --git a/packages/xorg-proto/printproto_1.0.3.bb b/packages/xorg-proto/printproto_1.0.3.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/printproto_1.0.3.bb
+++ b/packages/xorg-proto/printproto_1.0.3.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/printproto_1.0.4.bb b/packages/xorg-proto/printproto_1.0.4.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/printproto_1.0.4.bb
+++ b/packages/xorg-proto/printproto_1.0.4.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb
index 3f6eba7ee9..85000cc900 100644
--- a/packages/xorg-proto/randrproto_1.2.1.bb
+++ b/packages/xorg-proto/randrproto_1.2.1.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "randrext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "randrproto"
diff --git a/packages/xorg-proto/recordproto_1.13.2.bb b/packages/xorg-proto/recordproto_1.13.2.bb
index 1301fd6759..af63403600 100644
--- a/packages/xorg-proto/recordproto_1.13.2.bb
+++ b/packages/xorg-proto/recordproto_1.13.2.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "recordext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_0.9.2.bb
index 3ae3ef4b5a..d4e0983a8b 100644
--- a/packages/xorg-proto/renderproto_0.9.2.bb
+++ b/packages/xorg-proto/renderproto_0.9.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "renderext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "renderproto"
diff --git a/packages/xorg-proto/resourceproto_1.0.2.bb b/packages/xorg-proto/resourceproto_1.0.2.bb
index 839ca65de6..1fb8aa7f12 100644
--- a/packages/xorg-proto/resourceproto_1.0.2.bb
+++ b/packages/xorg-proto/resourceproto_1.0.2.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "resourceext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/packages/xorg-proto/scrnsaverproto_1.1.0.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/scrnsaverproto_1.1.0.bb
+++ b/packages/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/trapproto_3.4.3.bb b/packages/xorg-proto/trapproto_3.4.3.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/trapproto_3.4.3.bb
+++ b/packages/xorg-proto/trapproto_3.4.3.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/videoproto_2.2.2.bb b/packages/xorg-proto/videoproto_2.2.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/videoproto_2.2.2.bb
+++ b/packages/xorg-proto/videoproto_2.2.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/windowswmproto_1.0.3.bb b/packages/xorg-proto/windowswmproto_1.0.3.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/windowswmproto_1.0.3.bb
+++ b/packages/xorg-proto/windowswmproto_1.0.3.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
index 1e3dc6728a..417a2aaf13 100644
--- a/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
+++ b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -1,6 +1,6 @@
 require xcmiscproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "xcmiscproto"
 
diff --git a/packages/xorg-proto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_1.1.2.bb
index 0ad7211c5f..8f48ecd9cd 100644
--- a/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "xcmiscproto"
diff --git a/packages/xorg-proto/xextproto-native_7.0.2.bb b/packages/xorg-proto/xextproto-native_7.0.2.bb
index e29645b914..ff2bc4ffd3 100644
--- a/packages/xorg-proto/xextproto-native_7.0.2.bb
+++ b/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -1,6 +1,6 @@
 require xextproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "xextproto"
 
diff --git a/packages/xorg-proto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_7.0.2.bb
index 2f95fd381c..829d3cbe1e 100644
--- a/packages/xorg-proto/xextproto_7.0.2.bb
+++ b/packages/xorg-proto/xextproto_7.0.2.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "xextproto"
diff --git a/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
index 1cbdf2a110..b0ac594997 100644
--- a/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
+++ b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -1,6 +1,6 @@
 require xf86bigfontproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "xf86bigfontproto"
 
diff --git a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
index 2b7fdead4c..f29fdb84a7 100644
--- a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "xf86bigfontproto"
diff --git a/packages/xorg-proto/xf86dgaproto_2.0.2.bb b/packages/xorg-proto/xf86dgaproto_2.0.2.bb
index 01f7413355..2e0e734858 100644
--- a/packages/xorg-proto/xf86dgaproto_2.0.2.bb
+++ b/packages/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86dgaext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xf86dgaproto_2.0.3.bb b/packages/xorg-proto/xf86dgaproto_2.0.3.bb
index 01f7413355..2e0e734858 100644
--- a/packages/xorg-proto/xf86dgaproto_2.0.3.bb
+++ b/packages/xorg-proto/xf86dgaproto_2.0.3.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86dgaext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xf86driproto_2.0.3.bb b/packages/xorg-proto/xf86driproto_2.0.3.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/xf86driproto_2.0.3.bb
+++ b/packages/xorg-proto/xf86driproto_2.0.3.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xf86miscproto_0.9.2.bb b/packages/xorg-proto/xf86miscproto_0.9.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/xf86miscproto_0.9.2.bb
+++ b/packages/xorg-proto/xf86miscproto_0.9.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xf86rushproto_1.1.2.bb b/packages/xorg-proto/xf86rushproto_1.1.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/xf86rushproto_1.1.2.bb
+++ b/packages/xorg-proto/xf86rushproto_1.1.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
index 44e5d7e816..946be11407 100644
--- a/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
+++ b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86vmext"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xineramaproto_1.1.2.bb b/packages/xorg-proto/xineramaproto_1.1.2.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/xineramaproto_1.1.2.bb
+++ b/packages/xorg-proto/xineramaproto_1.1.2.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb
index 889b5d5578..88ed38e93c 100644
--- a/packages/xorg-proto/xproto-native_7.0.10.bb
+++ b/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -1,6 +1,6 @@
 require xproto_${PV}.bb
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "xproto"
 
diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb
index acd7c8fbd7..9f09fff7b7 100644
--- a/packages/xorg-proto/xproto_7.0.10.bb
+++ b/packages/xorg-proto/xproto_7.0.10.bb
@@ -1,4 +1,4 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-proto/xproto_7.0.12.bb b/packages/xorg-proto/xproto_7.0.12.bb
index 54d8e029d9..1adf55d97a 100644
--- a/packages/xorg-proto/xproto_7.0.12.bb
+++ b/packages/xorg-proto/xproto_7.0.12.bb
@@ -1,6 +1,6 @@
 require xorg-proto-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "xproto"
diff --git a/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
index b17b776255..9c3d9efa71 100644
--- a/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -1,5 +1,5 @@
 require xorg-proto-common.inc
 
 PROVIDES="xproxymngproto"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-util/gccmakedep_1.0.2.bb b/packages/xorg-util/gccmakedep_1.0.2.bb
index b7c1f80d29..3abfa037a2 100644
--- a/packages/xorg-util/gccmakedep_1.0.2.bb
+++ b/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -3,5 +3,5 @@ require xorg-util-common.inc
 DESCRIPTION = "create dependencies in makefiles using 'gcc -M'"
 RDEPENDS = "gcc"
 
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
diff --git a/packages/xorg-util/imake_1.0.2.bb b/packages/xorg-util/imake_1.0.2.bb
index a835887f28..deeb4477a1 100644
--- a/packages/xorg-util/imake_1.0.2.bb
+++ b/packages/xorg-util/imake_1.0.2.bb
@@ -3,5 +3,5 @@ require xorg-util-common.inc
 DESCRIPTION = "C preprocessor interface to the make utility"
 RDEPENDS = "perl xproto"
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-util/lndir_1.0.1.bb b/packages/xorg-util/lndir_1.0.1.bb
index 1ef4b2fa96..34309a6487 100644
--- a/packages/xorg-util/lndir_1.0.1.bb
+++ b/packages/xorg-util/lndir_1.0.1.bb
@@ -1,5 +1,5 @@
 require xorg-util-common.inc
 
 DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
diff --git a/packages/xorg-util/makedepend-native_1.0.1.bb b/packages/xorg-util/makedepend-native_1.0.1.bb
index 2c9cad5945..9facfc69fa 100644
--- a/packages/xorg-util/makedepend-native_1.0.1.bb
+++ b/packages/xorg-util/makedepend-native_1.0.1.bb
@@ -3,7 +3,7 @@ inherit native
 
 DESCRIPTION = "create dependencies in makefiles"
 DEPENDS = "xproto-native util-macros-native"
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "makedepend"
diff --git a/packages/xorg-util/makedepend_1.0.1.bb b/packages/xorg-util/makedepend_1.0.1.bb
index edef6a0208..e998bba1b0 100644
--- a/packages/xorg-util/makedepend_1.0.1.bb
+++ b/packages/xorg-util/makedepend_1.0.1.bb
@@ -2,5 +2,5 @@ require xorg-util-common.inc
 
 DESCRIPTION = "create dependencies in makefiles"
 DEPENDS = "xproto util-macros"
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
diff --git a/packages/xorg-util/util-macros-native_1.1.5.bb b/packages/xorg-util/util-macros-native_1.1.5.bb
index 21ff91569e..c327f3f54e 100644
--- a/packages/xorg-util/util-macros-native_1.1.5.bb
+++ b/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -2,7 +2,7 @@ require util-macros_${PV}.bb
 
 inherit native
 
-FILE_PR = "r1"
+PR = "r1"
 
 XORG_PN = "util-macros"
 
diff --git a/packages/xorg-util/util-macros_1.1.5.bb b/packages/xorg-util/util-macros_1.1.5.bb
index 65fedf3516..22634bffd2 100644
--- a/packages/xorg-util/util-macros_1.1.5.bb
+++ b/packages/xorg-util/util-macros_1.1.5.bb
@@ -1,7 +1,7 @@
 require xorg-util-common.inc
 
 DESCRIPTION = "X autotools macros"
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
diff --git a/packages/xorg-util/xorg-cf-files_1.0.2.bb b/packages/xorg-util/xorg-cf-files_1.0.2.bb
index 0cfcf61a8b..7c3fb8d7e9 100644
--- a/packages/xorg-util/xorg-cf-files_1.0.2.bb
+++ b/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -2,7 +2,7 @@ require xorg-util-common.inc
 
 DESCRIPTION = "X Window System CF files"
 
-FILE_PR = "r1"
+PR = "r1"
 PE = "1"
 
 FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
index 20d164c51b..77c36086df 100644
--- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
+++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
@@ -11,7 +11,7 @@ PROVIDES = "virtual/xserver"
 
 PE = "1"
 PV = "1.3.0.0+gitr${SRCREV}"
-FILE_PR = "r2"
+PR = "r2"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'om-gta02'
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 58604396da..3a042db0d1 100644
--- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-FILE_PR = "r6"
+PR = "r6"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 8b34a3a029..57f7050c2d 100644
--- a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
 
-FILE_PR = "r2"
+PR = "r2"
 PE = "1"
 
 COMPATIBLE_MACHINE = "nokia(800|770)"
diff --git a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
index a5f2c43a15..be6fc821b2 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -10,7 +10,7 @@ DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
 PE = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 FILES_${PN} = "${libdir}/xserver"
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index 8c218edddd..e1b898e470 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-FILE_PR = "r10"
+PR = "r10"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index b4fe2b730f..19669e4d89 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-FILE_PR = "r26"
+PR = "r26"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index 963b11221b..48ff0ea6fa 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
index 1f047f0c59..922d8f58f3 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 5c0707d4de..04470d3d9a 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -5,7 +5,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index d88d9ba0a9..5a46d7dd17 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-FILE_PR = "r5"
+PR = "r5"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 4820fbfdc1..2e1da5c977 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -6,7 +6,7 @@ PV = "1.4+git${SRCDATE}"
 DEPENDS += "libxkbfile libxcalibrate pixman"
 
 PE = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index 47c3c66988..e4a0a22db0 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-FILE_PR = "r2"
+PR = "r2"
 
 EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index 894907a96e..d6633f1f88 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 9bf31bf148..b6685d43a1 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 9bf31bf148..b6685d43a1 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index 59ee089e5d..abbfb3fcab 100644
--- a/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/base"
 LICENSE = "Xorg"
 PROVIDES = "virtual/xserver"
-FILE_PR = "r5"
+PR = "r5"
 PV = "6.8.1+cvs${SRCDATE}"
 
 DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
diff --git a/packages/xournal/xournal_0.3.3.bb b/packages/xournal/xournal_0.3.3.bb
index 54aeeebadb..5a8a1b74b7 100644
--- a/packages/xournal/xournal_0.3.3.bb
+++ b/packages/xournal/xournal_0.3.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a jo
 DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
 SECTION = "x11"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
            file://xournal.desktop"
diff --git a/packages/xournal/xournal_0.4.0.1.bb b/packages/xournal/xournal_0.4.0.1.bb
index 5ec449d967..f62648863b 100644
--- a/packages/xournal/xournal_0.4.0.1.bb
+++ b/packages/xournal/xournal_0.4.0.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
 RDEPENDS = "poppler"
 SECTION = "x11"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
            file://xournal.desktop"
diff --git a/packages/xournal/xournal_0.4.1.bb b/packages/xournal/xournal_0.4.1.bb
index bb56ac2621..51958d545b 100644
--- a/packages/xournal/xournal_0.4.1.bb
+++ b/packages/xournal/xournal_0.4.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
 RDEPENDS = "poppler"
 SECTION = "x11"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
           "
diff --git a/packages/xournal/xournal_0.4.bb b/packages/xournal/xournal_0.4.bb
index 54aeeebadb..5a8a1b74b7 100644
--- a/packages/xournal/xournal_0.4.bb
+++ b/packages/xournal/xournal_0.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a jo
 DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
 SECTION = "x11"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
            file://xournal.desktop"
diff --git a/packages/xprint/xprint_0.9.001.bb b/packages/xprint/xprint_0.9.001.bb
index c2f78af45a..fa7f617c71 100644
--- a/packages/xprint/xprint_0.9.001.bb
+++ b/packages/xprint/xprint_0.9.001.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 LICENSE = "BSD-X"
-FILE_PR = "r1"
+PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/xprint/xprint_mozdev_org_source-2004-07-07-release_009_001.tar.gz \
 	file://imake-staging.patch;patch=1"
 
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index 3b57b8e9b5..c2673edfc6 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://xqt.sourceforge.jp"
 LICENSE = "GPL"
 SECTION = "x11"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRCDATE = "20041111"
 DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie"
diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb
index 80d342163d..12e210d036 100644
--- a/packages/xqt2/xqt2_20060509.bb
+++ b/packages/xqt2/xqt2_20060509.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 SECTION = "opie/applications"
 APPTYPE = "binary"
 APPNAME = "Xqt"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit palmtop
 
diff --git a/packages/xrestop/xrestop_0.4.bb b/packages/xrestop/xrestop_0.4.bb
index 6e2310c27c..0ecf39a84b 100644
--- a/packages/xrestop/xrestop_0.4.bb
+++ b/packages/xrestop/xrestop_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "top-like statistics of X11 server resource usage by clients"
 SECTION = "x11/utils"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS = "libxres libxext virtual/libx11"
 
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index 5812fee6ae..7696c4733c 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.jwz.org/xscreensaver/"
 SECTION = "x11-misc"
 LICENSE = "BSD"
 DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
-FILE_PR = "r1"
+PR = "r1"
 
 BROKEN = "1"
 # upstream is at 4.22 now - patches do not apply
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index 2ff939b293..cac3776724 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -8,7 +8,7 @@ SECTION = "x11-misc"
 LICENSE = "BSD"
 DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
            file://fixes.patch;patch=1 \
diff --git a/packages/xscrnsaverh/xscrnsaverh_1.0.bb b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
index 13f7bba5e1..2989054f44 100644
--- a/packages/xscrnsaverh/xscrnsaverh_1.0.bb
+++ b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
@@ -1,5 +1,5 @@
 
-FILE_PR = "r0"
+PR = "r0"
 
 DEPENDS = "libxext"
 SECTION = "x11"
diff --git a/packages/xserver-common/xserver-common_1.12.bb b/packages/xserver-common/xserver-common_1.12.bb
index 06def250bf..dc91d7da68 100644
--- a/packages/xserver-common/xserver-common_1.12.bb
+++ b/packages/xserver-common/xserver-common_1.12.bb
@@ -1,6 +1,6 @@
 require xserver-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI_append = " file://setDPI.sh \
 	           file://rxvt-less-pink.diff;patch=1"
diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb
index e477c91cfc..599af1d6f7 100644
--- a/packages/xserver-common/xserver-common_1.13.bb
+++ b/packages/xserver-common/xserver-common_1.13.bb
@@ -1,6 +1,6 @@
 require xserver-common.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
                    file://xserver-imageon.patch;patch=1 \
diff --git a/packages/xserver-common/xserver-common_1.14.bb b/packages/xserver-common/xserver-common_1.14.bb
index c6fc6db402..48320ba006 100644
--- a/packages/xserver-common/xserver-common_1.14.bb
+++ b/packages/xserver-common/xserver-common_1.14.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.15.bb b/packages/xserver-common/xserver-common_1.15.bb
index c6fc6db402..48320ba006 100644
--- a/packages/xserver-common/xserver-common_1.15.bb
+++ b/packages/xserver-common/xserver-common_1.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb
index 21e8643c11..fcf1dcfd78 100644
--- a/packages/xserver-common/xserver-common_1.16.bb
+++ b/packages/xserver-common/xserver-common_1.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r7"
+PR = "r7"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index 914da15ad0..6e3e2dd1ed 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.21.bb b/packages/xserver-common/xserver-common_1.21.bb
index ce98679e52..a30a37c893 100644
--- a/packages/xserver-common/xserver-common_1.21.bb
+++ b/packages/xserver-common/xserver-common_1.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index f85664bc45..6dcbc6862d 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r7"
+PR = "r7"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb
index c9d66d4d93..546481d48f 100644
--- a/packages/xserver-common/xserver-common_svn.bb
+++ b/packages/xserver-common/xserver-common_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 PV = "1.12+svn${SRCDATE}"
 S = "${WORKDIR}/xserver-common"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GPE_SVN} \
             file://Makefile.translation \
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index a600ce8ae2..738bb3f6fc 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-FILE_PR = "r30"
+PR = "r30"
 
 SRC_URI = "\
   file://Xdefaults \
diff --git a/packages/xserver-kdrive-common/xserver-nodm-init.bb b/packages/xserver-kdrive-common/xserver-nodm-init.bb
index ee61b33310..cea9f0cb28 100644
--- a/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-FILE_PR = "r8"
+PR = "r8"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb
index ad5f93a873..7e0d11cc98 100644
--- a/packages/xstroke/xstroke_0.6.bb
+++ b/packages/xstroke/xstroke_0.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 xft libxtst libxpm"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.oesources.org/source/current/xstroke-0.6.tar.gz \
 	file://auto-disable.patch;patch=1;pnum=0"
diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb
index d5be05cd94..ac9fcffab7 100644
--- a/packages/xtscal/xtscal_0.5.1.bb
+++ b/packages/xtscal/xtscal_0.5.1.bb
@@ -1,5 +1,5 @@
 require xtscal.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI += "file://xtscal-poodle.patch;patch=1"
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index 33726404d0..74a6da0920 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/packages/xtscal/xtscal_0.6.3.bb
@@ -4,7 +4,7 @@ SECTION = "x11/base"
 
 DEPENDS = "virtual/libx11 libxft libxcalibrate"
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
            file://change-cross.patch;patch=1 \
diff --git a/packages/xvidcap/xvidcap_1.1.6.bb b/packages/xvidcap/xvidcap_1.1.6.bb
index 2de5a936b0..07442e9129 100644
--- a/packages/xvidcap/xvidcap_1.1.6.bb
+++ b/packages/xvidcap/xvidcap_1.1.6.bb
@@ -1,4 +1,4 @@
 require xvidcap.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
diff --git a/packages/xvidcap/xvidcap_1.1.7rc1.bb b/packages/xvidcap/xvidcap_1.1.7rc1.bb
index 3800b6df03..55ccaa90b1 100644
--- a/packages/xvidcap/xvidcap_1.1.7rc1.bb
+++ b/packages/xvidcap/xvidcap_1.1.7rc1.bb
@@ -1,6 +1,6 @@
 require xvidcap.inc
 
-FILE_PR = "r0"
+PR = "r0"
 
 # 1.1.7rc1 still uses this directory name
 S = "${WORKDIR}/${PN}-1.1.6"
diff --git a/packages/yaffs2/yaffs2-utils_cvs.bb b/packages/yaffs2/yaffs2-utils_cvs.bb
index 57197d52ca..439136e2eb 100644
--- a/packages/yaffs2/yaffs2-utils_cvs.bb
+++ b/packages/yaffs2/yaffs2-utils_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.yaffs.net"
 LICENSE = "GPLv2"
 PV = "0.0.0+cvs${SRCDATE}"
-FILE_PR = "r0"
+PR = "r0"
 
 #
 # NOTE: This needs pretty recent mtd-utils otherwise it fails to compile
diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb
index 70412455dc..67b651ae71 100644
--- a/packages/yeaphone/yeaphone_0.1.bb
+++ b/packages/yeaphone/yeaphone_0.1.bb
@@ -11,7 +11,7 @@ RRECOMMENDS = "\
 	kernel-module-snd-usb-audio \
 	"
 
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://download.devbase.at/voip/yeaphone-${PV}.tar.gz"
 
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 85a22de5e8..56f067cbf7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-FILE_PR = "r21"
+PR = "r21"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 45762669f3..be9379eced 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-FILE_PR = "r17"
+PR = "r17"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb
index 94bbec518b..9d2193d4ee 100644
--- a/packages/zbedic/libbedic_1.1.bb
+++ b/packages/zbedic/libbedic_1.1.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "sqlite3"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/zbedic/misc"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz"
 
diff --git a/packages/zbedic/zbedic_1.2.bb b/packages/zbedic/zbedic_1.2.bb
index 5fad353541..61348c32f2 100644
--- a/packages/zbedic/zbedic_1.2.bb
+++ b/packages/zbedic/zbedic_1.2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "libbedic"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/misc"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-2.tgz \
            file://opie-icons.patch;patch=1 \
diff --git a/packages/zbench/zbench_2.0.bb b/packages/zbench/zbench_2.0.bb
index 28d6b8b479..0e24f980a0 100644
--- a/packages/zbench/zbench_2.0.bb
+++ b/packages/zbench/zbench_2.0.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.aa.alpha-net.ne.jp/satoshic/dw_zbnch.htm"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/zbench-${PV}.tar.bz2"
 
diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb
index a9a8fea06a..4755f01538 100644
--- a/packages/zd1211/zd1211_r77.bb
+++ b/packages/zd1211/zd1211_r77.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r3"
+PR = "r3"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb
index 45df2a2904..d0d875c842 100644
--- a/packages/zd1211/zd1211_r83.bb
+++ b/packages/zd1211/zd1211_r83.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "wireless-tools"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
            file://makefile.patch;patch=1"
diff --git a/packages/zd1211/zd1211_r85.bb b/packages/zd1211/zd1211_r85.bb
index 45df2a2904..d0d875c842 100644
--- a/packages/zd1211/zd1211_r85.bb
+++ b/packages/zd1211/zd1211_r85.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "wireless-tools"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
            file://makefile.patch;patch=1"
diff --git a/packages/zddice/zddice_1.0.0.bb b/packages/zddice/zddice_1.0.0.bb
index 66efedc095..068c39c3a9 100644
--- a/packages/zddice/zddice_1.0.0.bb
+++ b/packages/zddice/zddice_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Zaurus D20 Gaming Dice for Qt/Embedded based Palmtop Environments
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zddice/zddice_${PV}_arm.src.tar.gz \
            file://qtopia17.patch;patch=1"
diff --git a/packages/zeroconf/zeroconf_0.6.1.bb b/packages/zeroconf/zeroconf_0.6.1.bb
index ff4a43a361..8dfa8ecb50 100644
--- a/packages/zeroconf/zeroconf_0.6.1.bb
+++ b/packages/zeroconf/zeroconf_0.6.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "net"
 PRIORITY = "optional"
 
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
 	   file://debian-zeroconf.patch;patch=1 \
diff --git a/packages/zeroconf/zeroconf_0.9.bb b/packages/zeroconf/zeroconf_0.9.bb
index c1d6fbc5f7..5c42237888 100644
--- a/packages/zeroconf/zeroconf_0.9.bb
+++ b/packages/zeroconf/zeroconf_0.9.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 SECTION = "net"
 PRIORITY = "optional"
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
 	   file://zeroconf-default \
diff --git a/packages/zgscore/zgscore_1.0.2.bb b/packages/zgscore/zgscore_1.0.2.bb
index fb8d178eac..967791e53f 100644
--- a/packages/zgscore/zgscore_1.0.2.bb
+++ b/packages/zgscore/zgscore_1.0.2.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://nuke.cinlug.org/modules/Static_Docs/data/db/zgs/"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zgs/zgscore_${PV}_arm.src.tar.gz \
            file://qtopia17.patch;patch=1"
diff --git a/packages/zile/zile_1.7+2.0beta6.bb b/packages/zile/zile_1.7+2.0beta6.bb
index bb23bfe777..74d832eef3 100644
--- a/packages/zile/zile_1.7+2.0beta6.bb
+++ b/packages/zile/zile_1.7+2.0beta6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "ncurses"
 PRIORITY = "optional"
 SECTION = "console/editors"
-FILE_PR = "r1"
+PR = "r1"
 
 UV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
 
diff --git a/packages/zile/zile_2.2.15.bb b/packages/zile/zile_2.2.15.bb
index 81a901c5dc..72284629a7 100644
--- a/packages/zile/zile_2.2.15.bb
+++ b/packages/zile/zile_2.2.15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://zile.sourceforge.net/"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 SECTION = "console/editors"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zile/zile-${PV}.tar.gz"
 
diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb
index 7fa5ddf2ca..0c57235c2f 100644
--- a/packages/zip/zip_2.32.bb
+++ b/packages/zip/zip_2.32.bb
@@ -1,3 +1,3 @@
 require zip.inc
 
-FILE_PR ="r1"
+PR ="r1"
diff --git a/packages/zipsc/zipsc_0.4.3.bb b/packages/zipsc/zipsc_0.4.3.bb
index 313cefb313..178d3a0ea2 100644
--- a/packages/zipsc/zipsc_0.4.3.bb
+++ b/packages/zipsc/zipsc_0.4.3.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.warmi.net/zaurus/zipsc.shtml"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.warmi.net/zaurus/files/zipsc_${PV}.tar.gz \
            file://gcc3.patch;patch=1"
diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index f6ee32d779..d995869be1 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "required"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
-FILE_PR ="r5"
+PR ="r5"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
 		file://visibility.patch;patch=1 \
diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb
index 0f1750834e..43e94a5d28 100644
--- a/packages/zmerlin/zmerlin_0.9.1.bb
+++ b/packages/zmerlin/zmerlin_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz"
 S = "${WORKDIR}/zmerlin"
diff --git a/packages/zope/zope_2.7.1.bb b/packages/zope/zope_2.7.1.bb
index 7d7d50914e..efda9d2e6b 100644
--- a/packages/zope/zope_2.7.1.bb
+++ b/packages/zope/zope_2.7.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}-0"
diff --git a/packages/zope/zope_2.9.2.bb b/packages/zope/zope_2.9.2.bb
index 0c11477d61..12254375db 100644
--- a/packages/zope/zope_2.9.2.bb
+++ b/packages/zope/zope_2.9.2.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}"
diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index a3d8c798bf..717e5a119b 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
 
diff --git a/packages/zsh/zsh_4.1.1.bb b/packages/zsh/zsh_4.1.1.bb
index 293f6b1423..3c5cc85b83 100644
--- a/packages/zsh/zsh_4.1.1.bb
+++ b/packages/zsh/zsh_4.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Zsh shell"
 SECTION = "base/shell"
 PRIORITY = "optional"
 DEPENDS = "ncurses libpcre"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "zsh"
 
 SRC_URI = "http://www.zsh.org/pub/old/zsh-${PV}.tar.bz2 \
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index 03e7002641..098ac2b664 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -8,7 +8,7 @@ AUTHOR = "Bernd Lachner <dev@lachner-net.de>"
 APPTYPE = "binary"
 APPNAME = "zshopi"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.lachner-net.de/old/Frames/Software/zshopi_0.2.tar.bz2 \
 file://zshopi.desktop \
diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb
index 32484093f0..3841b4a0f2 100644
--- a/packages/ztappy/ztappy_0.9.1.bb
+++ b/packages/ztappy/ztappy_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://user.cs.tu-berlin.de/~karlb/ztappy/ztappy.tar.gz"
 S = "${WORKDIR}/ztappy"
diff --git a/packages/zuc/zuc_1.1.2ern.bb b/packages/zuc/zuc_1.1.2ern.bb
index 6c25c1bbc4..32c8f9848d 100644
--- a/packages/zuc/zuc_1.1.2ern.bb
+++ b/packages/zuc/zuc_1.1.2ern.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "zuc"
 APPDESKTOP = "${S}"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "http://www.linux-solutions.at/projects/zaurus/source/zuc_V${PV}.tar.gz \
            http://nick.kreucher.net/zuc/zuc_units"
diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb
index 70624c6823..e9eb09741a 100644
--- a/packages/zudoku/zudoku_1.1.bb
+++ b/packages/zudoku/zudoku_1.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 SECTION = "opie/games"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
            file://zudoku.html \
diff --git a/packages/zziplib/zziplib_0.10.82.bb b/packages/zziplib/zziplib_0.10.82.bb
index 91f2237c5b..7e2130368d 100644
--- a/packages/zziplib/zziplib_0.10.82.bb
+++ b/packages/zziplib/zziplib_0.10.82.bb
@@ -2,4 +2,4 @@ require zziplib.inc
 
 SRC_URI += "file://zziplib-0.10-disable-test.patch;patch=1"
 
-FILE_PR = "r1"
+PR = "r1"