Update to 3.1.0

Changes:	http://www.parrot.org/news/2011/Parrot-3.1.0
		http://www.parrot.org/news/2011/Parrot-3.0.0

4 files changed, 14 insertions, 29 deletions

diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 7fc384678262..e0f5de0b0a6a 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -24,7 +24,7 @@ LICENSE=	ART20
 
 MAKE_JOBS_UNSAFE=	yes
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_BISON=	build
 USE_PERL5=	5.8.0+
 USE_GMAKE=	yes
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_SCRIPT=	Configure.pl
-CONFIGURE_ARGS=	--cc=${CC} --cxx=${CXX} --ld=${CC} --ccflags="${CFLAGS}" \
+CONFIGURE_ARGS=	--cc=${CC} --ld=${CC} --ccflags="${CFLAGS}" \
 		--ldflags="${LDFLAGS} -L/usr/lib -L${LOCALBASE}/lib" \
 		--icu-config=${LOCALBASE}/bin/icu-config \
 		--optimize --parrot_is_shared --inline \
@@ -68,14 +68,6 @@ x-generate-plist:
 
 .include <bsd.port.pre.mk>
 
-# JIT only works on x86
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-CONFIGURE_ARGS+=	--jitcapable --execcapable
-PLIST_SUB+=	JIT=""
-.else
-PLIST_SUB+=	JIT="@comment "
-.endif
-
 .if ${ARCH} == ia64
 BROKEN=		Does not compile on ia64
 .endif
diff --git a/lang/parrot/Makefile.common b/lang/parrot/Makefile.common
index 1daf0f9750b0..affb5bb882aa 100644
--- a/lang/parrot/Makefile.common
+++ b/lang/parrot/Makefile.common
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-PARROT_VERSION=		2.11.0
+PARROT_VERSION=		3.1.0
 
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index 9f92f21cb49e..56eb93680b8f 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (parrot-2.11.0.tar.gz) = 1a62db8793a5baf727a790d9fd58415dcc9f2c0c28b44608701b39792627241c
-SIZE (parrot-2.11.0.tar.gz) = 3849095
+SHA256 (parrot-3.1.0.tar.bz2) = bd200b84d8c6d1565360b7aad7802a42649baebc62d43a823b6aa8f9245e8f01
+SIZE (parrot-3.1.0.tar.bz2) = 3214347
diff --git a/lang/parrot/pkg-plist b/lang/parrot/pkg-plist
index 776cd17d5f2e..59ece9b9f4a9 100644
--- a/lang/parrot/pkg-plist
+++ b/lang/parrot/pkg-plist
@@ -9,6 +9,7 @@ bin/pbc_disassemble
 bin/pbc_dump
 bin/pbc_merge
 bin/pbc_to_exe
+include/parrot/%%PARROT_VER%%/parrot/api.h
 include/parrot/%%PARROT_VER%%/parrot/atomic.h
 include/parrot/%%PARROT_VER%%/parrot/atomic/fallback.h
 include/parrot/%%PARROT_VER%%/parrot/atomic/gcc_pcc.h
@@ -39,12 +40,8 @@ include/parrot/%%PARROT_VER%%/parrot/has_header.h
 include/parrot/%%PARROT_VER%%/parrot/hash.h
 include/parrot/%%PARROT_VER%%/parrot/hll.h
 include/parrot/%%PARROT_VER%%/parrot/imageio.h
-include/parrot/%%PARROT_VER%%/parrot/imcc.h
 include/parrot/%%PARROT_VER%%/parrot/interpreter.h
 include/parrot/%%PARROT_VER%%/parrot/io.h
-include/parrot/%%PARROT_VER%%/parrot/io_portable.h
-include/parrot/%%PARROT_VER%%/parrot/io_unix.h
-include/parrot/%%PARROT_VER%%/parrot/io_win32.h
 include/parrot/%%PARROT_VER%%/parrot/key.h
 include/parrot/%%PARROT_VER%%/parrot/library.h
 include/parrot/%%PARROT_VER%%/parrot/list.h
@@ -64,9 +61,7 @@ include/parrot/%%PARROT_VER%%/parrot/opsenum.h
 include/parrot/%%PARROT_VER%%/parrot/packfile.h
 include/parrot/%%PARROT_VER%%/parrot/parrot.h
 include/parrot/%%PARROT_VER%%/parrot/pbcversion.h
-include/parrot/%%PARROT_VER%%/parrot/platform.h
 include/parrot/%%PARROT_VER%%/parrot/platform_interface.h
-include/parrot/%%PARROT_VER%%/parrot/platform_limits.h
 include/parrot/%%PARROT_VER%%/parrot/pmc.h
 include/parrot/%%PARROT_VER%%/parrot/pmc_freeze.h
 include/parrot/%%PARROT_VER%%/parrot/pobj.h
@@ -80,9 +75,7 @@ include/parrot/%%PARROT_VER%%/parrot/settings.h
 include/parrot/%%PARROT_VER%%/parrot/stat.h
 include/parrot/%%PARROT_VER%%/parrot/string.h
 include/parrot/%%PARROT_VER%%/parrot/string_funcs.h
