Upgrade parrot to version 4.7.0.

Pkgsrc changes:
 o Simplify the patch to remove the work-directory rpath.

Upstream changes:
- Core
   + Added .all_tags() and .all_tagged_pmcs() methods to PackfileView PMC
   + Several build and coding standards fixes

4 files changed, 16 insertions, 84 deletions

diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index d0c06fc84b2..69389299098 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2012/08/15 11:01:39 he Exp $
+# $NetBSD: Makefile,v 1.64 2012/08/30 11:56:07 he Exp $
 #
 
-VERSION=		4.6.0
-RTYPE=			stable
+VERSION=		4.7.0
+RTYPE=			devel
 DISTNAME=		parrot-${VERSION}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.parrot.org/pub/parrot/releases/${RTYPE}/${VERSION}/
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index 4fa51674801..b632b71b176 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.52 2012/08/15 11:01:40 he Exp $
+$NetBSD: distinfo,v 1.53 2012/08/30 11:56:07 he Exp $
 
-SHA1 (parrot-4.6.0.tar.gz) = b1fc84930d8974bd46d08e94b9c5850243e92e96
-RMD160 (parrot-4.6.0.tar.gz) = 4ead4268fcdd03d2fb2037b29e4dd3fb344e8e7c
-Size (parrot-4.6.0.tar.gz) = 4528994 bytes
+SHA1 (parrot-4.7.0.tar.gz) = bf3c6ae8be1c60e2ea5830504ca75189c0835318
+RMD160 (parrot-4.7.0.tar.gz) = 7b91dacf8782674eba255b271ad0af85d7a29398
+Size (parrot-4.7.0.tar.gz) = 4533751 bytes
 SHA1 (patch-ad) = a972d48a879e541f6894f2eeb82a70b1756437d9
-SHA1 (patch-ao) = 0676a88e3a30078fdbb5ed3aa885a50d10db9aff
-SHA1 (patch-ap) = 64088161dc8d5f4c40d9ffa7ffecfa2abc572a44
+SHA1 (patch-ap) = eb5d2748e339fd6f8e02b21f8af57b88b9dadca0
diff --git a/lang/parrot/patches/patch-ao b/lang/parrot/patches/patch-ao
deleted file mode 100644
index f2e55449f1e..00000000000
--- a/lang/parrot/patches/patch-ao
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2012/07/31 08:16:07 he Exp $
-
-Add Parrot_get_cpu_type() from generic/, since we have a local
-misc.c for netbsd.
-
---- src/platform/netbsd/misc.c.orig	2012-06-06 18:03:39.000000000 +0000
-+++ src/platform/netbsd/misc.c
-@@ -22,6 +22,10 @@ Miscellaneous helper functions that are 
- 
- #include "parrot/parrot.h"
- 
-+#ifdef PARROT_HAS_HEADER_SYSUTSNAME
-+#  include <sys/utsname.h>
-+#endif
-+
- /* HEADERIZER HFILE: none */
- 
- /*
-@@ -53,6 +57,33 @@ Parrot_platform_init_code(void)
- 
- /*
- 
-+=item C<STRING *Parrot_get_cpu_type(Parrot_Interp)>
-+
-+Fetch CPU type for non-win32 systems
-+For win32, look in platform/win32/misc.c
-+
-+=back
-+
-+=cut
-+
-+*/
-+
-+STRING *
-+Parrot_get_cpu_type(Parrot_Interp interp) {
-+    struct utsname uname_info;
-+    char  *proc_arch = "";
-+
-+#ifdef PARROT_HAS_HEADER_SYSUTSNAME
-+    uname(&uname_info);
-+    proc_arch = uname_info.machine;
-+#endif
-+    return Parrot_str_new_init(interp, proc_arch, strlen(proc_arch),
-+            Parrot_ascii_encoding_ptr, 0);
-+
-+}
-+
-+/*
-+
- =back
- 
- =cut
diff --git a/lang/parrot/patches/patch-ap b/lang/parrot/patches/patch-ap
index d69a69da7b4..4485cc125fe 100644
--- a/lang/parrot/patches/patch-ap
+++ b/lang/parrot/patches/patch-ap
@@ -1,31 +1,16 @@
-$NetBSD: patch-ap,v 1.1 2012/07/31 08:16:07 he Exp $
+$NetBSD: patch-ap,v 1.2 2012/08/30 11:56:07 he Exp $
 
 Do not embed rpath_blib into installable executables, as it will
 refer to the build directory via rpath.
 
---- ./tools/dev/pbc_to_exe.winxed.orig	2012-06-19 05:24:26.000000000 +0000
+--- ./tools/dev/pbc_to_exe.winxed.orig	2012-06-26 01:18:19.000000000 +0000
 +++ ./tools/dev/pbc_to_exe.winxed
-@@ -599,9 +599,9 @@ function link_file(string objfile, strin
-     string libparrot    = $P0['libparrot_linkflags'];
-     string libs         = $P0['libs'];
-     string o            = $P0['o'];
--    string rpath        = $P0['rpath_blib'];
-     string osname       = $P0['osname'];
-     string build_dir    = $P0['build_dir'];
-+    string rpath        = '';
-     string slash        = $P0['slash'];
-     string icushared    = $P0['icu_shared'];
-     string installed    = $P0['installed'];
-@@ -613,9 +613,10 @@ function link_file(string objfile, strin
-     string config     = pathquote;
-     if (installed != '1') {
-         config += build_dir + slash + 'src' + slash;
--	if (! install)
-+	if (! install) {
+@@ -617,7 +617,7 @@ function link_file(string objfile, strin
              config += 'parrot_config';
--        else {
-+	    rpath  += $P0['rpath_blib'];
-+        } else {
+         else {
              config += 'install_config';
-             rpath  += $P0['rpath_lib'];
+-            rpath  += $P0['rpath_lib'];
++            rpath  = $P0['rpath_lib'];
          }
+     }
+     else {