Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/lang/parrot/Makefile	2013/05/09 07:39:12	1.70
+++ pkgsrc/lang/parrot/Makefile	2019/11/03 19:04:04	1.96
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.70 2013/05/09 07:39:12 adam Exp $
+# $NetBSD: Makefile,v 1.96 2019/11/03 19:04:04 rillig Exp $
 #
 
-VERSION=		4.8.0
-RTYPE=			devel
-DISTNAME=		parrot-${VERSION}
-PKGREVISION=		3
+DISTNAME=		parrot-${PARROT_VERSION}
+PKGREVISION=		20
 CATEGORIES=		lang
-MASTER_SITES=		ftp://ftp.parrot.org/pub/parrot/releases/${RTYPE}/${VERSION}/
+MASTER_SITES=		ftp://ftp.parrot.org/pub/parrot/releases/${PARROT_RTYPE}/${PARROT_VERSION}/
 
 MAINTAINER=		he@NetBSD.org
 HOMEPAGE=		http://www.parrotcode.org/
@@ -14,11 +12,12 @@ COMMENT=		Virtual machine made to run Pe
 LICENSE=		artistic-2.0
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		perl
+USE_TOOLS+=		perl gmake
 PTHREAD_OPTS+=		require
 BUILD_TARGET=		world
 TEST_TARGET=		test
 HAS_CONFIGURE=		yes
+MAKE_JOBS_SAFE=		no
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
@@ -26,8 +25,13 @@ HAS_CONFIGURE=		yes
 CONFIG_SHELL=		perl
 CONFIGURE_SCRIPT=	Configure.pl
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q} \
+			--mandir=${PREFIX:Q}/${PKGMANDIR:Q} \
 			--icu-config=${PREFIX}/bin/icu-config \
+			--without-opengl --without-pcre \
+			--without-zlib \
+			--without-libffi \
 			--optimize
+# --without-llvm
 
 SUBST_CLASSES+=		pthread
 SUBST_STAGE.pthread=	post-configure
@@ -39,7 +43,8 @@ SUBST_SED.pthread+=	-e '/^CFLAGS /s|$$|$
 SUBST_SED.pthread+=	-e '/^LINKFLAGS /s|$$|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|'
 SUBST_SED.pthread+=	-e '/^LDFLAGS /s|$$|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|'
 
-PLIST_SUBST+=		VERSION=${VERSION:Q}
+PLIST_SUBST+=		PARROT_VERSION=${PARROT_VERSION:Q}
+PRINT_PLIST_AWK+=	{ gsub(/${PARROT_VERSION}/, "$${PARROT_VERSION}") }
 PLIST_SRC+=		${PLIST_SRC_DFLT}
 # Default this to ELF shared libs with .so,
 # Darwin has PLIST.Darwin which gets included automatically.
@@ -58,12 +63,12 @@ REPLACE_PERL+=		tools/dev/reconfigure.pl
 REPLACE_INTERPRETER+=	parrot
 REPLACE.parrot.old=	.*parrot[^[:space:]]*
 REPLACE.parrot.new=	${PREFIX}/bin/parrot
-REPLACE_FILES.parrot+= 	tools/dev/pbc_to_exe.pir
+REPLACE_FILES.parrot+=	tools/dev/pbc_to_exe.pir
 
-REPLACE_INTERPRETER+=	parrot-nqp
-REPLACE.parrot-nqp.old=	.*parrot-nqp[^[:space:]]*
-REPLACE.parrot-nqp.new= ${PREFIX}/bin/parrot-nqp
-REPLACE_FILES.parrot-nqp+= compilers/data_json/JSON.nqp
+REPLACE_INTERPRETER+=		parrot-nqp
+REPLACE.parrot-nqp.old=		.*parrot-nqp[^[:space:]]*
+REPLACE.parrot-nqp.new=		${PREFIX}/bin/parrot-nqp
+REPLACE_FILES.parrot-nqp+=	compilers/data_json/JSON.nqp
 
 REPLACE_INTERPRETER+=	nqp
 REPLACE.nqp.old=	.*nqp[^[:space:]]*
@@ -80,9 +85,10 @@ CHECK_WRKREF_SKIP+=	bin/parrot_nci_thunk
 CHECK_WRKREF_SKIP+=	bin/pbc_merge
 CHECK_WRKREF_SKIP+=	bin/pbc_to_exe
 CHECK_WRKREF_SKIP+=	bin/winxed
-CHECK_WRKREF_SKIP+=	lib/parrot/${VERSION}/include/config.fpmc
-CHECK_WRKREF_SKIP+=	lib/parrot/${VERSION}/parrot_config.o
-CHECK_WRKREF_SKIP+=	lib/parrot/${VERSION}/tools/lib/Parrot/Config/Generated.pm
+CHECK_WRKREF_SKIP+=	lib/parrot/${PARROT_VERSION}/include/config.fpmc
+CHECK_WRKREF_SKIP+=	lib/parrot/${PARROT_VERSION}/parrot_config.o
+CHECK_WRKREF_SKIP+=	lib/parrot/${PARROT_VERSION}/tools/lib/Parrot/Config/Generated.pm
+CHECK_WRKREF_SKIP+=	src/parrot/${PARROT_VERSION}/config_lib.pir
 
 # Does relink internally, so allow local rpath entries
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${WRKSRC}
@@ -90,7 +96,8 @@ BUILDLINK_PASSTHRU_RPATHDIRS+=	${WRKSRC}
 pre-install:
 	${CHMOD} -R g-w ${WRKSRC}
 
+.include "../../lang/parrot/version.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"