Hi ports --
Attached is a diff to update lang/parrot to its latest version.
All tests but one pass (on amd64, at least), I'll work with upstream to
get it fixed.
There's a inst_libparrot.so now, which upstream says is an "installable
library." I don't know what that means but it having a @bin prefix in
PLIST is apparently what upstream expects.
Take maintainer.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/parrot/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- Makefile 10 Apr 2017 11:46:22 -0000 1.38
+++ Makefile 10 Jun 2017 13:44:37 -0000
@@ -2,13 +2,13 @@
COMMENT= virtual machine designed for interpreted languages
-V= 7.10.0
+V= 8.1.0
DISTNAME= parrot-$V
-REVISION= 0
CATEGORIES= lang perl6
SHARED_LIBS= parrot 11.0
HOMEPAGE= http://www.parrot.org/
+MAINTAINER= Brian Callahan <[email protected]>
MASTER_SITES= http://ftp.parrot.org/releases/all/$V/ \
ftp://ftp.parrot.org/pub/parrot/releases/all/$V/
@@ -16,16 +16,16 @@ MASTER_SITES= http://ftp.parrot.org/rele
# Artistic2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += GL GLU c glut gmp icudata icuuc m ncurses pthread
-WANTLIB += readline ${LIBCXX} util z ffi
+WANTLIB += GL GLU c glut gmp icudata icuuc intl m ncurses pthread
+WANTLIB += readline ${LIBCXX} z ffi
-MODULES = devel/gettext
BUILD_DEPENDS= graphics/glew \
devel/pcre
LIB_DEPENDS= textproc/icu4c \
devel/gmp \
graphics/freeglut \
- devel/libffi
+ devel/libffi \
+ devel/gettext
TEST_DEPENDS= devel/p5-TAP-Harness-Multiple \
devel/p5-Test-Perl-Critic
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/parrot/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo 10 Dec 2015 17:49:56 -0000 1.19
+++ distinfo 10 Jun 2017 13:44:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (parrot-7.10.0.tar.gz) = L+MeyTlftqS4uJDBQYgDDNtAEV5ey0BerfCx62yEv+k=
-SIZE (parrot-7.10.0.tar.gz) = 4707943
+SHA256 (parrot-8.1.0.tar.gz) = NYUOrqGZU9hWQKHt6xLah5qU3wgStEjavpvtxs+GZzo=
+SIZE (parrot-8.1.0.tar.gz) = 4700495
Index: patches/patch-src_atomic_gcc_x86_c
===================================================================
RCS file: patches/patch-src_atomic_gcc_x86_c
diff -N patches/patch-src_atomic_gcc_x86_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_atomic_gcc_x86_c 10 Jun 2017 13:44:37 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+gcc-4.2.1 cpp is too old to handle this construct?
+
+Index: src/atomic/gcc_x86.c
+--- src/atomic/gcc_x86.c.orig
++++ src/atomic/gcc_x86.c
+@@ -51,7 +51,7 @@ parrot_i386_cmpxchg(ARGMOD(void *volatile *ptr), ARGIN
+ ARGIN_NULLOK(void *update))
+ {
+ ASSERT_ARGS(parrot_i386_cmpxchg)
+-#if defined(PARROT_HAS_AMD64_GCC_CMPXCHG) || __WORDSIZE == 64
++#if defined(PARROT_HAS_AMD64_GCC_CMPXCHG)
+ __asm__ __volatile__("lock\n"
+ "cmpxchgq %1,%2":"=a"(expect):"q"(update), "m"(*ptr),
+ "0"(expect)
+@@ -85,7 +85,7 @@ parrot_i386_xadd(ARGIN(volatile long *l), long amount)
+ {
+ ASSERT_ARGS(parrot_i386_xadd)
+ long result = amount;
+-#if defined(PARROT_HAS_AMD64_GCC_CMPXCHG) || __WORDSIZE == 64
++#if defined(PARROT_HAS_AMD64_GCC_CMPXCHG)
+ __asm__ __volatile__("lock\n" "xaddq %0, %1" : "=r"(result), "=m"(*l) :
+ "0"(result), "m"(*l));
+ #elif defined(PARROT_HAS_I386_GCC_CMPXCHG)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/parrot/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 PLIST
--- pkg/PLIST 4 Nov 2015 18:54:32 -0000 1.19
+++ pkg/PLIST 10 Jun 2017 13:44:38 -0000
@@ -200,6 +200,7 @@ include/parrot/${V}/pmc/pmc_task.h
include/parrot/${V}/pmc/pmc_timer.h
include/parrot/${V}/pmc/pmc_undef.h
include/parrot/${V}/pmc/pmc_unmanagedstruct.h
+@bin lib/inst_libparrot.so.11.0
lib/libparrot.a
@lib lib/libparrot.so.${LIBparrot_VERSION}
lib/parrot/
