[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PR

    Allow a distribution to globally bump the PR of every package
    this is useful when there was a change in the toolchain and
    every package is going to be different.

    find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR="/"FILE_PR ="/ {} \;
    find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR ="/"FILE_PR ="/ {} \;

Acked-By: Koen Kooi <koen@openembedded.org>

63 files changed, 63 insertions, 63 deletions

diff --git a/packages/xorg-lib/libapplewm_1.0.0.bb b/packages/xorg-lib/libapplewm_1.0.0.bb
index bc502fb505..a05d2eaedb 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"
-PR = "r1"
+FILE_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 9b66101563..f6dc91dead 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"
-PR = "r1"
+FILE_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 654fc72eca..5d91e9a632 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"
-PR = "r1"
+FILE_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 010aa311e0..460771ef2b 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"
-PR = "r1"
+FILE_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 e4a6557397..3f35b8dbc4 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"
-PR = "r1"
+FILE_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 e4a6557397..3f35b8dbc4 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"
-PR = "r1"
+FILE_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 edb6ff45ca..fd7ac1806e 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"
-PR = "r1"
+FILE_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 e99b2a07b0..c3f005e9b1 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"
-PR = "r1"
+FILE_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 5b1e304d51..78afda8bfa 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"
-PR = "r5"
+FILE_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 5243de4259..c5b17e1b78 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"
-PR = "r3"
+FILE_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 5243de4259..c5b17e1b78 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"
-PR = "r3"
+FILE_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 7ab3a7bb94..60aa7ab98e 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"
-PR = "r3"
+FILE_PR = "r3"
 
 XORG_PN = "libX11"
 
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index f2929624e8..2622accafe 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"
-PR = "r1"
+FILE_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 3fc07b6ab6..06389be2c8 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 = ""
-PR = "r1"
+FILE_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 f45431e79e..33646910ce 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"
-PR = "r1"
+FILE_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 f45431e79e..33646910ce 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"
-PR = "r1"
+FILE_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 4713eccc48..4ca7990a9a 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"
-PR = "r2"
+FILE_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 4713eccc48..4ca7990a9a 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"
-PR = "r2"
+FILE_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 e56d1d0954..e7798cebbb 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"
-PR = "r1"
+FILE_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 873e9397d7..9b33bea80c 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"
-PR = "r1"
+FILE_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 0aa95b4677..6ec1a738a8 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"
-PR = "r1"
+FILE_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 6c6b4595aa..5777fcca7b 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"
-PR = "r1"
+FILE_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 81231a866c..594e102385 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"
-PR = "r1"
+FILE_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 81231a866c..594e102385 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"
-PR = "r1"
+FILE_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 d452d9796d..97b8d93144 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"
-PR = "r2"
+FILE_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 ee999de4f5..b06b95ed07 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"
-PR = "r1"
+FILE_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 c113951406..6127812a83 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"
-PR = "r1"
+FILE_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 31e3b4906d..19935ccd8a 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"
-PR = "r1"
+FILE_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 31e3b4906d..19935ccd8a 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"
-PR = "r1"
+FILE_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 b7135bc28e..b3dcf35ccf 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"
-PR = "r3"
+FILE_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 b7135bc28e..b3dcf35ccf 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"
-PR = "r3"
+FILE_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 a404180d49..caf241b456 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"
-PR = "r1"
+FILE_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 a404180d49..caf241b456 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"
-PR = "r1"
+FILE_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 9a3f5f1327..ac772f8845 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"
-PR = "r1"
+FILE_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 9a02bf82be..e487b320e2 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"
-PR = "r1"
+FILE_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 9a02bf82be..e487b320e2 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"
-PR = "r1"
+FILE_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 53fb47c054..d4157a5fba 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"
-PR = "r1"
+FILE_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 75c10bf2c9..556cbebf49 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"
-PR = "r3"
+FILE_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 75c10bf2c9..556cbebf49 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"
-PR = "r3"
+FILE_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 3a24a888d1..28930099b6 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"
-PR = "r1"
+FILE_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 327138e7fd..7f6f3c27eb 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"
-PR = "r1"
+FILE_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 611859fd52..8b36a0c676 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"
-PR = "r1"
+FILE_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 611859fd52..8b36a0c676 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"
-PR = "r1"
+FILE_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 f8b9c37b50..4eb5739564 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"
-PR = "r1"
+FILE_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 0a345b951c..95faccea11 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"
-PR = "r0"
+FILE_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 ad833a8259..2e12e945e7 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"
-PR = "r1"
+FILE_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 02a0cae0d8..553b6d9998 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"
-PR = "r1"
+FILE_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 ff22c337a0..8b8be6c27f 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"
-PR = "r1"
+FILE_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 ff22c337a0..8b8be6c27f 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"
-PR = "r1"
+FILE_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 1c215da51d..55632cfdcf 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"
-PR = "r1"
+FILE_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 7a25ae5bce..fddabbb16d 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"
-PR = "r1"
+FILE_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 14e10ff285..ec5a2d7ba8 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"
-PR = "r1"
+FILE_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 14e10ff285..ec5a2d7ba8 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"
-PR = "r1"
+FILE_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 6014326e90..8a3373e08e 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"
-PR = "r1"
+FILE_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 6014326e90..8a3373e08e 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"
-PR = "r1"
+FILE_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 64943ce9bd..eeb4a337b6 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"
-PR = "r1"
+FILE_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 47492d7108..f16b5e5783 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"
-PR = "r1"
+FILE_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 47492d7108..f16b5e5783 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"
-PR = "r1"
+FILE_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 d1f8719cde..8578ccd466 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"
-PR = "r1"
+FILE_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 efb90d4854..f68136f888 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"
-PR = "r1"
+FILE_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 239684e71f..1cb758655f 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"
 
-PR = "r4"
+FILE_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 08b29fedef..6e9fc524b9 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"
-PR = "r0"
+FILE_PR = "r0"
 
diff --git a/packages/xorg-lib/xtrans_1.2.1.bb b/packages/xorg-lib/xtrans_1.2.1.bb
index 75ba93c783..43d37c4fe1 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"
-PR = "r0"
+FILE_PR = "r0"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"