CVS commit: pkgsrc/lang/camlp5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb  1 08:40:04 UTC 2025

Modified Files:
        pkgsrc/lang/camlp5: Makefile PLIST distinfo

Log Message:
camlp5: update to 8.03.01.

Camlp5 Version 8.03.01:
--------------------

* [01 Oct 2024] update for Ocaml 5.3.0

  * also merged minimal support for Windows (thank you @tobil4sk !)

Camlp5 Version 8.03.00:
--------------------

* [25 Apr 2024] update for Ocaml 5.2.0

  Only really salient change (other than supporting new ocaml syntax)
  is that the former Camlp5 revised-syntax "raw-identifier" syntax is
  now removed in favor of the new Ocaml 5.2.0 raw-identifier syntax.
  This should affect almost literally nobody, but just in case, the
  old syntax was (e.g.) "\begin" and the new 5.2.0 syntax is "\#begin".

  I highly doubt that anybody used the old syntax, since it was
  undocumented and only available in revised mode, but hey, just in
  case, letting you know I removed it.

  BUT BUT BUT NOTE WELL this has impact on packages that use camlp5
  internals, b/c some of the internal interfaces have changed.  Specifically:

  (1) if you use "camlp5 pa_r.cmo .... pr_o.cmo" to invoke the preprocessor
  rather than

  "not-ocamlfind preprocess -syntax camlp5r -package camlp5.pa_r,....,camlp5.pr_o"

  you will need to add "o_keywords.cmo" before "pr_o.cmo" (this is
  required by the need to print keywords for each syntax as escaped
  raw identifiers.  Since each syntax has a slightly different set of
  keywords, the printer needs to be parameterized by the
  keyword-table.

  NOTE WELL that you are supplying the same "-syntax" and "-package"
  args that you would if you were using

  "ocamlfind ocamlc ....."

  Basically, you take that second line and remove the ocamlc-specific
  args (like -linkpkg, -linkall, -for-pkg, -c, etc).

  (2) Similarly, if you use the Camlp5 lexer in your package, there is
  a new field, "kwds", which is initialized to the keyword hashtable,
  viz.

    let kwd_table = Hashtbl.create 301 in
    let glex =
    {Plexing.tok_func = func ctx kwd_table glexr;
     tok_using = using_token ctx kwd_table;
     tok_removing = removing_token kwd_table;
     tok_match = tok_match; tok_text = text; tok_comm = None ; kwds = kwd_table }

  note the "kwds = kwd_table".

Camlp5 Version 8.02.01:
--------------------

* [04 Sep 2023] switch test code from pcre to pcre2
* [01 Sep 2023] switch from pcre to ocaml-re, add readthedocs config-file

Camlp5 Version 8.02.00:
--------------------

* [22 Jul 2023] update for OCaml 5.1.0

Camlp5 Version 8.00.06:
--------------------

* [31 Mar 2023] bugfixes, most notably improvements in quasi-quotation support

  * switch to camlp5-buildscripts (away from Perl scripts)

  * change install procedure for grammars so that installing more than
    one grammar will cause an error

  * minor parsing errors in official OCaml grammar (pa_o)

  * continue factoring apart q_ast.ml and q_ast_base.ml so only the latter is needed for
    quotations over other AST types.

Camlp5 Version 8.00.05:
--------------------

* [07 Feb 2023] switch from perl buildscripts to camlp5-buildscripts

Camlp5 Version 8.00.04:
--------------------

* [02 Dec 2022] (exceedingly modest) updates to support OCaml 5.0.0~beta2:
  basically just changes to Makefile and opam


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/camlp5/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/camlp5/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/camlp5/distinfo

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

Modified files:

Index: pkgsrc/lang/camlp5/Makefile
diff -u pkgsrc/lang/camlp5/Makefile:1.45 pkgsrc/lang/camlp5/Makefile:1.46
--- pkgsrc/lang/camlp5/Makefile:1.45    Sat Feb  1 08:34:46 2025
+++ pkgsrc/lang/camlp5/Makefile Sat Feb  1 08:40:04 2025
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.45 2025/02/01 08:34:46 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2025/02/01 08:40:04 wiz Exp $
 
-GITHUB_PROJECT=        camlp5
-DISTNAME=      ${GITHUB_PROJECT}-8.00.03
+DISTNAME=      camlp5-8.03.01
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=camlp5/}
-GITHUB_TAG=    rel${PKGVERSION_NOREV}
-PKGREVISION=   1
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    tonio%NetBSD.org@localhost
 HOMEPAGE=      https://camlp5.github.io/
 COMMENT=       Preprocessor-pretty-printer for ocaml
 LICENSE=       modified-bsd
 
+DEPENDS+=      ocaml-bos-[0-9]*:../../devel/ocaml-bos
+DEPENDS+=      ocaml-re-[0-9]*:../../devel/ocaml-re
+DEPENDS+=      ocaml-rresult-[0-9]*:../../devel/ocaml-rresult
+
 HAS_CONFIGURE= yes
-USE_LANGUAGES= c # needed for optimised compiler
+USE_LANGUAGES= c # needed for optimized 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

Index: pkgsrc/lang/camlp5/PLIST
diff -u pkgsrc/lang/camlp5/PLIST:1.12 pkgsrc/lang/camlp5/PLIST:1.13
--- pkgsrc/lang/camlp5/PLIST:1.12       Fri Nov 11 10:33:00 2022
+++ pkgsrc/lang/camlp5/PLIST    Sat Feb  1 08:40:04 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2022/11/11 10:33:00 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/02/01 08:40:04 wiz Exp $
 bin/camlp5
 bin/camlp5o
 bin/camlp5o.opt
@@ -52,6 +52,9 @@ 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/o_keywords.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/o_keywords.cmx
+lib/ocaml/camlp5/o_keywords.o
 lib/ocaml/camlp5/ocpp.cmo
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.a
 lib/ocaml/camlp5/odyl.cma
@@ -227,6 +230,9 @@ 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/r_keywords.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/r_keywords.cmx
+lib/ocaml/camlp5/r_keywords.o
 lib/ocaml/camlp5/reloc.cmi
 ${PLIST.ocaml-opt}lib/ocaml/camlp5/reloc.cmx
 lib/ocaml/camlp5/reloc.mli

Index: pkgsrc/lang/camlp5/distinfo
diff -u pkgsrc/lang/camlp5/distinfo:1.26 pkgsrc/lang/camlp5/distinfo:1.27
--- pkgsrc/lang/camlp5/distinfo:1.26    Fri Nov 11 10:33:00 2022
+++ pkgsrc/lang/camlp5/distinfo Sat Feb  1 08:40:04 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2022/11/11 10:33:00 jaapb Exp $
+$NetBSD: distinfo,v 1.27 2025/02/01 08:40:04 wiz Exp $
 
-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
+BLAKE2s (camlp5-8.03.01.tar.gz) = 64d156a11e9a5abff613949b3483b3cd0a2b022208488bdc957cdcc02b8a8742
+SHA512 (camlp5-8.03.01.tar.gz) = 144ab15e18673fa485d08cf37c6ba69146db7db4be9e7031e202e0747d922e223396b83881b1d65cf27bedb2115d91e5eb62b5a22e2d57dda838013ebd398ff2
+Size (camlp5-8.03.01.tar.gz) = 1308092 bytes