Update parrot from version 2.0.0 to 2.1.0.

Pkgsrc changes:
 o Adapt patch to work around dl-handle re-use to eliminate warnings
 o Adapt PLIST to new contents

Upstream changes:
- Core changes
  + GC performance and encapsulation were greatly improved.
  + PMC freeze refactored.
  + More Makefile and build improvements.
- API Changes
  + The Array PMC was removed.
  + Several deprecated vtables were removed.
  + The OrderedHash PMC was substantialy improved.
- Platforms
  + Packaging improvements on some operating systems.
- Tools
  + Some cases in pbc_merge are now handled.
  + Improvements were made to the dependency checker.
  + New tool nativecall.pir added.

4 files changed, 36 insertions, 21 deletions

diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 893d533260c..b465668555d 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/02/02 09:01:09 he Exp $
+# $NetBSD: Makefile,v 1.28 2010/02/18 07:59:38 he Exp $
 #
 
-VERSION=		2.0.0
-RTYPE=			stable
+VERSION=		2.1.0
+RTYPE=			devel
 DISTNAME=		parrot-${VERSION}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.parrot.org/pub/parrot/releases/${RTYPE}/${VERSION}/
diff --git a/lang/parrot/PLIST b/lang/parrot/PLIST
index 130489d82b9..281236bda4a 100644
--- a/lang/parrot/PLIST
+++ b/lang/parrot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/02/02 09:01:09 he Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/02/18 07:59:38 he Exp $
 bin/parrot
 bin/parrot-nqp
 bin/parrot_config
@@ -47,7 +47,6 @@ include/parrot/${PKGVERSION}/parrot/io_unix.h
 include/parrot/${PKGVERSION}/parrot/io_win32.h
 include/parrot/${PKGVERSION}/parrot/key.h
 include/parrot/${PKGVERSION}/parrot/library.h
-include/parrot/${PKGVERSION}/parrot/list.h
 include/parrot/${PKGVERSION}/parrot/longopt.h
 include/parrot/${PKGVERSION}/parrot/memory.h
 include/parrot/${PKGVERSION}/parrot/misc.h
@@ -148,10 +147,14 @@ lib/parrot/${PKGVERSION}/include/test_more.pir
 lib/parrot/${PKGVERSION}/include/timer.pasm
 lib/parrot/${PKGVERSION}/include/tm.pasm
 lib/parrot/${PKGVERSION}/include/warnings.pasm
+lib/parrot/${PKGVERSION}/languages/data_json/Defines.mak
+lib/parrot/${PKGVERSION}/languages/data_json/Rules.mak
 lib/parrot/${PKGVERSION}/languages/data_json/data_json.pbc
 lib/parrot/${PKGVERSION}/languages/data_json/data_json.pir
 lib/parrot/${PKGVERSION}/languages/data_json/data_json/grammar.pg
 lib/parrot/${PKGVERSION}/languages/data_json/data_json/pge2pir.tg
+lib/parrot/${PKGVERSION}/languages/nqp/Defines.mak
+lib/parrot/${PKGVERSION}/languages/nqp/Rules.mak
 lib/parrot/${PKGVERSION}/languages/nqp/TODO.pod
 lib/parrot/${PKGVERSION}/languages/nqp/bootstrap/actions.pm
 lib/parrot/${PKGVERSION}/languages/nqp/bootstrap/nqp.pir
@@ -161,7 +164,9 @@ lib/parrot/${PKGVERSION}/languages/nqp/src/Grammar.pg
 lib/parrot/${PKGVERSION}/languages/nqp/src/Grammar/Actions.pir
 lib/parrot/${PKGVERSION}/languages/nqp/src/builtins.pir
 lib/parrot/${PKGVERSION}/languages/parrot/parrot.pir
+lib/parrot/${PKGVERSION}/languages/pct/Defines.mak
 lib/parrot/${PKGVERSION}/languages/pct/PCT.pir
+lib/parrot/${PKGVERSION}/languages/pct/Rules.mak
 lib/parrot/${PKGVERSION}/languages/pct/src/PAST.pir
 lib/parrot/${PKGVERSION}/languages/pct/src/PAST/Compiler.pir
 lib/parrot/${PKGVERSION}/languages/pct/src/PAST/Node.pir
@@ -171,6 +176,7 @@ lib/parrot/${PKGVERSION}/languages/pct/src/PCT/HLLCompiler.pir
 lib/parrot/${PKGVERSION}/languages/pct/src/PCT/Node.pir
 lib/parrot/${PKGVERSION}/languages/pct/src/POST/Compiler.pir
 lib/parrot/${PKGVERSION}/languages/pct/src/POST/Node.pir
