lang/nqp becomes the same as wip/nqp, upgrading to 2017.09

6 files changed, 30 insertions, 54 deletions

diff --git a/lang/nqp/Makefile b/lang/nqp/Makefile
index 379fbe96eb1..f3df7583491 100644
--- a/lang/nqp/Makefile
+++ b/lang/nqp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2017/09/18 09:53:01 maya Exp $
+# $NetBSD: Makefile,v 1.15 2017/09/26 17:21:08 mspo Exp $
 
-DISTNAME=	nqp-2013.08
-PKGREVISION=	12
+DISTNAME=	nqp-2017.09
 CATEGORIES=	lang perl6
 MASTER_SITES=	http://rakudo.org/downloads/nqp/
 
@@ -15,22 +14,14 @@ MAKE_JOBS_SAFE=	no
 .include "../../mk/bsd.prefs.mk"
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		perl
-PLIST_SRC+=		${PLIST_SRC_DFLT}
-.if (${OPSYS} != "Darwin")
-PLIST_SRC+=		PLIST.shared
-.else
-USE_TOOLS+=		 gmake
-.endif
+USE_TOOLS+=		perl gmake
 
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${PERL5}
 CONFIGURE_SCRIPT=	Configure.pl
 CONFIGURE_ARGS=		--prefix=${PREFIX:Q} \
-			--with-parrot=${PREFIX}/bin/parrot
+			--backends=moar
 
-PLIST_SUBST+=		PARROT_VERSION=${PARROT_VERSION:Q}
-PRINT_PLIST_AWK+=        { gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") }
-
-.include "../../lang/parrot/buildlink3.mk"
+BUILDLINK_API_DEPENDS.MoarVM+=  MoarVM>=2017.07
+.include "../../devel/MoarVM/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nqp/PLIST b/lang/nqp/PLIST
index 81180cd6c9e..01b5924aea0 100644
--- a/lang/nqp/PLIST
+++ b/lang/nqp/PLIST
@@ -1,21 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/13 11:16:18 sno Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/26 17:21:08 mspo Exp $
 bin/nqp
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_nqplexinfo.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_nqplexpad.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_ownedhash.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_ownedresizablepmcarray.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_qrpa.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_serializationcontext.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_sixmodelobject.h
-include/parrot/${PARROT_VERSION}/dynpmc/pmc_stable.h
-lib/parrot/${PARROT_VERSION}/include/nqp_const.pir
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/NQPCORE.setting.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/NQPHLL.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/NQPP5QRegex.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/NQPP6QRegex.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/QAST.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/QASTNode.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/QRegex.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/nqp.pbc
-lib/parrot/${PARROT_VERSION}/languages/nqp/lib/nqpmo.pbc
-lib/parrot/${PARROT_VERSION}/library/ModuleLoader.pbc
+bin/nqp-m
+share/nqp/lib/MASTNodes.moarvm
+share/nqp/lib/MASTOps.moarvm
+share/nqp/lib/ModuleLoader.moarvm
+share/nqp/lib/NQPCORE.setting.moarvm
+share/nqp/lib/NQPHLL.moarvm
+share/nqp/lib/NQPP5QRegex.moarvm
+share/nqp/lib/NQPP6QRegex.moarvm
+share/nqp/lib/QAST.moarvm
+share/nqp/lib/QASTNode.moarvm
+share/nqp/lib/QRegex.moarvm
+share/nqp/lib/nqp.moarvm
+share/nqp/lib/nqpmo.moarvm
+share/nqp/lib/profiler/template.html
diff --git a/lang/nqp/PLIST.Darwin b/lang/nqp/PLIST.Darwin
deleted file mode 100644
index 00c89252820..00000000000
--- a/lang/nqp/PLIST.Darwin
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2013/09/13 11:16:18 sno Exp $
-lib/parrot/${PARROT_VERSION}/dynext/nqp_bigint_ops.bundle
-lib/parrot/${PARROT_VERSION}/dynext/nqp_dyncall_ops.bundle
-lib/parrot/${PARROT_VERSION}/dynext/nqp_group.bundle
-lib/parrot/${PARROT_VERSION}/dynext/nqp_ops.bundle
diff --git a/lang/nqp/PLIST.shared b/lang/nqp/PLIST.shared
deleted file mode 100644
index c13578b0f58..00000000000
--- a/lang/nqp/PLIST.shared
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.shared,v 1.1 2013/09/13 11:16:18 sno Exp $
-lib/parrot/${PARROT_VERSION}/dynext/nqp_bigint_ops.so
-lib/parrot/${PARROT_VERSION}/dynext/nqp_dyncall_ops.so
-lib/parrot/${PARROT_VERSION}/dynext/nqp_group.so
-lib/parrot/${PARROT_VERSION}/dynext/nqp_ops.so
diff --git a/lang/nqp/buildlink3.mk b/lang/nqp/buildlink3.mk
index d16adfdc724..b3bff5e97cf 100644
--- a/lang/nqp/buildlink3.mk
+++ b/lang/nqp/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2017/09/18 09:53:01 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2017/09/26 17:21:08 mspo Exp $
 
 BUILDLINK_TREE+=	nqp
 
 .if !defined(NQP_BUILDLINK3_MK)
 NQP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nqp+=		nqp>=2013.08
-BUILDLINK_ABI_DEPENDS.nqp+=		nqp>=2013.08nb12
+BUILDLINK_API_DEPENDS.nqp+=		nqp>=2015.11
+BUILDLINK_ABI_DEPENDS.nqp+=		nqp>=2015.11
 BUILDLINK_PKGSRCDIR.nqp?=		../../lang/nqp
 
-.include "../../lang/parrot/buildlink3.mk"
+.include "../../devel/MoarVM/buildlink3.mk"
 .endif # NQP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-nqp
diff --git a/lang/nqp/distinfo b/lang/nqp/distinfo
index f93942f50c4..f51aeace9b2 100644
--- a/lang/nqp/distinfo
+++ b/lang/nqp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 22:50:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/09/26 17:21:08 mspo Exp $
 
-SHA1 (nqp-2013.08.tar.gz) = ae2977b9b6e7c09077f032684cdaeeb1367d9ccc
-RMD160 (nqp-2013.08.tar.gz) = 5f9f803d7c610ec60b383496d334f1e282836024
-SHA512 (nqp-2013.08.tar.gz) = ebcb5865c2110798cbaf34e7e7ba27490f10230779016fe375af6c4c6f60cf6ee3a7ed2a40b6075412854875749e1a513f13b61cceda2915b824533628ce7d4d
-Size (nqp-2013.08.tar.gz) = 2693642 bytes
+SHA1 (nqp-2017.09.tar.gz) = 184ad7bb2bed4ce5facd74d67b356047436e078d
+RMD160 (nqp-2017.09.tar.gz) = f52446eb667d4a4977776e51b9c46705a4f3d50b
+SHA512 (nqp-2017.09.tar.gz) = d1adb86e31e5e2ea0df999b7a187c7272637f1b24f86c07461de2b25fc55eaf1e61ca27acb72c20f230269c3b282ccbe45edd5cef014365c0860e7443a9b736f
+Size (nqp-2017.09.tar.gz) = 3725253 bytes