Updated textproc/camlp5 to the latest version, 8.00.03.

This includes several changes, including breaking ones; for full details,
see the changelog in the distribution.

This release adds support for the newest OCaml versions up to 4.14.0.

4 files changed, 88 insertions, 64 deletions

diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
index 86d2454fe6f..abbc5915455 100644
--- a/lang/camlp5/Makefile
+++ b/lang/camlp5/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.42 2022/06/03 08:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2022/11/11 10:33:00 jaapb Exp $
 
 GITHUB_PROJECT=	camlp5
-DISTNAME=	${GITHUB_PROJECT}-7.13
-PKGREVISION=	2
+DISTNAME=	${GITHUB_PROJECT}-8.00.03
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=camlp5/}
-GITHUB_TAG=	rel${PKGVERSION_NOREV:S/.//}
+GITHUB_TAG=	rel${PKGVERSION_NOREV}
 
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	https://camlp5.github.io/
 COMMENT=	Preprocessor-pretty-printer for ocaml
 LICENSE=	modified-bsd
 
-# https://github.com/camlp5/camlp5/issues/92
-BROKEN=		"does not support ocaml 4.14"
-
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c # needed for optimised compiler
+USE_TOOLS+=	perl gmake
 MAKE_JOBS_SAFE=	no
 
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+
 CONFIGURE_ARGS+=	--bindir ${PREFIX}/bin
 CONFIGURE_ARGS+=	--mandir ${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--libdir ${PREFIX}/lib/ocaml
@@ -36,14 +35,9 @@ BUILD_TARGET=	world.opt
 BUILD_TARGET=	world
 .endif
 
-# compensate for upstream not having heard of 4.11.2 yet
-# (should be able to remove this at the next update)
-post-extract:
-	cd ${WRKSRC}/ocaml_stuff && ln -s 4.11.1 4.11.2
-	cd ${WRKSRC}/ocaml_src/lib/versdep && ln -s 4.11.1.ml 4.11.2.ml
-
 post-install:
 	cd ${WRKSRC}/etc && \
 	${INSTALL_DATA} META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlp5
 
+.include "../../devel/camlp-streams/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/camlp5/PLIST b/lang/camlp5/PLIST
index 1aa6daef161..1e40c94f049 100644
--- a/lang/camlp5/PLIST
+++ b/lang/camlp5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2020/02/07 13:44:12 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.12 2022/11/11 10:33:00 jaapb Exp $
 bin/camlp5
 bin/camlp5o
 bin/camlp5o.opt
@@ -10,11 +10,16 @@ bin/mkcamlp5.opt
 bin/ocpp5
 lib/ocaml/camlp5/META
 lib/ocaml/camlp5/ast2pt.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/ast2pt.cmx
 lib/ocaml/camlp5/ast2pt.mli
+lib/ocaml/camlp5/asttools.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/asttools.cmx
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.a
 lib/ocaml/camlp5/camlp5.cma
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.cmxa
 lib/ocaml/camlp5/camlp5_top.cma
+lib/ocaml/camlp5/camlp5_top_funs.cmi
+lib/ocaml/camlp5/camlp5_top_funs.cmo
 lib/ocaml/camlp5/camlp5o.cma
 lib/ocaml/camlp5/camlp5r.cma
 lib/ocaml/camlp5/camlp5sch.cma
@@ -45,91 +50,100 @@ lib/ocaml/camlp5/grammar.mli
 lib/ocaml/camlp5/lib.sml
 lib/ocaml/camlp5/mLast.cmi
 lib/ocaml/camlp5/mLast.mli
+lib/ocaml/camlp5/mlsyntax.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/mlsyntax.cmx
 lib/ocaml/camlp5/ocpp.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.a
 lib/ocaml/camlp5/odyl.cma
 lib/ocaml/camlp5/odyl.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmx
-lib/ocaml/camlp5/odyl.cmxa
-${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.o
+${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmxa
+lib/ocaml/camlp5/odyl.o
 lib/ocaml/camlp5/pa_extend.cmi
 lib/ocaml/camlp5/pa_extend.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend.o
+lib/ocaml/camlp5/pa_extend.o
 lib/ocaml/camlp5/pa_extend_m.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend_m.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend_m.o
+lib/ocaml/camlp5/pa_extend_m.o
 lib/ocaml/camlp5/pa_extfold.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfold.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfold.o
+lib/ocaml/camlp5/pa_extfold.o
 lib/ocaml/camlp5/pa_extfun.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfun.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfun.o
+lib/ocaml/camlp5/pa_extfun.o
 lib/ocaml/camlp5/pa_extprint.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extprint.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extprint.o
+lib/ocaml/camlp5/pa_extprint.o
 lib/ocaml/camlp5/pa_fstream.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_fstream.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_fstream.o
+lib/ocaml/camlp5/pa_fstream.o
 lib/ocaml/camlp5/pa_lefteval.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lefteval.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lefteval.o
+lib/ocaml/camlp5/pa_lefteval.o
 lib/ocaml/camlp5/pa_lexer.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lexer.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lexer.o
+lib/ocaml/camlp5/pa_lexer.o
 lib/ocaml/camlp5/pa_lisp.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lisp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lisp.o
+lib/ocaml/camlp5/pa_lisp.o
 lib/ocaml/camlp5/pa_macro.cmi
 lib/ocaml/camlp5/pa_macro.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro.o
+lib/ocaml/camlp5/pa_macro.o
 lib/ocaml/camlp5/pa_macro_gram.cmi
 lib/ocaml/camlp5/pa_macro_gram.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro_gram.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro_gram.o
+lib/ocaml/camlp5/pa_macro_gram.o
 lib/ocaml/camlp5/pa_macro_print.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro_print.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro_print.o
+lib/ocaml/camlp5/pa_macro_print.o
 lib/ocaml/camlp5/pa_mkast.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mkast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mkast.o
+lib/ocaml/camlp5/pa_mkast.o
 lib/ocaml/camlp5/pa_mktest.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mktest.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mktest.o
+lib/ocaml/camlp5/pa_mktest.o
 lib/ocaml/camlp5/pa_o.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o.o
+lib/ocaml/camlp5/pa_o.o
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o_fast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o_fast.o
+lib/ocaml/camlp5/pa_o_fast.o
 lib/ocaml/camlp5/pa_oop.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_oop.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_oop.o
+lib/ocaml/camlp5/pa_oop.o
 lib/ocaml/camlp5/pa_op.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_op.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_op.o
+lib/ocaml/camlp5/pa_op.o
 lib/ocaml/camlp5/pa_pprintf.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pprintf.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pprintf.o
+lib/ocaml/camlp5/pa_pprintf.o
 lib/ocaml/camlp5/pa_pragma.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pragma.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pragma.o
+lib/ocaml/camlp5/pa_pragma.o
 lib/ocaml/camlp5/pa_r.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_r.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_r.o
+lib/ocaml/camlp5/pa_r.o
 lib/ocaml/camlp5/pa_reloc.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_reloc.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_reloc.o
+lib/ocaml/camlp5/pa_reloc.o
 lib/ocaml/camlp5/pa_rp.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_rp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_rp.o
+lib/ocaml/camlp5/pa_rp.o
 lib/ocaml/camlp5/pa_scheme.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_scheme.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_scheme.o
+lib/ocaml/camlp5/pa_scheme.o
+lib/ocaml/camlp5/pa_schemer.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_schemer.cmx
+lib/ocaml/camlp5/pa_schemer.o
 lib/ocaml/camlp5/pa_sml.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_sml.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_sml.o
+lib/ocaml/camlp5/pa_sml.o
+lib/ocaml/camlp5/papr_phony_macro.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/papr_phony_macro.cmx
+lib/ocaml/camlp5/papr_phony_macro.o
 lib/ocaml/camlp5/pcaml.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pcaml.cmx
 lib/ocaml/camlp5/pcaml.mli
 lib/ocaml/camlp5/plexer.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/plexer.cmx
@@ -140,65 +154,81 @@ lib/ocaml/camlp5/plexing.mli
 lib/ocaml/camlp5/ploc.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/ploc.cmx
 lib/ocaml/camlp5/ploc.mli
+lib/ocaml/camlp5/pp_debug.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pp_debug.cmx
 lib/ocaml/camlp5/pprintf.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pprintf.cmx
 lib/ocaml/camlp5/pprintf.mli
 lib/ocaml/camlp5/pr_depend.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_depend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_depend.o
+lib/ocaml/camlp5/pr_depend.o
 lib/ocaml/camlp5/pr_dump.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_dump.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_dump.o
+lib/ocaml/camlp5/pr_dump.o
 lib/ocaml/camlp5/pr_extend.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extend.o
+lib/ocaml/camlp5/pr_extend.o
 lib/ocaml/camlp5/pr_extfun.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extfun.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extfun.o
+lib/ocaml/camlp5/pr_extfun.o
 lib/ocaml/camlp5/pr_extprint.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extprint.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extprint.o
+lib/ocaml/camlp5/pr_extprint.o
 lib/ocaml/camlp5/pr_null.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_null.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_null.o
+lib/ocaml/camlp5/pr_null.o
+lib/ocaml/camlp5/pr_o.cmi
 lib/ocaml/camlp5/pr_o.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_o.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_o.o
+lib/ocaml/camlp5/pr_o.o
+lib/ocaml/camlp5/pr_official.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_official.cmx
+lib/ocaml/camlp5/pr_official.o
 lib/ocaml/camlp5/pr_op.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_op.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_op.o
+lib/ocaml/camlp5/pr_op.o
+lib/ocaml/camlp5/pr_r.cmi
 lib/ocaml/camlp5/pr_r.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_r.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_r.o
+lib/ocaml/camlp5/pr_r.o
 lib/ocaml/camlp5/pr_ro.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_ro.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_ro.o
+lib/ocaml/camlp5/pr_ro.o
 lib/ocaml/camlp5/pr_rp.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_rp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_rp.o
+lib/ocaml/camlp5/pr_rp.o
 lib/ocaml/camlp5/pr_scheme.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_scheme.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_scheme.o
+lib/ocaml/camlp5/pr_scheme.o
 lib/ocaml/camlp5/pr_schemep.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_schemep.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_schemep.o
+lib/ocaml/camlp5/pr_schemep.o
 lib/ocaml/camlp5/pretty.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/pretty.cmx
 lib/ocaml/camlp5/pretty.mli
 lib/ocaml/camlp5/prtools.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/prtools.cmx
 lib/ocaml/camlp5/prtools.mli
+lib/ocaml/camlp5/q_MLast.cmi
 lib/ocaml/camlp5/q_MLast.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/q_MLast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_MLast.o
+lib/ocaml/camlp5/q_MLast.o
+lib/ocaml/camlp5/q_ast.cmi
 lib/ocaml/camlp5/q_ast.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast.o
+lib/ocaml/camlp5/q_ast.o
+lib/ocaml/camlp5/q_ast_base.cmi
+lib/ocaml/camlp5/q_ast_base.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast_base.cmx
+lib/ocaml/camlp5/q_ast_base.o
 lib/ocaml/camlp5/q_phony.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/q_phony.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_phony.o
+lib/ocaml/camlp5/q_phony.o
 lib/ocaml/camlp5/quotation.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/quotation.cmx
 lib/ocaml/camlp5/quotation.mli
 lib/ocaml/camlp5/reloc.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/reloc.cmx
 lib/ocaml/camlp5/reloc.mli
 lib/ocaml/camlp5/stdpp.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/stdpp.cmx
diff --git a/lang/camlp5/buildlink3.mk b/lang/camlp5/buildlink3.mk
index 7b2f500d124..1df9031e607 100644
--- a/lang/camlp5/buildlink3.mk
+++ b/lang/camlp5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2022/05/24 18:51:53 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2022/11/11 10:33:00 jaapb Exp $
 #
 
 BUILDLINK_TREE+=	camlp5
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	camlp5
 .if !defined(CAMLP5_BUILDLINK3_MK)
 CAMLP5_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.camlp5+=	camlp5>=7.00
-BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=7.13nb2
+BUILDLINK_API_DEPENDS.camlp5+=	camlp5>=8.00
+BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=8.00.03
 BUILDLINK_PKGSRCDIR.camlp5?=	../../lang/camlp5
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/lang/camlp5/distinfo b/lang/camlp5/distinfo
index 689f3a9d51c..abbc2364568 100644
--- a/lang/camlp5/distinfo
+++ b/lang/camlp5/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 10:51:31 nia Exp $
+$NetBSD: distinfo,v 1.26 2022/11/11 10:33:00 jaapb Exp $
 
-BLAKE2s (camlp5-7.13.tar.gz) = c10a51c1a96b104552f8cd5c3ad08937c496b24022304bc0bebbbf510a0cd8c3
-SHA512 (camlp5-7.13.tar.gz) = 8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
-Size (camlp5-7.13.tar.gz) = 1031832 bytes
+BLAKE2s (camlp5-8.00.03.tar.gz) = 8e2c4261ecc4a7eb931ca53028c936109155ce496acbd7fc0c7baa346f3ce5b1
+SHA512 (camlp5-8.00.03.tar.gz) = a6259d2d491ed1f967dd383f03d3da65a3f383d28340111f57883c6d56cee2d267c0f752ba98bcdb72c24cf724a606718de26b6c55b84ad9b5f8f6d620f3cba1
+Size (camlp5-8.00.03.tar.gz) = 1217877 bytes