+lib/parrot/${PKGVERSION}/languages/pge/Defines.mak
 lib/parrot/${PKGVERSION}/languages/pge/P6Rule.grammar
 lib/parrot/${PKGVERSION}/languages/pge/PGE.pir
 lib/parrot/${PKGVERSION}/languages/pge/PGE/Exp.pir
@@ -180,7 +186,10 @@ lib/parrot/${PKGVERSION}/languages/pge/PGE/P5Regex.pir
 lib/parrot/${PKGVERSION}/languages/pge/PGE/Perl6Regex.pir
 lib/parrot/${PKGVERSION}/languages/pge/PGE/Regex.pir
 lib/parrot/${PKGVERSION}/languages/pge/PGE/builtins.pg
+lib/parrot/${PKGVERSION}/languages/pge/Rules.mak
 lib/parrot/${PKGVERSION}/languages/pge/STATUS
+lib/parrot/${PKGVERSION}/languages/tge/Defines.mak
+lib/parrot/${PKGVERSION}/languages/tge/Rules.mak
 lib/parrot/${PKGVERSION}/languages/tge/TGE.pir
 lib/parrot/${PKGVERSION}/languages/tge/TGE/Compiler.pir
 lib/parrot/${PKGVERSION}/languages/tge/TGE/Grammar.pir
@@ -251,6 +260,7 @@ lib/parrot/${PKGVERSION}/library/Protoobject.pir
 lib/parrot/${PKGVERSION}/library/Range.pbc
 lib/parrot/${PKGVERSION}/library/Range.pir
 lib/parrot/${PKGVERSION}/library/Regex.pbc
+lib/parrot/${PKGVERSION}/library/Rules.mak
 lib/parrot/${PKGVERSION}/library/SDL.pir
 lib/parrot/${PKGVERSION}/library/SDL/App.pir
 lib/parrot/${PKGVERSION}/library/SDL/Button.pir
@@ -390,6 +400,7 @@ lib/parrot/${PKGVERSION}/tools/lib/Parrot/Docs/Section/Perl.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Docs/Section/Tests.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Docs/Section/Tools.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Docs/Text2HTML.pm
+lib/parrot/${PKGVERSION}/tools/lib/Parrot/H2inc.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Harness/DefaultTests.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Harness/Options.pm
 lib/parrot/${PKGVERSION}/tools/lib/Parrot/Harness/Smoke.pm
@@ -467,12 +478,12 @@ src/parrot/${PKGVERSION}/dynpmc/dynlexpad.pmc
 src/parrot/${PKGVERSION}/dynpmc/foo.pmc
 src/parrot/${PKGVERSION}/dynpmc/foo2.pmc
 src/parrot/${PKGVERSION}/dynpmc/gdbmhash.pmc
+src/parrot/${PKGVERSION}/dynpmc/pccmethod_test.pmc
 src/parrot/${PKGVERSION}/dynpmc/rational.pmc
 src/parrot/${PKGVERSION}/dynpmc/rotest.pmc
 src/parrot/${PKGVERSION}/dynpmc/subproxy.pmc
 src/parrot/${PKGVERSION}/ops/ops.num
 src/parrot/${PKGVERSION}/pmc/addrregistry.pmc
-src/parrot/${PKGVERSION}/pmc/array.pmc
 src/parrot/${PKGVERSION}/pmc/arrayiterator.pmc
 src/parrot/${PKGVERSION}/pmc/bigint.pmc
 src/parrot/${PKGVERSION}/pmc/bignum.pmc
@@ -510,6 +521,7 @@ src/parrot/${PKGVERSION}/pmc/hash.dump
 src/parrot/${PKGVERSION}/pmc/hash.pmc
 src/parrot/${PKGVERSION}/pmc/hashiterator.pmc
 src/parrot/${PKGVERSION}/pmc/hashiteratorkey.pmc
+src/parrot/${PKGVERSION}/pmc/imageio.pmc
 src/parrot/${PKGVERSION}/pmc/integer.dump
 src/parrot/${PKGVERSION}/pmc/integer.pmc
 src/parrot/${PKGVERSION}/pmc/iterator.pmc