-include/parrot/%%PARROT_VER%%/parrot/string_primitives.h
 include/parrot/%%PARROT_VER%%/parrot/sub.h
-include/parrot/%%PARROT_VER%%/parrot/sysmem.h
 include/parrot/%%PARROT_VER%%/parrot/thr_pthread.h
 include/parrot/%%PARROT_VER%%/parrot/thr_windows.h
 include/parrot/%%PARROT_VER%%/parrot/thread.h
@@ -144,9 +137,11 @@ include/parrot/%%PARROT_VER%%/pmc/pmc_orderedhashiterator.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfile.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfileannotation.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfileannotations.h
+include/parrot/%%PARROT_VER%%/pmc/pmc_packfilebytecodesegment.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfileconstanttable.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfiledebug.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfiledirectory.h
+include/parrot/%%PARROT_VER%%/pmc/pmc_packfileopmap.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfilerawsegment.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_packfilesegment.h
 include/parrot/%%PARROT_VER%%/pmc/pmc_parrotinterpreter.h
@@ -336,8 +331,6 @@ lib/parrot/%%PARROT_VER%%/library/ProfTest/Matcher.nqp
 lib/parrot/%%PARROT_VER%%/library/ProfTest/NQPProfile.nqp
 lib/parrot/%%PARROT_VER%%/library/ProfTest/PIRProfile.nqp
 lib/parrot/%%PARROT_VER%%/library/ProfTest/Want.nqp
-lib/parrot/%%PARROT_VER%%/library/Protoobject.pbc
-lib/parrot/%%PARROT_VER%%/library/Protoobject.pir
 lib/parrot/%%PARROT_VER%%/library/Range.pbc
 lib/parrot/%%PARROT_VER%%/library/Range.pir
 lib/parrot/%%PARROT_VER%%/library/Regex.pbc
@@ -408,6 +401,8 @@ lib/parrot/%%PARROT_VER%%/library/YAML/Dumper.pbc
 lib/parrot/%%PARROT_VER%%/library/YAML/Dumper.pir
 lib/parrot/%%PARROT_VER%%/library/YAML/Dumper/Base.pir
 lib/parrot/%%PARROT_VER%%/library/YAML/Dumper/Default.pir
+lib/parrot/%%PARROT_VER%%/library/YAML/Tiny.pbc
+lib/parrot/%%PARROT_VER%%/library/YAML/Tiny.pm
 lib/parrot/%%PARROT_VER%%/library/config.pbc
 lib/parrot/%%PARROT_VER%%/library/config.pir
 lib/parrot/%%PARROT_VER%%/library/distutils.pbc
@@ -477,6 +472,7 @@ lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/Group.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/HTMLPage.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/Item.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/POD2HTML.pm
+lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/PodToHtml.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/Section.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/Section/C.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Docs/Section/Compilers.pm
@@ -500,8 +496,8 @@ lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/H2inc.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Harness/DefaultTests.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Harness/Options.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Harness/Smoke.pm
-lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Headerizer/Functions.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Headerizer.pm
+lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Headerizer/Functions.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/IO/Directory.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/IO/File.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/IO/Path.pm
@@ -509,24 +505,20 @@ lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Install.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Manifest.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/PMC.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Attribute.pm
-lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/ComposedMethod.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Dumper.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Emitter.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Library.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/MULTI.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Method.pm
-lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/MethodEmitter.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Object.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PCCMETHOD.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/Null.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/Object.pm
-lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/ParrotClass.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/PrintTree.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/RO.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMC/default.pm
-lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/PMCEmitter.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Parser.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/Pmc2cMain.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Pmc2c/UtilFunctions.pm
@@ -545,7 +537,6 @@ lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Test/Util/Runloop.pm
 lib/parrot/%%PARROT_VER%%/tools/lib/Parrot/Vtable.pm
 lib/pkgconfig/parrot/%%PARROT_VER%%/parrot.pc
 %%PARROT_DOCS%%/CREDITS
-%%PARROT_DOCS%%/DEPRECATED.pod
 %%PARROT_DOCS%%/DONORS.pod
 %%PARROT_DOCS%%/LICENSE
 %%PARROT_DOCS%%/NEWS
@@ -610,9 +601,11 @@ src/parrot/%%PARROT_VER%%/pmc/orderedhashiterator.dump
 src/parrot/%%PARROT_VER%%/pmc/packfile.dump
 src/parrot/%%PARROT_VER%%/pmc/packfileannotation.dump
 src/parrot/%%PARROT_VER%%/pmc/packfileannotations.dump
+src/parrot/%%PARROT_VER%%/pmc/packfilebytecodesegment.dump
 src/parrot/%%PARROT_VER%%/pmc/packfileconstanttable.dump
 src/parrot/%%PARROT_VER%%/pmc/packfiledebug.dump
 src/parrot/%%PARROT_VER%%/pmc/packfiledirectory.dump
+src/parrot/%%PARROT_VER%%/pmc/packfileopmap.dump
 src/parrot/%%PARROT_VER%%/pmc/packfilerawsegment.dump
 src/parrot/%%PARROT_VER%%/pmc/packfilesegment.dump
 src/parrot/%%PARROT_VER%%/pmc/parrotinterpreter.dump