summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorhe <he>2010-04-23 14:08:17 +0000
committerhe <he>2010-04-23 14:08:17 +0000
commit3864943ba41c31459385169adcda5b9c1d9d564d (patch)
treebb60db6819cf17d34e037ad40d2648cf8cf036f2 /lang
parent0b94a11db2ff7a8edf5f3b85f4cf11472362da5f (diff)
downloadpkgsrc-3864943ba41c31459385169adcda5b9c1d9d564d.tar.gz
Update parrot from version 2.2.0 to 2.3.0.
Pkgsrc changes: o Adapt our patches to up-stream changes. o Fix PLIST to match what's being installed. Upstream changes: - Core + Allow passing parameters to the dynamic linker ('dlopen' improved) + loadlib opcode added + Calling conventions are now much more consistent, and follows natural semantics of handling arguments and return values + Recursive make for src/dynpmc removed + Datatype STRINGNULL for a single Null STRING added + config_lib.pasm replaced with config_lib.pir - Platforms + Improved handling of new compilers + Cygwin packages will be updated again with Parrot releases + Fedora packages add desktop files + gzip and bzip2 compressed tar files for releases - Tools + tapir executable added; tapir is a TAP test harness + Added TAP options --merge --ignore-exit - Miscellaneous + 3 month cycle for supported releases + Review and vote of GSoC applications
Diffstat (limited to 'lang')
-rw-r--r--lang/parrot/Makefile6
-rw-r--r--lang/parrot/PLIST110
-rw-r--r--lang/parrot/distinfo10
-rw-r--r--lang/parrot/patches/patch-ak22
4 files changed, 35 insertions, 113 deletions
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 59c8734fbfd..58bacfe557e 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/03/17 11:06:11 he Exp $
+# $NetBSD: Makefile,v 1.32 2010/04/23 14:08:17 he Exp $
#
-VERSION= 2.2.0
-RTYPE= devel
+VERSION= 2.3.0
+RTYPE= supported
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 2dae19fb5b0..b894eb7fe3c 100644
--- a/lang/parrot/PLIST
+++ b/lang/parrot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2010/03/23 15:31:28 he Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/04/23 14:08:17 he Exp $
bin/parrot
bin/parrot-nqp
bin/parrot_config
@@ -8,6 +8,7 @@ bin/pbc_disassemble
bin/pbc_dump
bin/pbc_merge
bin/pbc_to_exe
+bin/tapir
include/parrot/${PKGVERSION}/parrot/atomic.h
include/parrot/${PKGVERSION}/parrot/atomic/fallback.h
include/parrot/${PKGVERSION}/parrot/atomic/gcc_pcc.h
@@ -120,10 +121,12 @@ lib/parrot/${PKGVERSION}/include/call_bits.pasm
lib/parrot/${PKGVERSION}/include/cclass.pasm
lib/parrot/${PKGVERSION}/include/config.fpmc
lib/parrot/${PKGVERSION}/include/datatypes.pasm
+lib/parrot/${PKGVERSION}/include/dlopenflags.pasm
lib/parrot/${PKGVERSION}/include/errors.pasm
lib/parrot/${PKGVERSION}/include/except_severity.pasm
lib/parrot/${PKGVERSION}/include/except_types.pasm
lib/parrot/${PKGVERSION}/include/fp_equality.pasm
+lib/parrot/${PKGVERSION}/include/hash_key_type.pasm
lib/parrot/${PKGVERSION}/include/hllmacros.pir
lib/parrot/${PKGVERSION}/include/iglobals.pasm
lib/parrot/${PKGVERSION}/include/interpcores.pasm
@@ -252,6 +255,10 @@ lib/parrot/${PKGVERSION}/library/Parrot/Coroutine.pir
lib/parrot/${PKGVERSION}/library/Parrot/Exception.pbc
lib/parrot/${PKGVERSION}/library/Parrot/Exception.pir
lib/parrot/${PKGVERSION}/library/Pg.pir
+lib/parrot/${PKGVERSION}/library/ProfTest/Matcher.nqp
+lib/parrot/${PKGVERSION}/library/ProfTest/NQPProfile.nqp
+lib/parrot/${PKGVERSION}/library/ProfTest/PIRProfile.nqp
+lib/parrot/${PKGVERSION}/library/ProfTest/Want.nqp
lib/parrot/${PKGVERSION}/library/Protoobject.pbc
lib/parrot/${PKGVERSION}/library/Protoobject.pir
lib/parrot/${PKGVERSION}/library/Range.pbc
@@ -293,6 +300,12 @@ lib/parrot/${PKGVERSION}/library/Stream/Sub.pir
lib/parrot/${PKGVERSION}/library/Stream/Writer.pbc
lib/parrot/${PKGVERSION}/library/Stream/Writer.pir
lib/parrot/${PKGVERSION}/library/String/Utils.pir
+lib/parrot/${PKGVERSION}/library/TAP/Formatter.pbc
+lib/parrot/${PKGVERSION}/library/TAP/Formatter.pir
+lib/parrot/${PKGVERSION}/library/TAP/Harness.pbc
+lib/parrot/${PKGVERSION}/library/TAP/Harness.pir
+lib/parrot/${PKGVERSION}/library/TAP/Parser.pbc
+lib/parrot/${PKGVERSION}/library/TAP/Parser.pir
lib/parrot/${PKGVERSION}/library/TGE.pbc
lib/parrot/${PKGVERSION}/library/Tcl/Glob.pbc
lib/parrot/${PKGVERSION}/library/Tcl/Glob.pir
@@ -329,6 +342,8 @@ lib/parrot/${PKGVERSION}/library/ncurses.pasm
lib/parrot/${PKGVERSION}/library/ncurses.pbc
lib/parrot/${PKGVERSION}/library/ncurses.pir
lib/parrot/${PKGVERSION}/library/nqp-rx.pbc
+lib/parrot/${PKGVERSION}/library/osutils.pbc
+lib/parrot/${PKGVERSION}/library/osutils.pir
lib/parrot/${PKGVERSION}/library/parrotlib.pbc
lib/parrot/${PKGVERSION}/library/parrotlib.pir
lib/parrot/${PKGVERSION}/library/pcore.pbc
@@ -470,114 +485,21 @@ share/doc/parrot/${PKGVERSION}/README_cygwin.pod
share/doc/parrot/${PKGVERSION}/README_win32.pod
share/doc/parrot/${PKGVERSION}/RESPONSIBLE_PARTIES
share/doc/parrot/${PKGVERSION}/TODO
-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/arrayiterator.pmc
-src/parrot/${PKGVERSION}/pmc/bigint.pmc
-src/parrot/${PKGVERSION}/pmc/bignum.pmc
src/parrot/${PKGVERSION}/pmc/boolean.dump
-src/parrot/${PKGVERSION}/pmc/boolean.pmc
-src/parrot/${PKGVERSION}/pmc/callcontext.pmc
-src/parrot/${PKGVERSION}/pmc/capture.pmc
-src/parrot/${PKGVERSION}/pmc/class.pmc
-src/parrot/${PKGVERSION}/pmc/codestring.pmc
-src/parrot/${PKGVERSION}/pmc/complex.pmc
src/parrot/${PKGVERSION}/pmc/continuation.dump
-src/parrot/${PKGVERSION}/pmc/continuation.pmc
-src/parrot/${PKGVERSION}/pmc/coroutine.pmc
-src/parrot/${PKGVERSION}/pmc/cpointer.pmc
src/parrot/${PKGVERSION}/pmc/default.dump
-src/parrot/${PKGVERSION}/pmc/default.pmc
-src/parrot/${PKGVERSION}/pmc/env.pmc
-src/parrot/${PKGVERSION}/pmc/eval.pmc
-src/parrot/${PKGVERSION}/pmc/eventhandler.pmc
-src/parrot/${PKGVERSION}/pmc/exception.pmc
-src/parrot/${PKGVERSION}/pmc/exceptionhandler.pmc
-src/parrot/${PKGVERSION}/pmc/exporter.pmc
-src/parrot/${PKGVERSION}/pmc/file.pmc
-src/parrot/${PKGVERSION}/pmc/filehandle.pmc
-src/parrot/${PKGVERSION}/pmc/fixedbooleanarray.pmc
-src/parrot/${PKGVERSION}/pmc/fixedfloatarray.pmc
-src/parrot/${PKGVERSION}/pmc/fixedintegerarray.pmc
src/parrot/${PKGVERSION}/pmc/fixedpmcarray.dump
-src/parrot/${PKGVERSION}/pmc/fixedpmcarray.pmc
-src/parrot/${PKGVERSION}/pmc/fixedstringarray.pmc
src/parrot/${PKGVERSION}/pmc/float.dump
-src/parrot/${PKGVERSION}/pmc/float.pmc
-src/parrot/${PKGVERSION}/pmc/handle.pmc
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/imageiosize.pmc
src/parrot/${PKGVERSION}/pmc/integer.dump
-src/parrot/${PKGVERSION}/pmc/integer.pmc
-src/parrot/${PKGVERSION}/pmc/iterator.pmc
-src/parrot/${PKGVERSION}/pmc/key.pmc
-src/parrot/${PKGVERSION}/pmc/lexinfo.pmc
-src/parrot/${PKGVERSION}/pmc/lexpad.pmc
-src/parrot/${PKGVERSION}/pmc/managedstruct.pmc
src/parrot/${PKGVERSION}/pmc/multisub.dump
-src/parrot/${PKGVERSION}/pmc/multisub.pmc
-src/parrot/${PKGVERSION}/pmc/namespace.pmc
-src/parrot/${PKGVERSION}/pmc/nci.pmc
-src/parrot/${PKGVERSION}/pmc/null.pmc
src/parrot/${PKGVERSION}/pmc/object.dump
-src/parrot/${PKGVERSION}/pmc/object.pmc
-src/parrot/${PKGVERSION}/pmc/opcode.pmc
-src/parrot/${PKGVERSION}/pmc/oplib.pmc
-src/parrot/${PKGVERSION}/pmc/orderedhash.pmc
-src/parrot/${PKGVERSION}/pmc/orderedhashiterator.pmc
-src/parrot/${PKGVERSION}/pmc/os.pmc
-src/parrot/${PKGVERSION}/pmc/packfile.pmc
-src/parrot/${PKGVERSION}/pmc/packfileannotation.pmc
-src/parrot/${PKGVERSION}/pmc/packfileannotations.pmc
-src/parrot/${PKGVERSION}/pmc/packfileconstanttable.pmc
-src/parrot/${PKGVERSION}/pmc/packfiledirectory.pmc
-src/parrot/${PKGVERSION}/pmc/packfilefixupentry.pmc
-src/parrot/${PKGVERSION}/pmc/packfilefixuptable.pmc
-src/parrot/${PKGVERSION}/pmc/packfilerawsegment.pmc
-src/parrot/${PKGVERSION}/pmc/packfilesegment.pmc
-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/pmcproxy.pmc
-src/parrot/${PKGVERSION}/pmc/pointer.pmc
-src/parrot/${PKGVERSION}/pmc/resizablebooleanarray.pmc
-src/parrot/${PKGVERSION}/pmc/resizablefloatarray.pmc
-src/parrot/${PKGVERSION}/pmc/resizableintegerarray.pmc
src/parrot/${PKGVERSION}/pmc/resizablepmcarray.dump
-src/parrot/${PKGVERSION}/pmc/resizablepmcarray.pmc
-src/parrot/${PKGVERSION}/pmc/resizablestringarray.pmc
-src/parrot/${PKGVERSION}/pmc/retcontinuation.pmc
src/parrot/${PKGVERSION}/pmc/role.dump
-src/parrot/${PKGVERSION}/pmc/role.pmc
src/parrot/${PKGVERSION}/pmc/scalar.dump
-src/parrot/${PKGVERSION}/pmc/scalar.pmc
-src/parrot/${PKGVERSION}/pmc/scheduler.pmc
-src/parrot/${PKGVERSION}/pmc/schedulermessage.pmc
-src/parrot/${PKGVERSION}/pmc/sockaddr.pmc
-src/parrot/${PKGVERSION}/pmc/socket.pmc
src/parrot/${PKGVERSION}/pmc/string.dump
-src/parrot/${PKGVERSION}/pmc/string.pmc
-src/parrot/${PKGVERSION}/pmc/stringhandle.pmc
-src/parrot/${PKGVERSION}/pmc/stringiterator.pmc
src/parrot/${PKGVERSION}/pmc/sub.dump
-src/parrot/${PKGVERSION}/pmc/sub.pmc
-src/parrot/${PKGVERSION}/pmc/task.pmc
-src/parrot/${PKGVERSION}/pmc/timer.pmc
src/parrot/${PKGVERSION}/pmc/undef.dump
-src/parrot/${PKGVERSION}/pmc/undef.pmc
-src/parrot/${PKGVERSION}/pmc/unmanagedstruct.pmc
src/parrot/${PKGVERSION}/vtable.dump
src/parrot/${PKGVERSION}/vtable.tbl
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index b27811c2e26..9b980ac6960 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2010/03/17 11:06:11 he Exp $
+$NetBSD: distinfo,v 1.26 2010/04/23 14:08:17 he Exp $
-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 (parrot-2.3.0.tar.gz) = b0321efcc47581884c56fc3f5b1952751b98abe5
+RMD160 (parrot-2.3.0.tar.gz) = 449f1bad8a045e5edc1e6c1c09055512991b0588
+Size (parrot-2.3.0.tar.gz) = 4071016 bytes
SHA1 (patch-ad) = aae66d32722d4c761132e57176469de7c7d51c88
SHA1 (patch-ae) = 373909f50385c580065a03946a1f4f5b342189fc
-SHA1 (patch-ak) = 803cb407967b26c8f80d8bed9f4605bc42501b6d
+SHA1 (patch-ak) = 45df82c2240f4619feadc482bcf2636a6b5aa41a
diff --git a/lang/parrot/patches/patch-ak b/lang/parrot/patches/patch-ak
index 65e5dd4df7d..a442819cfc4 100644
--- a/lang/parrot/patches/patch-ak
+++ b/lang/parrot/patches/patch-ak
@@ -1,13 +1,11 @@
-$NetBSD: patch-ak,v 1.2 2010/02/18 07:59:38 he Exp $
+$NetBSD: patch-ak,v 1.3 2010/04/23 14:08:17 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,
which in turn triggers a warning from ld.elf_so on NetBSD. Ref.
http://trac.parrot.org/parrot/ticket/1340.
-Index: config/gen/platform/generic/dl.c
-===================================================================
---- config/gen/platform/generic/dl.c.orig 2009-12-12 01:16:58.000000000 +0100
+--- config/gen/platform/generic/dl.c.orig 2010-03-22 13:39:23.000000000 +0100
+++ config/gen/platform/generic/dl.c
@@ -22,11 +22,69 @@ Dynlib stuff
*/
@@ -20,6 +18,7 @@ Index: config/gen/platform/generic/dl.c
#define PARROT_DLOPEN_FLAGS RTLD_LAZY
++
+#ifdef PARROT_HAS_HEADER_DLFCN
+
+struct handle_entry {
@@ -75,24 +74,25 @@ Index: config/gen/platform/generic/dl.c
+}
+#endif /* PARROT_HAS_HEADER_DLFCN */
+
-+
/*
- =item C<void * Parrot_dlopen(const char *filename)>
-@@ -39,7 +97,11 @@ void *
- Parrot_dlopen(const char *filename)
+ =item C<void * Parrot_dlopen(const char *filename, Parrot_dlopen_flags flags)>
+@@ -39,8 +97,12 @@ void *
+ Parrot_dlopen(const char *filename, Parrot_dlopen_flags flags)
{
#ifdef PARROT_HAS_HEADER_DLFCN
-- return dlopen(filename, PARROT_DLOPEN_FLAGS);
+- return dlopen(filename, PARROT_DLOPEN_FLAGS
+- | ((flags & Parrot_dlopen_global_FLAG) ? RTLD_GLOBAL : 0));
+ void *h;
+
-+ h = dlopen(filename, PARROT_DLOPEN_FLAGS);
++ h = dlopen(filename, PARROT_DLOPEN_FLAGS
++ | ((flags & Parrot_dlopen_global_FLAG) ? RTLD_GLOBAL : 0));
+ push_handle_entry(h);
+ return h;
#else
return 0;
#endif
-@@ -93,10 +155,15 @@ int
+@@ -94,10 +156,15 @@ int
Parrot_dlclose(void *handle)
{
#ifdef PARROT_HAS_HEADER_DLFCN