@@ -540,7 +552,6 @@ src/parrot/${PKGVERSION}/pmc/parrotinterpreter.pmc
 src/parrot/${PKGVERSION}/pmc/parrotlibrary.pmc
 src/parrot/${PKGVERSION}/pmc/parrotrunningthread.pmc
 src/parrot/${PKGVERSION}/pmc/parrotthread.pmc
-src/parrot/${PKGVERSION}/pmc/pccmethod_test.pmc
 src/parrot/${PKGVERSION}/pmc/pmcproxy.pmc
 src/parrot/${PKGVERSION}/pmc/pointer.pmc
 src/parrot/${PKGVERSION}/pmc/resizablebooleanarray.pmc
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index 7a6cf1a568b..a1c675c781b 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2010/02/02 09:01:09 he Exp $
+$NetBSD: distinfo,v 1.23 2010/02/18 07:59:38 he Exp $
 
-SHA1 (parrot-2.0.0.tar.gz) = 2c9bcde063e68b5e647034e6b57be646f0583f1a
-RMD160 (parrot-2.0.0.tar.gz) = 5c950adcdfd6ebe204639f0036531c0519b71f27
-Size (parrot-2.0.0.tar.gz) = 4036523 bytes
+SHA1 (parrot-2.1.0.tar.gz) = 8824caa06bbef6fa47921386f4d5b53f7a994dfd
+RMD160 (parrot-2.1.0.tar.gz) = c94d1c4000131a0ce9004e269184603e63d4fc9d
+Size (parrot-2.1.0.tar.gz) = 4053988 bytes
 SHA1 (patch-ad) = c78517453408f1e4bb05e2bd8c2967b8f6f47c6e
 SHA1 (patch-ae) = 34994ac2344b0c5b3ba3556b4f60e0f77b6feb31
-SHA1 (patch-ak) = 2caa175c26fcf717f6377fadd04b74a7c9cf750d
+SHA1 (patch-ak) = 803cb407967b26c8f80d8bed9f4605bc42501b6d
diff --git a/lang/parrot/patches/patch-ak b/lang/parrot/patches/patch-ak
index ecba1e6f8f6..65e5dd4df7d 100644
--- a/lang/parrot/patches/patch-ak
+++ b/lang/parrot/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2009/12/09 09:23:51 he Exp $
+$NetBSD: patch-ak,v 1.2 2010/02/18 07:59:38 he Exp $
 
 Prevent problem exposed by "library cloning", where the dlopen()-returned
 handle is copied, causing dlclose() to be called twice with the same handle,
@@ -7,9 +7,9 @@ http://trac.parrot.org/parrot/ticket/1340.
 
 Index: config/gen/platform/generic/dl.c
 ===================================================================
---- config/gen/platform/generic/dl.c	(revision 42823)
-+++ config/gen/platform/generic/dl.c	(working copy)
-@@ -22,11 +22,69 @@
+--- config/gen/platform/generic/dl.c.orig	2009-12-12 01:16:58.000000000 +0100
++++ config/gen/platform/generic/dl.c
+@@ -22,11 +22,69 @@ Dynlib stuff
  */
  
  #ifdef PARROT_HAS_HEADER_DLFCN
@@ -34,7 +34,7 @@ Index: config/gen/platform/generic/dl.c
 +{
 +    struct handle_entry *e;
 +
-+    e = malloc(sizeof(struct handle_entry));
++    e = (struct handle_entry *) malloc(sizeof(struct handle_entry));
 +    if (!e) { return; }
 +    e->handle = handle;
 +    e->next = handle_list;
@@ -79,7 +79,7 @@ Index: config/gen/platform/generic/dl.c
  /*
  
  =item C<void * Parrot_dlopen(const char *filename)>
-@@ -39,7 +97,11 @@
+@@ -39,7 +97,11 @@ void *
  Parrot_dlopen(const char *filename)
  {
  #ifdef PARROT_HAS_HEADER_DLFCN
@@ -92,11 +92,13 @@ Index: config/gen/platform/generic/dl.c
  #else
      return 0;
  #endif
-@@ -93,7 +155,13 @@
+@@ -93,10 +155,15 @@ int
  Parrot_dlclose(void *handle)
  {
  #ifdef PARROT_HAS_HEADER_DLFCN
 -    return dlclose(handle);
+-#else
+-    return -1;
 +    int rv;
 +
 +    if (find_handle_entry(handle)) {
@@ -104,6 +106,8 @@ Index: config/gen/platform/generic/dl.c
 +	rv = dlclose(handle);
 +	return rv;
 +    }
- #else
-     return -1;
  #endif
++    return -1;
+ }
+ 
+ /*