merge of 02948f94edc060110b60e3cb3e5b547d77f8c493

     and a4218d106d35f16fd5c3c989fa4443eed9b62dde

2 files changed, 14 insertions, 14 deletions

diff --git a/packages/perl/perl-5.8.7/config.sh-mipsel-linux b/packages/perl/perl-5.8.7/config.sh-mipsel-linux
index 179a278fc9..7696a3dff0 100644
--- a/packages/perl/perl-5.8.7/config.sh-mipsel-linux
+++ b/packages/perl/perl-5.8.7/config.sh-mipsel-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.8.4/mipsel-linux'
-archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux'
+archlib='/usr/lib/perl5/5.8.7/mipsel-linux'
+archlibexp='/usr/lib/perl5/5.8.7/mipsel-linux'
 archname64=''
 archname='mips-linux'
 archobjs=''
@@ -671,7 +671,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/mipsel-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -679,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.8.4'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.7'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -812,8 +812,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.8.4'
-privlibexp='/usr/lib/perl5/5.8.4'
+privlib='/usr/lib/perl5/5.8.7'
+privlibexp='/usr/lib/perl5/5.8.7'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -874,8 +874,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
 sig_size='131'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
+sitearch='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
@@ -1005,13 +1005,13 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.8.4'
-version_patchlevel_string='version 8 subversion 3'
+version='5.8.7'
+version_patchlevel_string='version 8 subversion 7'
 versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.8.4'
+xs_apiversion='5.8.7'
 yacc='yacc'
 yaccflags=''
 zcat=''
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 630c126bc2..b5d25257bb 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -5,7 +5,7 @@ include perl.inc
 SRC_URI += "file://config.sh-armeb-linux \
 	    file://config.sh-i386-linux"
 
-PR = "r11"
+PR = "r12"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl