Update from version 2.1.1 to 2.2.0.

Pkgsrc changes:
 o Adapt patches to upstream changes.

Upstream changes:

- Core changes
  + Most internal allocations now use the GC
  + RNG non-randomness fixes
  + Elimination of much dead code
- API changes
  + PMCs can now be initialized from an int
  + Many legacy ops are removed
- Platforms
  + Sun cc and Intel icc support have been restored
  + Compiler invocation no longer goes through a Perl script
- Tools
  + NCI thunks are now generated by self-hosted PIR code

4 files changed, 22 insertions, 22 deletions

diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index bd46d150f6a..59c8734fbfd 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/02/25 17:59:34 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/03/17 11:06:11 he Exp $
 #
 
-VERSION=		2.1.1
+VERSION=		2.2.0
 RTYPE=			devel
 DISTNAME=		parrot-${VERSION}
 CATEGORIES=		lang
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index e48d6f87d81..b27811c2e26 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2010/02/23 12:41:14 he Exp $
+$NetBSD: distinfo,v 1.25 2010/03/17 11:06:11 he Exp $
 
-SHA1 (parrot-2.1.1.tar.gz) = f94309d31f34674dc156aad724bbc2f50d57a23d
-RMD160 (parrot-2.1.1.tar.gz) = 8067c66207d691ce519df04e6fbc0c11b017a0eb
-Size (parrot-2.1.1.tar.gz) = 4051736 bytes
-SHA1 (patch-ad) = c78517453408f1e4bb05e2bd8c2967b8f6f47c6e
-SHA1 (patch-ae) = 34994ac2344b0c5b3ba3556b4f60e0f77b6feb31
+SHA1 (parrot-2.2.0.tar.gz) = c3a4fb706e761f2cd18ebfa75496564cb66189ed
+RMD160 (parrot-2.2.0.tar.gz) = dd70a829c35d0106b164258bff6bda957f714a5a
+Size (parrot-2.2.0.tar.gz) = 4047278 bytes
+SHA1 (patch-ad) = aae66d32722d4c761132e57176469de7c7d51c88
+SHA1 (patch-ae) = 373909f50385c580065a03946a1f4f5b342189fc
 SHA1 (patch-ak) = 803cb407967b26c8f80d8bed9f4605bc42501b6d
diff --git a/lang/parrot/patches/patch-ad b/lang/parrot/patches/patch-ad
index 6bca97232f6..d8351d54df6 100644
--- a/lang/parrot/patches/patch-ad
+++ b/lang/parrot/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2010/01/28 13:06:19 he Exp $
+$NetBSD: patch-ad,v 1.5 2010/03/17 11:06:11 he Exp $
 
 Allow parrot to detect perldoc when run as root.  Perldoc changes
 uid to 'nobody', 'nouser' or uid -2 when run as root, so it won't
@@ -7,13 +7,13 @@ files in directories owned by root mode 0755).
 
 --- config/auto/perldoc.pm.orig	2009-12-15 18:22:07.000000000 +0100
 +++ config/auto/perldoc.pm
-@@ -38,7 +38,9 @@ sub runstep {
- 
-     my $cmd = $conf->data->get('scriptdirexp_provisional') . q{/perldoc};
+@@ -39,7 +39,9 @@ sub runstep {
+     my $slash = $conf->data->get('slash');
+     my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{perldoc};
      my ( $fh, $filename ) = tempfile( UNLINK => 1 );
 -    my $content = capture_output("$cmd -ud $filename perldoc") || undef;
-+    my($stdout, $stderr, $retval) = 
-+	capture_output("$cmd -u perldoc > $filename");
++    my($stdout, $stderr, $retval) =
++	capture_output("$cmd -u $filename perldoc") || undef;
 +    my($content) = $retval ? undef : $stderr;
  
      return 1 unless defined( $self->_initial_content_check($conf, $content) );
@@ -21,9 +21,9 @@ files in directories owned by root mode 0755).
 @@ -68,7 +70,7 @@ E_NOTE
          if ( $new_perldoc ) {
              $TEMP_pod_build .= <<"END"
- ops$slash$pod: ..${slash}src${slash}ops${slash}$ops
--\t\$(PERLDOC) -ud ops${slash}$pod ..${slash}src${slash}ops${slash}$ops
-+\t\$(PERLDOC) -u ..${slash}src${slash}ops${slash}$ops > ops${slash}$pod 
- \t\$(CHMOD) 0644 ops${slash}$pod
+ ops/$pod: ../src/ops/$ops
+-\t\$(PERLDOC_BIN) -ud ops/$pod ../src/ops/$ops
++\t\$(PERLDOC_BIN) -u ../src/ops/$ops > ops/$pod
+ \t\$(CHMOD) 0644 ops/$pod
  
  END
diff --git a/lang/parrot/patches/patch-ae b/lang/parrot/patches/patch-ae
index 9db6155dc3d..7d0a7430764 100644
--- a/lang/parrot/patches/patch-ae
+++ b/lang/parrot/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2010/01/28 13:06:19 he Exp $
+$NetBSD: patch-ae,v 1.3 2010/03/17 11:06:11 he Exp $
 
 Perldoc's -d is incompatible with doing the build as root.
 
@@ -8,8 +8,8 @@ Perldoc's -d is incompatible with doing the build as root.
  	$(TOUCH) doc-prep
  
  packfile-c.pod: ../src/packfile.c
--#IF(new_perldoc):	$(PERLDOC) -ud packfile-c.pod ../src/packfile.c
-+#IF(new_perldoc):	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod
- #ELSE:	$(PERLDOC) -u ../src/packfile.c > packfile-c.pod
+-#IF(new_perldoc):	$(PERLDOC_BIN) -ud packfile-c.pod ../src/packfile.c
++#IF(new_perldoc):	$(PERLDOC_BIN) -u ../src/packfile.c > packfile-c.pod 
+ #ELSE:	$(PERLDOC_BIN) -u ../src/packfile.c > packfile-c.pod
  
  clean: