pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: jaapb
Date: Tue May 24 18:51:57 UTC 2022
Modified Files:
pkgsrc/converters/bibtex2html: Makefile
pkgsrc/databases/geneweb: Makefile
pkgsrc/databases/ocaml-macaque: Makefile buildlink3.mk
pkgsrc/devel/coccinelle: Makefile
pkgsrc/devel/frama-c: Makefile
pkgsrc/devel/menhir: buildlink3.mk
pkgsrc/devel/monotone-viz: Makefile
pkgsrc/devel/ocaml-batteries: Makefile
pkgsrc/devel/ocaml-biniou: Makefile
pkgsrc/devel/ocaml-bos: Makefile
pkgsrc/devel/ocaml-core_unix: Makefile
pkgsrc/devel/ocaml-cppo: Makefile buildlink3.mk
pkgsrc/devel/ocaml-csexp: Makefile buildlink3.mk
pkgsrc/devel/ocaml-deriving-ocsigen: Makefile
pkgsrc/devel/ocaml-digestif: Makefile
pkgsrc/devel/ocaml-duff: Makefile
pkgsrc/devel/ocaml-dune: Makefile buildlink3.mk
pkgsrc/devel/ocaml-dune-configurator: Makefile buildlink3.mk
pkgsrc/devel/ocaml-encore: Makefile
pkgsrc/devel/ocaml-eqaf: Makefile
pkgsrc/devel/ocaml-extlib: Makefile
pkgsrc/devel/ocaml-findlib: Makefile PLIST buildlink3.mk
pkgsrc/devel/ocaml-fpath: Makefile
pkgsrc/devel/ocaml-git: Makefile
pkgsrc/devel/ocaml-js-build-tools: Makefile
pkgsrc/devel/ocaml-ke: Makefile
pkgsrc/devel/ocaml-logs: Makefile
pkgsrc/devel/ocaml-lru: Makefile
pkgsrc/devel/ocaml-lwt_camlp4: Makefile
pkgsrc/devel/ocaml-lwt_glib: Makefile
pkgsrc/devel/ocaml-lwt_log: Makefile
pkgsrc/devel/ocaml-lwt_ssl: Makefile buildlink3.mk
pkgsrc/devel/ocaml-oasis: Makefile buildlink3.mk
pkgsrc/devel/ocaml-optcomp: Makefile
pkgsrc/devel/ocaml-ppx_derivers: Makefile buildlink3.mk
pkgsrc/devel/ocaml-ppx_fields_conv: Makefile buildlink3.mk
pkgsrc/devel/ocaml-ppx_tools_versioned: Makefile
pkgsrc/devel/ocaml-ppxfind: Makefile
pkgsrc/devel/ocaml-psq: Makefile
pkgsrc/devel/ocaml-resource-pooling: Makefile buildlink3.mk
pkgsrc/devel/ocaml-result: Makefile buildlink3.mk
pkgsrc/devel/ocaml-stringext: Makefile buildlink3.mk
pkgsrc/devel/ocaml-type_conv: Makefile buildlink3.mk
pkgsrc/devel/ocaml-yojson: Makefile
pkgsrc/devel/ocamlbuild: Makefile buildlink3.mk
pkgsrc/devel/ocamlgraph: Makefile
pkgsrc/devel/ocamlify: Makefile
pkgsrc/devel/ocamlmod: Makefile
pkgsrc/devel/omake: Makefile
pkgsrc/devel/verifast: Makefile
pkgsrc/graphics/camlimages: Makefile
pkgsrc/graphics/graphviz: Makefile
pkgsrc/graphics/ocaml-cairo: Makefile
pkgsrc/lang/boomerang: Makefile
pkgsrc/lang/camlp4: Makefile
pkgsrc/lang/camlp5: Makefile buildlink3.mk
pkgsrc/lang/pict: Makefile
pkgsrc/math/ocaml-num: Makefile
pkgsrc/math/ocaml-zarith: Makefile
pkgsrc/math/z3: Makefile
pkgsrc/misc/dose3: Makefile
pkgsrc/misc/ocaml-cudf: Makefile
pkgsrc/misc/ocaml-opaline: Makefile buildlink3.mk
pkgsrc/misc/ocaml-opam: Makefile
pkgsrc/misc/ocaml-topkg: Makefile buildlink3.mk
pkgsrc/mk: ocaml.mk
pkgsrc/net/mldonkey: Makefile
pkgsrc/net/mldonkey-gui: Makefile
pkgsrc/net/unison: Makefile
pkgsrc/print/advi: Makefile
pkgsrc/security/ocaml-safepass: Makefile
pkgsrc/security/sks: Makefile
pkgsrc/sysutils/hivex: Makefile
pkgsrc/textproc/harmony: Makefile
pkgsrc/textproc/hevea: Makefile
pkgsrc/textproc/ocaml-easy-format: Makefile
pkgsrc/textproc/ocaml-expat: Makefile
pkgsrc/textproc/ocaml-jsonm: Makefile buildlink3.mk
pkgsrc/textproc/ocaml-text: Makefile
pkgsrc/textproc/ocaml-uchar: Makefile buildlink3.mk
pkgsrc/textproc/ocaml-xml-light: Makefile buildlink3.mk
pkgsrc/textproc/pxp: Makefile
pkgsrc/textproc/py-pybtex-docutils: Makefile
pkgsrc/time/ocaml-calendar: Makefile
pkgsrc/time/ocaml-mtime: Makefile
pkgsrc/time/wyrd: Makefile
pkgsrc/www/ocaml-curl: Makefile
pkgsrc/www/ocaml-http: Makefile
pkgsrc/www/ocsigen-i18n: Makefile
pkgsrc/www/ocsigen-start: Makefile
pkgsrc/www/ocsigen-toolkit: Makefile
pkgsrc/www/swiftsurf: Makefile
pkgsrc/x11/labltk: Makefile
pkgsrc/x11/ocaml-graphics: Makefile buildlink3.mk
pkgsrc/x11/ocaml-lablgtk: Makefile
pkgsrc/x11/ocaml-lablgtk3: Makefile
Log Message:
Recursive revbump associated with update of ocaml.
Also change of mk/ocaml.mk to lang/ocaml/ocaml.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/converters/bibtex2html/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/databases/geneweb/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/ocaml-macaque/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/ocaml-macaque/buildlink3.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/coccinelle/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/devel/frama-c/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/menhir/buildlink3.mk
cvs rdiff -u -r1.120 -r1.121 pkgsrc/devel/monotone-viz/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ocaml-batteries/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-biniou/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-bos/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-core_unix/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/ocaml-cppo/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-cppo/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-csexp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-csexp/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ocaml-deriving-ocsigen/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-digestif/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-duff/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-dune/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-dune/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-dune-configurator/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-encore/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-eqaf/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-extlib/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/ocaml-findlib/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-findlib/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-findlib/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-fpath/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-git/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-js-build-tools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-ke/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-logs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-lru/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-lwt_camlp4/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ocaml-lwt_glib/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-lwt_log/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ocaml-lwt_ssl/Makefile \
pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-oasis/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-oasis/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-optcomp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-ppx_derivers/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_fields_conv/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppxfind/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-psq/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-resource-pooling/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-result/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-result/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-stringext/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-stringext/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-type_conv/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ocaml-type_conv/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-yojson/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocamlbuild/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocamlbuild/buildlink3.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/ocamlgraph/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocamlify/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocamlmod/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/omake/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/verifast/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/graphics/camlimages/Makefile
cvs rdiff -u -r1.247 -r1.248 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/ocaml-cairo/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/boomerang/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/camlp4/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/camlp5/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/camlp5/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/pict/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/ocaml-num/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/math/ocaml-zarith/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/z3/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/dose3/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/misc/ocaml-cudf/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/ocaml-opaline/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/ocaml-opaline/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/misc/ocaml-opam/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/ocaml-topkg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/ocaml-topkg/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mk/ocaml.mk
cvs rdiff -u -r1.102 -r1.103 pkgsrc/net/mldonkey/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/net/mldonkey-gui/Makefile
cvs rdiff -u -r1.140 -r1.141 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/print/advi/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/ocaml-safepass/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/sks/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/hivex/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/harmony/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/hevea/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/ocaml-easy-format/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/ocaml-expat/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/ocaml-jsonm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-jsonm/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/textproc/ocaml-text/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/ocaml-uchar/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-uchar/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/ocaml-xml-light/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ocaml-xml-light/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/pxp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-pybtex-docutils/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/time/ocaml-calendar/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/ocaml-mtime/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/time/wyrd/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/ocaml-curl/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/ocaml-http/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ocsigen-i18n/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/ocsigen-start/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ocsigen-toolkit/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/swiftsurf/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/labltk/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/ocaml-graphics/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/ocaml-graphics/buildlink3.mk
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/ocaml-lablgtk/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/ocaml-lablgtk3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/converters/bibtex2html/Makefile
diff -u pkgsrc/converters/bibtex2html/Makefile:1.57 pkgsrc/converters/bibtex2html/Makefile:1.58
--- pkgsrc/converters/bibtex2html/Makefile:1.57 Mon May 24 19:49:19 2021
+++ pkgsrc/converters/bibtex2html/Makefile Tue May 24 18:51:47 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2021/05/24 19:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2022/05/24 18:51:47 jaapb Exp $
DISTNAME= bibtex2html-1.98
-PKGREVISION= 17
+PKGREVISION= 18
CATEGORIES= converters
MASTER_SITES= http://www.lri.fr/~filliatr/ftp/bibtex2html/
Index: pkgsrc/databases/geneweb/Makefile
diff -u pkgsrc/databases/geneweb/Makefile:1.56 pkgsrc/databases/geneweb/Makefile:1.57
--- pkgsrc/databases/geneweb/Makefile:1.56 Wed Apr 21 08:44:31 2021
+++ pkgsrc/databases/geneweb/Makefile Tue May 24 18:51:47 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2021/04/21 08:44:31 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2022/05/24 18:51:47 jaapb Exp $
DISTNAME= geneweb-5.01
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= databases
EXTRACT_SUFX= .tgz
MASTER_SITES+= http://www.sartorelli.gen.nz/GeneWeb/Src/
Index: pkgsrc/databases/ocaml-macaque/Makefile
diff -u pkgsrc/databases/ocaml-macaque/Makefile:1.5 pkgsrc/databases/ocaml-macaque/Makefile:1.6
--- pkgsrc/databases/ocaml-macaque/Makefile:1.5 Mon Mar 8 08:12:46 2021
+++ pkgsrc/databases/ocaml-macaque/Makefile Tue May 24 18:51:47 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:47 jaapb Exp $
GITHUB_PROJECT= macaque
DISTNAME= ${GITHUB_PROJECT}-0.7.4
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -19,5 +19,5 @@ OCAML_USE_OASIS_DYNRUN= yes
.include "../../databases/pgocaml/buildlink3.mk"
.include "../../lang/camlp4/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/ocaml-macaque/buildlink3.mk
diff -u pkgsrc/databases/ocaml-macaque/buildlink3.mk:1.2 pkgsrc/databases/ocaml-macaque/buildlink3.mk:1.3
--- pkgsrc/databases/ocaml-macaque/buildlink3.mk:1.2 Thu Jul 19 15:15:21 2018
+++ pkgsrc/databases/ocaml-macaque/buildlink3.mk Tue May 24 18:51:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/07/19 15:15:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:47 jaapb Exp $
BUILDLINK_TREE+= ocaml-macaque
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-macaque
OCAML_MACAQUE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-macaque+= ocaml-macaque>=0.7.4
-BUILDLINK_ABI_DEPENDS.ocaml-macaque+= ocaml-macaque>=0.7.4nb1
+BUILDLINK_ABI_DEPENDS.ocaml-macaque+= ocaml-macaque>=0.7.4nb4
BUILDLINK_PKGSRCDIR.ocaml-macaque?= ../../databases/ocaml-macaque
.include "../../databases/pgocaml/buildlink3.mk"
Index: pkgsrc/devel/coccinelle/Makefile
diff -u pkgsrc/devel/coccinelle/Makefile:1.39 pkgsrc/devel/coccinelle/Makefile:1.40
--- pkgsrc/devel/coccinelle/Makefile:1.39 Mon Mar 8 08:12:47 2021
+++ pkgsrc/devel/coccinelle/Makefile Tue May 24 18:51:47 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2021/03/08 08:12:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:47 jaapb Exp $
DISTNAME= coccinelle-1.0.0-rc17
PKGNAME= ${DISTNAME:S/-rc/rc/}
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= devel
MASTER_SITES= http://coccinelle.lip6.fr/distrib/
EXTRACT_SUFX= .tgz
Index: pkgsrc/devel/frama-c/Makefile
diff -u pkgsrc/devel/frama-c/Makefile:1.102 pkgsrc/devel/frama-c/Makefile:1.103
--- pkgsrc/devel/frama-c/Makefile:1.102 Mon Apr 18 19:10:49 2022
+++ pkgsrc/devel/frama-c/Makefile Tue May 24 18:51:47 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2022/04/18 19:10:49 adam Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/24 18:51:47 jaapb Exp $
#
DISTNAME= frama-c-Phosphorus-20170501
PKGNAME= ${DISTNAME:S/-Phosphorus//}
-PKGREVISION= 34
+PKGREVISION= 35
CATEGORIES= devel
MASTER_SITES= https://frama-c.com/download/
@@ -25,5 +25,5 @@ OCAML_USE_FINDLIB= yes
.include "../../devel/ocamlgraph/buildlink3.mk"
.include "../../math/ocaml-zarith/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/menhir/buildlink3.mk
diff -u pkgsrc/devel/menhir/buildlink3.mk:1.2 pkgsrc/devel/menhir/buildlink3.mk:1.3
--- pkgsrc/devel/menhir/buildlink3.mk:1.2 Tue Jan 14 22:04:26 2020
+++ pkgsrc/devel/menhir/buildlink3.mk Tue May 24 18:51:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/14 22:04:26 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:47 jaapb Exp $
BUILDLINK_TREE+= menhir
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= menhir
MENHIR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.menhir+= menhir>=20190626
-BUILDLINK_ABI_DEPENDS.menhir+= menhir>=20190924
+BUILDLINK_ABI_DEPENDS.menhir+= menhir>=20220210
BUILDLINK_PKGSRCDIR.menhir?= ../../devel/menhir
.endif # MENHIR_BUILDLINK3_MK
Index: pkgsrc/devel/monotone-viz/Makefile
diff -u pkgsrc/devel/monotone-viz/Makefile:1.120 pkgsrc/devel/monotone-viz/Makefile:1.121
--- pkgsrc/devel/monotone-viz/Makefile:1.120 Mon Apr 18 19:10:53 2022
+++ pkgsrc/devel/monotone-viz/Makefile Tue May 24 18:51:47 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.120 2022/04/18 19:10:53 adam Exp $
+# $NetBSD: Makefile,v 1.121 2022/05/24 18:51:47 jaapb Exp $
#
DISTNAME= monotone-viz-1.0.2-nolablgtk
PKGNAME= ${DISTNAME:S/-nolablgtk//}
-PKGREVISION= 47
+PKGREVISION= 48
CATEGORIES= devel scm
#MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/
Index: pkgsrc/devel/ocaml-batteries/Makefile
diff -u pkgsrc/devel/ocaml-batteries/Makefile:1.21 pkgsrc/devel/ocaml-batteries/Makefile:1.22
--- pkgsrc/devel/ocaml-batteries/Makefile:1.21 Mon Mar 8 08:12:49 2021
+++ pkgsrc/devel/ocaml-batteries/Makefile Tue May 24 18:51:47 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:47 jaapb Exp $
VERSION= 2.11.0
GITHUB_PROJECT= batteries-included
GITHUB_TAG= v${VERSION}
DISTNAME= batteries-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-batteries-team/}
@@ -19,7 +19,7 @@ OCAML_USE_FINDLIB= yes
MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../lang/ocaml/buildlink3.mk"
.include "../../math/ocaml-num/buildlink3.mk"
Index: pkgsrc/devel/ocaml-biniou/Makefile
diff -u pkgsrc/devel/ocaml-biniou/Makefile:1.15 pkgsrc/devel/ocaml-biniou/Makefile:1.16
--- pkgsrc/devel/ocaml-biniou/Makefile:1.15 Mon Mar 8 08:12:49 2021
+++ pkgsrc/devel/ocaml-biniou/Makefile Tue May 24 18:51:47 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:47 jaapb Exp $
GITHUB_PROJECT= biniou
DISTNAME= ${GITHUB_PROJECT}-1.2.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-community/}
@@ -15,6 +15,6 @@ LICENSE= modified-bsd
OCAML_USE_DUNE= yes
INSTALLATION_DIRS+= bin
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../textproc/ocaml-easy-format/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-bos/Makefile
diff -u pkgsrc/devel/ocaml-bos/Makefile:1.3 pkgsrc/devel/ocaml-bos/Makefile:1.4
--- pkgsrc/devel/ocaml-bos/Makefile:1.3 Mon Mar 8 08:12:49 2021
+++ pkgsrc/devel/ocaml-bos/Makefile Tue May 24 18:51:48 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
DISTNAME= bos-0.2.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://erratique.ch/software/bos/releases/
EXTRACT_SUFX= .tbz
@@ -18,7 +18,7 @@ INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/
OCAML_USE_TOPKG= yes
OCAML_USE_OPAM= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../devel/ocaml-astring/buildlink3.mk"
.include "../../devel/ocaml-fmt/buildlink3.mk"
Index: pkgsrc/devel/ocaml-core_unix/Makefile
diff -u pkgsrc/devel/ocaml-core_unix/Makefile:1.2 pkgsrc/devel/ocaml-core_unix/Makefile:1.3
--- pkgsrc/devel/ocaml-core_unix/Makefile:1.2 Tue May 24 17:39:15 2022
+++ pkgsrc/devel/ocaml-core_unix/Makefile Tue May 24 18:51:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/05/24 17:39:15 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:48 jaapb Exp $
DISTNAME= ${GITHUB_PROJECT}-0.15.0
PKGNAME= ocaml-${DISTNAME}
@@ -37,7 +37,7 @@ do-install:
${OPAM_INSTALL_DIR}/$$i.install; \
done
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-core/buildlink3.mk"
.include "../../devel/ocaml-core_kernel/buildlink3.mk"
.include "../../devel/ocaml-expect_test_helpers_core/buildlink3.mk"
Index: pkgsrc/devel/ocaml-cppo/Makefile
diff -u pkgsrc/devel/ocaml-cppo/Makefile:1.28 pkgsrc/devel/ocaml-cppo/Makefile:1.29
--- pkgsrc/devel/ocaml-cppo/Makefile:1.28 Tue Nov 23 21:48:13 2021
+++ pkgsrc/devel/ocaml-cppo/Makefile Tue May 24 18:51:48 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2021/11/23 21:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:48 jaapb Exp $
DISTNAME= cppo-1.6.8
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-community/}
GITHUB_PROJECT= cppo
@@ -23,7 +24,7 @@ OCAML_FINDLIB_DIRS+= cppo_ocamlbuild
DUNE_BUILD_PACKAGES= cppo cppo_ocamlbuild
OPAM_INSTALL_FILES= cppo cppo_ocamlbuild
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
BUILDLINK_DEPMETHOD.ocamlbuild= full
Index: pkgsrc/devel/ocaml-cppo/buildlink3.mk
diff -u pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.9 pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.10
--- pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.9 Thu Jan 23 13:11:14 2020
+++ pkgsrc/devel/ocaml-cppo/buildlink3.mk Tue May 24 18:51:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/01/23 13:11:14 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/05/24 18:51:48 jaapb Exp $
BUILDLINK_TREE+= ocaml-cppo
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-cppo
OCAML_CPPO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.3.1
-BUILDLINK_ABI_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.6.6
+BUILDLINK_ABI_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.6.8nb1
BUILDLINK_PKGSRCDIR.ocaml-cppo?= ../../devel/ocaml-cppo
.endif # OCAML_CPPO_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-csexp/Makefile
diff -u pkgsrc/devel/ocaml-csexp/Makefile:1.3 pkgsrc/devel/ocaml-csexp/Makefile:1.4
--- pkgsrc/devel/ocaml-csexp/Makefile:1.3 Tue Mar 1 09:44:12 2022
+++ pkgsrc/devel/ocaml-csexp/Makefile Tue May 24 18:51:48 2022
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2022/03/01 09:44:12 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
GITHUB_PROJECT= csexp
DISTNAME= ${GITHUB_PROJECT}-1.5.1
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-dune/}
@@ -15,6 +16,6 @@ USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-result/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-csexp/buildlink3.mk
diff -u pkgsrc/devel/ocaml-csexp/buildlink3.mk:1.2 pkgsrc/devel/ocaml-csexp/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-csexp/buildlink3.mk:1.2 Tue Mar 1 09:44:12 2022
+++ pkgsrc/devel/ocaml-csexp/buildlink3.mk Tue May 24 18:51:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/03/01 09:44:12 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:48 jaapb Exp $
BUILDLINK_TREE+= ocaml-csexp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-csexp
OCAML_CSEXP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-csexp+= ocaml-csexp>=1.3.2
-BUILDLINK_ABI_DEPENDS.ocaml-csexp+= ocaml-csexp>=1.5.1
+BUILDLINK_ABI_DEPENDS.ocaml-csexp+= ocaml-csexp>=1.5.1nb1
BUILDLINK_PKGSRCDIR.ocaml-csexp?= ../../devel/ocaml-csexp
.endif # OCAML_CSEXP_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-deriving-ocsigen/Makefile
diff -u pkgsrc/devel/ocaml-deriving-ocsigen/Makefile:1.21 pkgsrc/devel/ocaml-deriving-ocsigen/Makefile:1.22
--- pkgsrc/devel/ocaml-deriving-ocsigen/Makefile:1.21 Mon Mar 8 08:12:50 2021
+++ pkgsrc/devel/ocaml-deriving-ocsigen/Makefile Tue May 24 18:51:48 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2021/03/08 08:12:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:48 jaapb Exp $
#
VERSION= 0.8.1
GITHUB_PROJECT= deriving
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${GITHUB_PROJECT}-ocsigen-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Extension to OCaml for deriving functions from type declarations
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -20,5 +20,5 @@ OCAML_FINDLIB_DIRS= deriving
.include "../../lang/camlp4/buildlink3.mk"
.include "../../math/ocaml-num/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-digestif/Makefile
diff -u pkgsrc/devel/ocaml-digestif/Makefile:1.7 pkgsrc/devel/ocaml-digestif/Makefile:1.8
--- pkgsrc/devel/ocaml-digestif/Makefile:1.7 Mon Mar 21 07:59:31 2022
+++ pkgsrc/devel/ocaml-digestif/Makefile Tue May 24 18:51:48 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/03/21 07:59:31 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:48 jaapb Exp $
DISTNAME= digestif-1.1.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
GITHUB_PROJECT= digestif
@@ -20,7 +20,7 @@ USE_LANGUAGES= # none
USE_TOOLS+= gmake pkg-config
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-eqaf/buildlink3.mk"
.include "../../devel/ocaml-fmt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-duff/Makefile
diff -u pkgsrc/devel/ocaml-duff/Makefile:1.2 pkgsrc/devel/ocaml-duff/Makefile:1.3
--- pkgsrc/devel/ocaml-duff/Makefile:1.2 Mon Mar 8 08:12:51 2021
+++ pkgsrc/devel/ocaml-duff/Makefile Tue May 24 18:51:48 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:48 jaapb Exp $
GITHUB_PROJECT= duff
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.2
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
@@ -16,7 +16,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-bos/buildlink3.mk"
.include "../../devel/ocaml-cmdliner/buildlink3.mk"
.include "../../devel/ocaml-cstruct/buildlink3.mk"
Index: pkgsrc/devel/ocaml-dune/Makefile
diff -u pkgsrc/devel/ocaml-dune/Makefile:1.13 pkgsrc/devel/ocaml-dune/Makefile:1.14
--- pkgsrc/devel/ocaml-dune/Makefile:1.13 Tue Apr 12 11:28:00 2022
+++ pkgsrc/devel/ocaml-dune/Makefile Tue May 24 18:51:48 2022
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2022/04/12 11:28:00 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:48 jaapb Exp $
.include "Makefile.common"
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -37,6 +38,6 @@ OPAM_INSTALL_FILES= dune-glob \
post-build:
${RUN} cd ${WRKSRC} && ./dune.exe build -p dune,dune-action-plugin,dune-build-info,dune-glob,dune-private-libs @install
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-dune/buildlink3.mk
diff -u pkgsrc/devel/ocaml-dune/buildlink3.mk:1.7 pkgsrc/devel/ocaml-dune/buildlink3.mk:1.8
--- pkgsrc/devel/ocaml-dune/buildlink3.mk:1.7 Tue Mar 1 09:33:09 2022
+++ pkgsrc/devel/ocaml-dune/buildlink3.mk Tue May 24 18:51:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2022/03/01 09:33:09 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:48 jaapb Exp $
BUILDLINK_TREE+= ocaml-dune
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-dune
OCAML_DUNE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-dune+= ocaml-dune>=2.2.0
-BUILDLINK_ABI_DEPENDS.ocaml-dune+= ocaml-dune>=2.9.3
+BUILDLINK_ABI_DEPENDS.ocaml-dune+= ocaml-dune>=2.9.3nb1
BUILDLINK_PKGSRCDIR.ocaml-dune?= ../../devel/ocaml-dune
.endif # OCAML_DUNE_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-dune-configurator/Makefile
diff -u pkgsrc/devel/ocaml-dune-configurator/Makefile:1.3 pkgsrc/devel/ocaml-dune-configurator/Makefile:1.4
--- pkgsrc/devel/ocaml-dune-configurator/Makefile:1.3 Thu Mar 10 08:49:18 2022
+++ pkgsrc/devel/ocaml-dune-configurator/Makefile Tue May 24 18:51:48 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2022/03/10 08:49:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
.include "../../devel/ocaml-dune/Makefile.common"
PKGNAME= ocaml-dune-configurator-${DUNE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -13,7 +13,7 @@ COMMENT= Configuration test library for
OCAML_USE_DUNE= yes
DUNE_BUILD_PACKAGES= dune-configurator
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-csexp/buildlink3.mk"
.include "../../devel/ocaml-result/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk
diff -u pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk:1.2 pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk:1.2 Thu Mar 10 08:49:18 2022
+++ pkgsrc/devel/ocaml-dune-configurator/buildlink3.mk Tue May 24 18:51:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/03/10 08:49:18 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:48 jaapb Exp $
BUILDLINK_TREE+= ocaml-dune-configurator
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-dune-configurator
OCAML_DUNE_CONFIGURATOR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-dune-configurator+= ocaml-dune-configurator>=2.7.1
-BUILDLINK_ABI_DEPENDS.ocaml-dune-configurator+= ocaml-dune-configurator>=2.9.3nb2
+BUILDLINK_ABI_DEPENDS.ocaml-dune-configurator+= ocaml-dune-configurator>=2.9.3nb3
BUILDLINK_PKGSRCDIR.ocaml-dune-configurator?= ../../devel/ocaml-dune-configurator
.include "../../devel/ocaml-dune/buildlink3.mk"
Index: pkgsrc/devel/ocaml-encore/Makefile
diff -u pkgsrc/devel/ocaml-encore/Makefile:1.3 pkgsrc/devel/ocaml-encore/Makefile:1.4
--- pkgsrc/devel/ocaml-encore/Makefile:1.3 Mon Mar 8 08:12:51 2021
+++ pkgsrc/devel/ocaml-encore/Makefile Tue May 24 18:51:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:49 jaapb Exp $
GITHUB_PROJECT= encore
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.4
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
@@ -16,7 +16,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-angstrom/buildlink3.mk"
.include "../../devel/ocaml-ke/buildlink3.mk"
.include "../../devel/ocaml-ocplib-endian/buildlink3.mk"
Index: pkgsrc/devel/ocaml-eqaf/Makefile
diff -u pkgsrc/devel/ocaml-eqaf/Makefile:1.2 pkgsrc/devel/ocaml-eqaf/Makefile:1.3
--- pkgsrc/devel/ocaml-eqaf/Makefile:1.2 Mon Mar 8 08:12:51 2021
+++ pkgsrc/devel/ocaml-eqaf/Makefile Tue May 24 18:51:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:49 jaapb Exp $
GITHUB_PROJECT= eqaf
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.2
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
@@ -16,6 +16,6 @@ LICENSE= mit
USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-fmt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-extlib/Makefile
diff -u pkgsrc/devel/ocaml-extlib/Makefile:1.22 pkgsrc/devel/ocaml-extlib/Makefile:1.23
--- pkgsrc/devel/ocaml-extlib/Makefile:1.22 Mon Mar 8 20:36:53 2021
+++ pkgsrc/devel/ocaml-extlib/Makefile Tue May 24 18:51:49 2022
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/03/08 20:36:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/24 18:51:49 jaapb Exp $
VERSION= 1.7.8
GITHUB_PROJECT= ocaml-extlib
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ygrek/}
@@ -15,7 +16,7 @@ USE_TOOLS+= gmake
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
BUILD_TARGET= build
Index: pkgsrc/devel/ocaml-findlib/Makefile
diff -u pkgsrc/devel/ocaml-findlib/Makefile:1.52 pkgsrc/devel/ocaml-findlib/Makefile:1.53
--- pkgsrc/devel/ocaml-findlib/Makefile:1.52 Wed Feb 2 14:45:18 2022
+++ pkgsrc/devel/ocaml-findlib/Makefile Tue May 24 18:51:49 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2022/02/02 14:45:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/05/24 18:51:49 jaapb Exp $
DISTNAME= findlib-1.9.3
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
@@ -13,7 +14,7 @@ LICENSE= mit
OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib \
ocamldoc stdlib str threads unix
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
# spacetime profiling is only available for native code on 64bit platforms
PLIST_VARS+= 64bit
Index: pkgsrc/devel/ocaml-findlib/PLIST
diff -u pkgsrc/devel/ocaml-findlib/PLIST:1.22 pkgsrc/devel/ocaml-findlib/PLIST:1.23
--- pkgsrc/devel/ocaml-findlib/PLIST:1.22 Wed Feb 2 14:45:18 2022
+++ pkgsrc/devel/ocaml-findlib/PLIST Tue May 24 18:51:49 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/02/02 14:45:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/05/24 18:51:49 jaapb Exp $
bin/ocamlfind
${OCAML_SITELIB}/bigarray/META
${OCAML_SITELIB}/bytes/META
@@ -39,7 +39,6 @@ ${OCAML_SITELIB}/findlib/ocaml_args.cmi
${OCAML_SITELIB}/findlib/topfind.cmi
${OCAML_SITELIB}/findlib/topfind.mli
${OCAML_SITELIB}/ocamldoc/META
-${PLIST.ocaml-opt}${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
${OCAML_SITELIB}/stdlib/META
${OCAML_SITELIB}/str/META
${OCAML_SITELIB}/threads/META
Index: pkgsrc/devel/ocaml-findlib/buildlink3.mk
diff -u pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.17 pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.18
--- pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.17 Thu Mar 18 08:30:43 2021
+++ pkgsrc/devel/ocaml-findlib/buildlink3.mk Tue May 24 18:51:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2021/03/18 08:30:43 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2022/05/24 18:51:49 jaapb Exp $
BUILDLINK_TREE+= ocaml-findlib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-findlib
OCAML_FINDLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.9.1
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.9.3nb1
BUILDLINK_PKGSRCDIR.ocaml-findlib?= ../../devel/ocaml-findlib
BUILDLINK_TARGETS+= ocaml-findlib-wrappers ocaml-findlib-ldconf
Index: pkgsrc/devel/ocaml-fpath/Makefile
diff -u pkgsrc/devel/ocaml-fpath/Makefile:1.4 pkgsrc/devel/ocaml-fpath/Makefile:1.5
--- pkgsrc/devel/ocaml-fpath/Makefile:1.4 Sun Mar 28 12:30:19 2021
+++ pkgsrc/devel/ocaml-fpath/Makefile Tue May 24 18:51:49 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/03/28 12:30:19 mef Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:49 jaapb Exp $
DISTNAME= fpath-0.7.2
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://erratique.ch/software/fpath/releases/
EXTRACT_SUFX= .tbz
@@ -20,5 +20,5 @@ OCAML_USE_OPAM= yes
.include "../../devel/ocaml-astring/buildlink3.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../devel/ocaml-result/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-git/Makefile
diff -u pkgsrc/devel/ocaml-git/Makefile:1.5 pkgsrc/devel/ocaml-git/Makefile:1.6
--- pkgsrc/devel/ocaml-git/Makefile:1.5 Mon Mar 8 08:12:52 2021
+++ pkgsrc/devel/ocaml-git/Makefile Tue May 24 18:51:49 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:49 jaapb Exp $
GITHUB_PROJECT= ocaml-git
DISTNAME= ${GITHUB_PROJECT}-2.0.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
@@ -37,5 +37,5 @@ OPAM_INSTALL_FILES= git
.include "../../devel/ocamlgraph/buildlink3.mk"
.include "../../www/ocaml-cohttp/buildlink3.mk"
.include "../../www/ocaml-uri/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-js-build-tools/Makefile
diff -u pkgsrc/devel/ocaml-js-build-tools/Makefile:1.13 pkgsrc/devel/ocaml-js-build-tools/Makefile:1.14
--- pkgsrc/devel/ocaml-js-build-tools/Makefile:1.13 Mon Mar 8 08:12:52 2021
+++ pkgsrc/devel/ocaml-js-build-tools/Makefile Tue May 24 18:51:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:12:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:49 jaapb Exp $
VERSION= 113.33.06
GITHUB_PROJECT= js-build-tools
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB= yes
.include "../../devel/ocaml-oasis/buildlink3.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../misc/ocaml-opam/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-ke/Makefile
diff -u pkgsrc/devel/ocaml-ke/Makefile:1.2 pkgsrc/devel/ocaml-ke/Makefile:1.3
--- pkgsrc/devel/ocaml-ke/Makefile:1.2 Mon Mar 8 08:12:53 2021
+++ pkgsrc/devel/ocaml-ke/Makefile Tue May 24 18:51:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:49 jaapb Exp $
GITHUB_PROJECT= ke
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.4
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mirage/}
@@ -16,7 +16,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-bigarray-compat/buildlink3.mk"
.include "../../devel/ocaml-fmt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-logs/Makefile
diff -u pkgsrc/devel/ocaml-logs/Makefile:1.6 pkgsrc/devel/ocaml-logs/Makefile:1.7
--- pkgsrc/devel/ocaml-logs/Makefile:1.6 Mon Mar 8 08:12:53 2021
+++ pkgsrc/devel/ocaml-logs/Makefile Tue May 24 18:51:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/24 18:51:49 jaapb Exp $
DISTNAME= logs-0.7.0
PKGNAME= ocaml-${DISTNAME}
@@ -19,5 +19,5 @@ OCAML_USE_OPAM= yes
.include "options.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lru/Makefile
diff -u pkgsrc/devel/ocaml-lru/Makefile:1.3 pkgsrc/devel/ocaml-lru/Makefile:1.4
--- pkgsrc/devel/ocaml-lru/Makefile:1.3 Mon Mar 8 08:12:53 2021
+++ pkgsrc/devel/ocaml-lru/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= lru
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.2.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=pqwy/}
@@ -20,5 +20,5 @@ OCAML_USE_OPAM= yes
.include "../../devel/ocaml-psq/buildlink3.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lwt_camlp4/Makefile
diff -u pkgsrc/devel/ocaml-lwt_camlp4/Makefile:1.7 pkgsrc/devel/ocaml-lwt_camlp4/Makefile:1.8
--- pkgsrc/devel/ocaml-lwt_camlp4/Makefile:1.7 Mon Mar 8 08:12:53 2021
+++ pkgsrc/devel/ocaml-lwt_camlp4/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= lwt_camlp4
GITHUB_TAG= 45f25a0
DISTNAME= lwt_camlp4-20180325
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/}
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-45f2
OCAML_USE_DUNE= yes
DUNE_BUILD_PACKAGES= lwt_camlp4
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-lwt/buildlink3.mk"
.include "../../lang/camlp4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lwt_glib/Makefile
diff -u pkgsrc/devel/ocaml-lwt_glib/Makefile:1.12 pkgsrc/devel/ocaml-lwt_glib/Makefile:1.13
--- pkgsrc/devel/ocaml-lwt_glib/Makefile:1.12 Wed Dec 8 16:04:03 2021
+++ pkgsrc/devel/ocaml-lwt_glib/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2021/12/08 16:04:03 adam Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= lwt_glib
GITHUB_TAG= ${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-1.1.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -20,7 +20,7 @@ CONFLICTS= ocaml-lwt<3.0.0
OCAML_USE_DUNE= yes
DUNE_BUILD_PACKAGES= lwt_glib
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-lwt/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lwt_log/Makefile
diff -u pkgsrc/devel/ocaml-lwt_log/Makefile:1.8 pkgsrc/devel/ocaml-lwt_log/Makefile:1.9
--- pkgsrc/devel/ocaml-lwt_log/Makefile:1.8 Mon Mar 8 08:12:53 2021
+++ pkgsrc/devel/ocaml-lwt_log/Makefile Tue May 24 18:51:50 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:50 jaapb Exp $
DISTNAME= lwt_log-1.1.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 3
CATEGORIES= devel security
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
GITHUB_PROJECT= lwt_log
@@ -18,6 +18,6 @@ CONFLICTS= ocaml-lwt<3.0.0
OCAML_USE_DUNE= yes
JBUILDER_BUILD_PACKAGES= lwt_log
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-lwt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lwt_ssl/Makefile
diff -u pkgsrc/devel/ocaml-lwt_ssl/Makefile:1.12 pkgsrc/devel/ocaml-lwt_ssl/Makefile:1.13
--- pkgsrc/devel/ocaml-lwt_ssl/Makefile:1.12 Mon Mar 8 08:12:54 2021
+++ pkgsrc/devel/ocaml-lwt_ssl/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= lwt_ssl
GITHUB_TAG= ${PKGVERSION_NOREV}
DISTNAME= lwt_ssl-1.1.3
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel security
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -18,7 +18,7 @@ CONFLICTS= ocaml-lwt<3.0.0
OCAML_USE_DUNE= yes
DUNE_BUILD_PACKAGES= lwt_ssl
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-lwt/buildlink3.mk"
.include "../../security/ocaml-ssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk
diff -u pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk:1.12 pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk:1.13
--- pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk:1.12 Mon Mar 8 08:12:54 2021
+++ pkgsrc/devel/ocaml-lwt_ssl/buildlink3.mk Tue May 24 18:51:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2022/05/24 18:51:50 jaapb Exp $
BUILDLINK_TREE+= ocaml-lwt_ssl
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-lwt_ssl
OCAML_LWT_SSL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-lwt_ssl+= ocaml-lwt_ssl>=1.1.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt_ssl?= ocaml-lwt_ssl>=1.1.3nb1
+BUILDLINK_ABI_DEPENDS.ocaml-lwt_ssl?= ocaml-lwt_ssl>=1.1.3nb2
BUILDLINK_PKGSRCDIR.ocaml-lwt_ssl?= ../../devel/ocaml-lwt_ssl
.include "../../devel/ocaml-lwt/buildlink3.mk"
Index: pkgsrc/devel/ocaml-oasis/Makefile
diff -u pkgsrc/devel/ocaml-oasis/Makefile:1.15 pkgsrc/devel/ocaml-oasis/Makefile:1.16
--- pkgsrc/devel/ocaml-oasis/Makefile:1.15 Mon Mar 8 08:12:54 2021
+++ pkgsrc/devel/ocaml-oasis/Makefile Tue May 24 18:51:50 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:50 jaapb Exp $
DISTNAME= oasis-0.4.10
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1694/
@@ -17,7 +17,7 @@ INSTALLATION_DIRS+= bin
OCAML_FINDLIB_DIRS+= plugin-loader
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
post-install:
.if ${OCAML_USE_OPT_COMPILER} == "yes"
Index: pkgsrc/devel/ocaml-oasis/buildlink3.mk
diff -u pkgsrc/devel/ocaml-oasis/buildlink3.mk:1.13 pkgsrc/devel/ocaml-oasis/buildlink3.mk:1.14
--- pkgsrc/devel/ocaml-oasis/buildlink3.mk:1.13 Mon Mar 8 08:12:54 2021
+++ pkgsrc/devel/ocaml-oasis/buildlink3.mk Tue May 24 18:51:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2022/05/24 18:51:50 jaapb Exp $
BUILDLINK_TREE+= ocaml-oasis
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-oasis
OCAML_OASIS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-oasis+= ocaml-oasis>=0.4.4
-BUILDLINK_ABI_DEPENDS.ocaml-oasis?= ocaml-oasis>=0.4.10nb6
+BUILDLINK_ABI_DEPENDS.ocaml-oasis?= ocaml-oasis>=0.4.10nb7
BUILDLINK_PKGSRCDIR.ocaml-oasis?= ../../devel/ocaml-oasis
.include "../../lang/ocaml/buildlink3.mk"
Index: pkgsrc/devel/ocaml-optcomp/Makefile
diff -u pkgsrc/devel/ocaml-optcomp/Makefile:1.17 pkgsrc/devel/ocaml-optcomp/Makefile:1.18
--- pkgsrc/devel/ocaml-optcomp/Makefile:1.17 Mon Mar 8 08:12:54 2021
+++ pkgsrc/devel/ocaml-optcomp/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:50 jaapb Exp $
VERSION= 1.6
GITHUB_PROJECT= optcomp
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=diml/}
@@ -20,7 +20,7 @@ OCAML_USE_OASIS= yes
pre-configure:
${RUN} cd ${WRKSRC} && oasis setup
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-oasis/buildlink3.mk"
.include "../../lang/camlp4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-ppx_derivers/Makefile
diff -u pkgsrc/devel/ocaml-ppx_derivers/Makefile:1.11 pkgsrc/devel/ocaml-ppx_derivers/Makefile:1.12
--- pkgsrc/devel/ocaml-ppx_derivers/Makefile:1.11 Mon Mar 8 08:12:56 2021
+++ pkgsrc/devel/ocaml-ppx_derivers/Makefile Tue May 24 18:51:50 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2021/03/08 08:12:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= ppx_derivers
DISTNAME= ${GITHUB_PROJECT}-1.2.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=diml/}
@@ -15,5 +15,5 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk:1.7 pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk:1.8
--- pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk:1.7 Fri Jan 17 09:37:32 2020
+++ pkgsrc/devel/ocaml-ppx_derivers/buildlink3.mk Tue May 24 18:51:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2020/01/17 09:37:32 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:50 jaapb Exp $
BUILDLINK_TREE+= ocaml-ppx_derivers
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_derivers
OCAML_PPX_DERIVERS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-ppx_derivers+= ocaml-ppx_derivers>=1.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_derivers+= ocaml-ppx_derivers>=1.2.1
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_derivers+= ocaml-ppx_derivers>=1.2.1nb2
BUILDLINK_PKGSRCDIR.ocaml-ppx_derivers?= ../../devel/ocaml-ppx_derivers
.endif # OCAML_PPX_DERIVERS_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-ppx_fields_conv/Makefile
diff -u pkgsrc/devel/ocaml-ppx_fields_conv/Makefile:1.5 pkgsrc/devel/ocaml-ppx_fields_conv/Makefile:1.6
--- pkgsrc/devel/ocaml-ppx_fields_conv/Makefile:1.5 Mon Mar 8 08:12:56 2021
+++ pkgsrc/devel/ocaml-ppx_fields_conv/Makefile Tue May 24 18:51:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:50 jaapb Exp $
GITHUB_PROJECT= ppx_fields_conv
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.14.2
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
@@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes
.include "../../devel/ocaml-fieldslib/buildlink3.mk"
.include "../../devel/ocaml-ppxlib/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk
diff -u pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk:1.4 pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk:1.5
--- pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk:1.4 Fri Dec 11 08:06:15 2020
+++ pkgsrc/devel/ocaml-ppx_fields_conv/buildlink3.mk Tue May 24 18:51:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/12/11 08:06:15 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:50 jaapb Exp $
BUILDLINK_TREE+= ocaml-ppx_fields_conv
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_fields_conv
OCAML_PPX_FIELDS_CONV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-ppx_fields_conv+= ocaml-ppx_fields_conv>=0.12.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_fields_conv+= ocaml-ppx_fields_conv>=0.14.2
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_fields_conv+= ocaml-ppx_fields_conv>=0.14.2nb2
BUILDLINK_PKGSRCDIR.ocaml-ppx_fields_conv?= ../../devel/ocaml-ppx_fields_conv
.include "../../devel/ocaml-fieldslib/buildlink3.mk"
Index: pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile
diff -u pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile:1.14 pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile:1.15
--- pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile:1.14 Mon Mar 8 08:12:58 2021
+++ pkgsrc/devel/ocaml-ppx_tools_versioned/Makefile Tue May 24 18:51:51 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:12:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:51 jaapb Exp $
VERSION= 5.4.0
GITHUB_PROJECT= ppx_tools_versioned
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-ppx/}
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB= yes
OCAML_USE_DUNE= yes
.include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-ppxfind/Makefile
diff -u pkgsrc/devel/ocaml-ppxfind/Makefile:1.4 pkgsrc/devel/ocaml-ppxfind/Makefile:1.5
--- pkgsrc/devel/ocaml-ppxfind/Makefile:1.4 Mon Mar 8 08:12:59 2021
+++ pkgsrc/devel/ocaml-ppxfind/Makefile Tue May 24 18:51:51 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= ppxfind
DISTNAME= ${GITHUB_PROJECT}-1.4
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=diml/}
@@ -15,6 +15,6 @@ LICENSE= modified-bsd
OCAML_USE_DUNE= yes
INSTALL_UNSTRIPPED= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-psq/Makefile
diff -u pkgsrc/devel/ocaml-psq/Makefile:1.3 pkgsrc/devel/ocaml-psq/Makefile:1.4
--- pkgsrc/devel/ocaml-psq/Makefile:1.3 Mon Mar 8 08:12:59 2021
+++ pkgsrc/devel/ocaml-psq/Makefile Tue May 24 18:51:51 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= psq
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.1.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=pqwy/}
@@ -19,5 +19,5 @@ OCAML_USE_TOPKG= yes
OCAML_USE_OPAM= yes
.include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-resource-pooling/Makefile
diff -u pkgsrc/devel/ocaml-resource-pooling/Makefile:1.4 pkgsrc/devel/ocaml-resource-pooling/Makefile:1.5
--- pkgsrc/devel/ocaml-resource-pooling/Makefile:1.4 Mon Mar 8 08:12:59 2021
+++ pkgsrc/devel/ocaml-resource-pooling/Makefile Tue May 24 18:51:51 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= resource-pooling
DISTNAME= ${GITHUB_PROJECT}-1.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes
.include "../../devel/ocaml-lwt/buildlink3.mk"
.include "../../devel/ocaml-lwt_log/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk
diff -u pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk:1.2 pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk:1.2 Tue Apr 21 10:48:30 2020
+++ pkgsrc/devel/ocaml-resource-pooling/buildlink3.mk Tue May 24 18:51:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/21 10:48:30 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:51 jaapb Exp $
BUILDLINK_TREE+= ocaml-resource-pooling
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-resource-pooling
OCAML_RESOURCE_POOLING_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-resource-pooling+= ocaml-resource-pooling>=1.0
-BUILDLINK_API_DEPENDS.ocaml-resource-pooling+= ocaml-resource-pooling>=1.1
+BUILDLINK_ABI_DEPENDS.ocaml-resource-pooling+= ocaml-resource-pooling>=1.1nb2
BUILDLINK_PKGSRCDIR.ocaml-resource-pooling?= ../../devel/ocaml-resource-pooling
.endif # OCAML_RESOURCE_POOLING_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-result/Makefile
diff -u pkgsrc/devel/ocaml-result/Makefile:1.14 pkgsrc/devel/ocaml-result/Makefile:1.15
--- pkgsrc/devel/ocaml-result/Makefile:1.14 Mon Mar 8 08:12:59 2021
+++ pkgsrc/devel/ocaml-result/Makefile Tue May 24 18:51:51 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= result
DISTNAME= ${GITHUB_PROJECT}-1.5
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
@@ -16,5 +16,5 @@ USE_LANGUAGES= # none
OCAML_USE_DUNE= yes
INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/result share/doc/result
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-result/buildlink3.mk
diff -u pkgsrc/devel/ocaml-result/buildlink3.mk:1.9 pkgsrc/devel/ocaml-result/buildlink3.mk:1.10
--- pkgsrc/devel/ocaml-result/buildlink3.mk:1.9 Wed Dec 9 11:07:26 2020
+++ pkgsrc/devel/ocaml-result/buildlink3.mk Tue May 24 18:51:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/12/09 11:07:26 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/05/24 18:51:51 jaapb Exp $
BUILDLINK_TREE+= ocaml-result
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-result
OCAML_RESULT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-result+= ocaml-result>=1.5
-BUILDLINK_ABI_DEPENDS.ocaml-result+= ocaml-result>=1.5
+BUILDLINK_ABI_DEPENDS.ocaml-result+= ocaml-result>=1.5nb2
BUILDLINK_PKGSRCDIR.ocaml-result?= ../../devel/ocaml-result
.endif # OCAML_RESULT_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-stringext/Makefile
diff -u pkgsrc/devel/ocaml-stringext/Makefile:1.3 pkgsrc/devel/ocaml-stringext/Makefile:1.4
--- pkgsrc/devel/ocaml-stringext/Makefile:1.3 Mon Mar 8 08:13:00 2021
+++ pkgsrc/devel/ocaml-stringext/Makefile Tue May 24 18:51:51 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:13:00 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= stringext
DISTNAME= ${GITHUB_PROJECT}-1.6.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=rgrinberg/}
@@ -14,5 +14,5 @@ LICENSE= mit
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-stringext/buildlink3.mk
diff -u pkgsrc/devel/ocaml-stringext/buildlink3.mk:1.2 pkgsrc/devel/ocaml-stringext/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-stringext/buildlink3.mk:1.2 Fri Jan 24 16:27:41 2020
+++ pkgsrc/devel/ocaml-stringext/buildlink3.mk Tue May 24 18:51:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/24 16:27:41 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:51 jaapb Exp $
BUILDLINK_TREE+= ocaml-stringext
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-stringext
OCAML_STRINGEXT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-stringext+= ocaml-stringext>=1.5.0
-BUILDLINK_ABI_DEPENDS.ocaml-stringext+= ocaml-stringext>=1.6.0
+BUILDLINK_ABI_DEPENDS.ocaml-stringext+= ocaml-stringext>=1.6.0nb2
BUILDLINK_PKGSRCDIR.ocaml-stringext?= ../../devel/ocaml-stringext
.endif # OCAML_STRINGEXT_BUILDLINK3_MK
Index: pkgsrc/devel/ocaml-type_conv/Makefile
diff -u pkgsrc/devel/ocaml-type_conv/Makefile:1.17 pkgsrc/devel/ocaml-type_conv/Makefile:1.18
--- pkgsrc/devel/ocaml-type_conv/Makefile:1.17 Mon Mar 8 08:13:01 2021
+++ pkgsrc/devel/ocaml-type_conv/Makefile Tue May 24 18:51:51 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:51 jaapb Exp $
VERSION= 113.00.02
GITHUB_PROJECT= type_conv
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB= yes
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../lang/camlp4/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocaml-type_conv/buildlink3.mk
diff -u pkgsrc/devel/ocaml-type_conv/buildlink3.mk:1.16 pkgsrc/devel/ocaml-type_conv/buildlink3.mk:1.17
--- pkgsrc/devel/ocaml-type_conv/buildlink3.mk:1.16 Mon Mar 8 08:13:01 2021
+++ pkgsrc/devel/ocaml-type_conv/buildlink3.mk Tue May 24 18:51:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2022/05/24 18:51:51 jaapb Exp $
BUILDLINK_TREE+= ocaml-type_conv
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-type_conv
OCAML_TYPE_CONV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-type_conv+= ocaml-type_conv>=109.60.01
-BUILDLINK_ABI_DEPENDS.ocaml-type_conv?= ocaml-type_conv>=113.00.02nb11
+BUILDLINK_ABI_DEPENDS.ocaml-type_conv?= ocaml-type_conv>=113.00.02nb12
BUILDLINK_PKGSRCDIR.ocaml-type_conv?= ../../devel/ocaml-type_conv
.include "../../lang/ocaml/buildlink3.mk"
Index: pkgsrc/devel/ocaml-yojson/Makefile
diff -u pkgsrc/devel/ocaml-yojson/Makefile:1.13 pkgsrc/devel/ocaml-yojson/Makefile:1.14
--- pkgsrc/devel/ocaml-yojson/Makefile:1.13 Mon Mar 8 08:13:01 2021
+++ pkgsrc/devel/ocaml-yojson/Makefile Tue May 24 18:51:51 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:51 jaapb Exp $
GITHUB_PROJECT= yojson
DISTNAME= ${GITHUB_PROJECT}-1.7.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/}
@@ -15,7 +15,7 @@ LICENSE= modified-bsd
OCAML_USE_DUNE= yes
INSTALLATION_DIRS+= bin
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-biniou/buildlink3.mk"
.include "../../devel/ocaml-cppo/buildlink3.mk"
.include "../../textproc/ocaml-easy-format/buildlink3.mk"
Index: pkgsrc/devel/ocamlbuild/Makefile
diff -u pkgsrc/devel/ocamlbuild/Makefile:1.15 pkgsrc/devel/ocamlbuild/Makefile:1.16
--- pkgsrc/devel/ocamlbuild/Makefile:1.15 Tue Mar 1 09:07:28 2022
+++ pkgsrc/devel/ocamlbuild/Makefile Tue May 24 18:51:51 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2022/03/01 09:07:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:51 jaapb Exp $
DISTNAME= ocamlbuild-0.14.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -20,5 +21,5 @@ INSTALL_TARGET= findlib-install
MAKE_ENV= CHECK_IF_PREINSTALLED=false OCAMLBUILD_BINDIR=${PREFIX}/bin \
OCAMLBUILD_LIBDIR=${PREFIX}/${OCAML_SITELIBDIR}
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocamlbuild/buildlink3.mk
diff -u pkgsrc/devel/ocamlbuild/buildlink3.mk:1.8 pkgsrc/devel/ocamlbuild/buildlink3.mk:1.9
--- pkgsrc/devel/ocamlbuild/buildlink3.mk:1.8 Tue Mar 1 09:07:28 2022
+++ pkgsrc/devel/ocamlbuild/buildlink3.mk Tue May 24 18:51:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2022/03/01 09:07:28 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2022/05/24 18:51:51 jaapb Exp $
BUILDLINK_TREE+= ocamlbuild
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocamlbuild
OCAMLBUILD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocamlbuild+= ocamlbuild>=0.9.2
-BUILDLINK_ABI_DEPENDS.ocamlbuild+= ocamlbuild>=0.14.1
+BUILDLINK_ABI_DEPENDS.ocamlbuild+= ocamlbuild>=0.14.1nb1
BUILDLINK_PKGSRCDIR.ocamlbuild?= ../../devel/ocamlbuild
BUILDLINK_DEPMETHOD.ocamlbuild?= build
.endif # OCAMLBUILD_BUILDLINK3_MK
Index: pkgsrc/devel/ocamlgraph/Makefile
diff -u pkgsrc/devel/ocamlgraph/Makefile:1.57 pkgsrc/devel/ocamlgraph/Makefile:1.58
--- pkgsrc/devel/ocamlgraph/Makefile:1.57 Mon Apr 18 19:10:53 2022
+++ pkgsrc/devel/ocamlgraph/Makefile Tue May 24 18:51:52 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2022/04/18 19:10:53 adam Exp $
+# $NetBSD: Makefile,v 1.58 2022/05/24 18:51:52 jaapb Exp $
DISTNAME= ocamlgraph-1.8.8
-PKGREVISION= 32
+PKGREVISION= 33
CATEGORIES= devel
MASTER_SITES= http://ocamlgraph.lri.fr/download/
@@ -19,7 +19,7 @@ OCAML_USE_FINDLIB= yes
MAKE_ENV+= USE_LABLGTK="${USE_LABLGTK}"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
MAKE_ENV+= OCAMLBEST="opt"
Index: pkgsrc/devel/ocamlify/Makefile
diff -u pkgsrc/devel/ocamlify/Makefile:1.14 pkgsrc/devel/ocamlify/Makefile:1.15
--- pkgsrc/devel/ocamlify/Makefile:1.14 Mon Mar 8 08:13:01 2021
+++ pkgsrc/devel/ocamlify/Makefile Tue May 24 18:51:52 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:52 jaapb Exp $
DISTNAME= ocamlify-0.0.2
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1209/
@@ -13,5 +13,5 @@ LICENSE= gnu-lgpl-v2.1
OCAML_USE_OASIS= yes
OCAML_FINDLIB_REGISTER= no
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ocamlmod/Makefile
diff -u pkgsrc/devel/ocamlmod/Makefile:1.15 pkgsrc/devel/ocamlmod/Makefile:1.16
--- pkgsrc/devel/ocamlmod/Makefile:1.15 Mon Mar 8 08:13:01 2021
+++ pkgsrc/devel/ocamlmod/Makefile Tue May 24 18:51:52 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:52 jaapb Exp $
DISTNAME= ocamlmod-0.0.8
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1544/
@@ -13,5 +13,5 @@ LICENSE= gnu-lgpl-v2.1
OCAML_USE_OASIS= yes
OCAML_FINDLIB_REGISTER= no
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/omake/Makefile
diff -u pkgsrc/devel/omake/Makefile:1.23 pkgsrc/devel/omake/Makefile:1.24
--- pkgsrc/devel/omake/Makefile:1.23 Mon Mar 8 08:13:02 2021
+++ pkgsrc/devel/omake/Makefile Tue May 24 18:51:52 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:52 jaapb Exp $
#
DISTNAME= omake-0.10.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-omake/}
GITHUB_TAG= ${PKGNAME}
Index: pkgsrc/devel/verifast/Makefile
diff -u pkgsrc/devel/verifast/Makefile:1.39 pkgsrc/devel/verifast/Makefile:1.40
--- pkgsrc/devel/verifast/Makefile:1.39 Mon Apr 18 19:10:56 2022
+++ pkgsrc/devel/verifast/Makefile Tue May 24 18:51:52 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2022/04/18 19:10:56 adam Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:52 jaapb Exp $
DISTNAME= verifast-18.02
-PKGREVISION= 27
+PKGREVISION= 28
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=verifast/}
GITHUB_PROJECT= verifast
@@ -38,7 +38,7 @@ do-install:
>> ${DESTDIR}${PREFIX}/bin/vfide
${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/vfide
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../lang/camlp4/buildlink3.mk"
.include "../../math/ocaml-num/buildlink3.mk"
Index: pkgsrc/graphics/camlimages/Makefile
diff -u pkgsrc/graphics/camlimages/Makefile:1.138 pkgsrc/graphics/camlimages/Makefile:1.139
--- pkgsrc/graphics/camlimages/Makefile:1.138 Mon Apr 18 19:11:14 2022
+++ pkgsrc/graphics/camlimages/Makefile Tue May 24 18:51:52 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.138 2022/04/18 19:11:14 adam Exp $
+# $NetBSD: Makefile,v 1.139 2022/05/24 18:51:52 jaapb Exp $
VERSION= 4.0.1
PKGNAME= camlimages-${VERSION}
-PKGREVISION= 97
+PKGREVISION= 98
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/
DISTNAME= v${VERSION}
Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.247 pkgsrc/graphics/graphviz/Makefile:1.248
--- pkgsrc/graphics/graphviz/Makefile:1.247 Wed May 4 21:05:43 2022
+++ pkgsrc/graphics/graphviz/Makefile Tue May 24 18:51:52 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.247 2022/05/04 21:05:43 wiz Exp $
+# $NetBSD: Makefile,v 1.248 2022/05/24 18:51:52 jaapb Exp $
DISTNAME= graphviz-2.50.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.gz
Index: pkgsrc/graphics/ocaml-cairo/Makefile
diff -u pkgsrc/graphics/ocaml-cairo/Makefile:1.16 pkgsrc/graphics/ocaml-cairo/Makefile:1.17
--- pkgsrc/graphics/ocaml-cairo/Makefile:1.16 Mon Apr 18 19:11:22 2022
+++ pkgsrc/graphics/ocaml-cairo/Makefile Tue May 24 18:51:52 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/04/18 19:11:22 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/24 18:51:52 jaapb Exp $
GITHUB_PROJECT= ocaml-cairo
DISTNAME= ${GITHUB_PROJECT}-0.6.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/}
@@ -21,7 +21,7 @@ DUNE_BUILD_PACKAGES= ${OCAML_FINDLIB_DIR
# https://github.com/Chris00/ocaml-cairo/issues/29
.include "options.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../devel/ocaml-dune-configurator/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/boomerang/Makefile
diff -u pkgsrc/lang/boomerang/Makefile:1.22 pkgsrc/lang/boomerang/Makefile:1.23
--- pkgsrc/lang/boomerang/Makefile:1.22 Mon Dec 27 05:14:44 2021
+++ pkgsrc/lang/boomerang/Makefile Tue May 24 18:51:52 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/12/27 05:14:44 dholland Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/24 18:51:52 jaapb Exp $
#
DISTNAME= boomerang-0.2-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= lang
MASTER_SITES= http://www.seas.upenn.edu/~harmony/download/
Index: pkgsrc/lang/camlp4/Makefile
diff -u pkgsrc/lang/camlp4/Makefile:1.23 pkgsrc/lang/camlp4/Makefile:1.24
--- pkgsrc/lang/camlp4/Makefile:1.23 Mon Mar 8 08:13:02 2021
+++ pkgsrc/lang/camlp4/Makefile Tue May 24 18:51:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:53 jaapb Exp $
GITHUB_PROJECT= camlp4
DISTNAME= ${GITHUB_PROJECT}-4.08+1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -17,7 +17,7 @@ MAKE_JOBS_SAFE= no
BROKEN= "Obsolete package, no longer supported by OCaml 4.09"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
BUILD_TARGET= byte camlp4/META
.if ${OCAML_USE_OPT_COMPILER} == "yes"
Index: pkgsrc/lang/camlp5/Makefile
diff -u pkgsrc/lang/camlp5/Makefile:1.40 pkgsrc/lang/camlp5/Makefile:1.41
--- pkgsrc/lang/camlp5/Makefile:1.40 Thu Mar 18 21:18:18 2021
+++ pkgsrc/lang/camlp5/Makefile Tue May 24 18:51:53 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2021/03/18 21:18:18 dholland Exp $
+# $NetBSD: Makefile,v 1.41 2022/05/24 18:51:53 jaapb Exp $
#
GITHUB_PROJECT= camlp5
DISTNAME= ${GITHUB_PROJECT}-7.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=camlp5/}
GITHUB_TAG= rel${PKGVERSION_NOREV:S/.//}
@@ -26,7 +26,7 @@ REPLACE_SH= tools/*.sh meta/*.sh ocaml_s
INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/camlp5
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if (${OCAML_USE_OPT_COMPILER} == "yes")
BUILD_TARGET= world.opt
Index: pkgsrc/lang/camlp5/buildlink3.mk
diff -u pkgsrc/lang/camlp5/buildlink3.mk:1.22 pkgsrc/lang/camlp5/buildlink3.mk:1.23
--- pkgsrc/lang/camlp5/buildlink3.mk:1.22 Mon Mar 8 08:13:02 2021
+++ pkgsrc/lang/camlp5/buildlink3.mk Tue May 24 18:51:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2022/05/24 18:51:53 jaapb Exp $
#
BUILDLINK_TREE+= camlp5
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= camlp5
CAMLP5_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.camlp5+= camlp5>=7.00
-BUILDLINK_ABI_DEPENDS.camlp5+= camlp5>=7.13nb1
+BUILDLINK_ABI_DEPENDS.camlp5+= camlp5>=7.13nb2
BUILDLINK_PKGSRCDIR.camlp5?= ../../lang/camlp5
.include "../../lang/ocaml/buildlink3.mk"
Index: pkgsrc/lang/pict/Makefile
diff -u pkgsrc/lang/pict/Makefile:1.23 pkgsrc/lang/pict/Makefile:1.24
--- pkgsrc/lang/pict/Makefile:1.23 Mon Mar 8 08:13:03 2021
+++ pkgsrc/lang/pict/Makefile Tue May 24 18:51:53 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:03 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:53 jaapb Exp $
DISTNAME= pict-4.1
-PKGREVISION= 17
+PKGREVISION= 18
CATEGORIES= lang
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/papers/pict/pict-4.1/
@@ -24,7 +24,7 @@ MAKE_ENV+= X11INCLUDE=${X11BASE}/includ
TEST_TARGET= test
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if !empty(OCAML_USE_OPT_COMPILER:Myes)
MAKE_ENV+= OCAMLOPT=yes
Index: pkgsrc/math/ocaml-num/Makefile
diff -u pkgsrc/math/ocaml-num/Makefile:1.7 pkgsrc/math/ocaml-num/Makefile:1.8
--- pkgsrc/math/ocaml-num/Makefile:1.7 Tue Mar 1 09:50:00 2022
+++ pkgsrc/math/ocaml-num/Makefile Tue May 24 18:51:53 2022
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2022/03/01 09:50:00 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:53 jaapb Exp $
GITHUB_PROJECT= num
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-1.4
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -21,5 +22,5 @@ INSTALLATION_DIRS+= lib/ocaml/stublibs
OCAML_USE_FINDLIB= yes
OCAML_FINDLIB_DIRS+= num-top
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/ocaml-zarith/Makefile
diff -u pkgsrc/math/ocaml-zarith/Makefile:1.21 pkgsrc/math/ocaml-zarith/Makefile:1.22
--- pkgsrc/math/ocaml-zarith/Makefile:1.21 Tue May 24 17:55:23 2022
+++ pkgsrc/math/ocaml-zarith/Makefile Tue May 24 18:51:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/05/24 17:55:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:53 jaapb Exp $
#
VERSION= 1.12
@@ -27,5 +27,5 @@ OCAML_USE_FINDLIB= yes
REPLACE_PERL+= z_pp.pl
.include "../../devel/gmp/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/z3/Makefile
diff -u pkgsrc/math/z3/Makefile:1.15 pkgsrc/math/z3/Makefile:1.16
--- pkgsrc/math/z3/Makefile:1.15 Mon Mar 8 08:13:03 2021
+++ pkgsrc/math/z3/Makefile Tue May 24 18:51:53 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:13:03 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:53 jaapb Exp $
.include "Makefile.common"
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= The Z3 theorem prover / SMT solver
.include "options.mk"
Index: pkgsrc/misc/dose3/Makefile
diff -u pkgsrc/misc/dose3/Makefile:1.19 pkgsrc/misc/dose3/Makefile:1.20
--- pkgsrc/misc/dose3/Makefile:1.19 Mon Mar 21 07:50:50 2022
+++ pkgsrc/misc/dose3/Makefile Tue May 24 18:51:53 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2022/03/21 07:50:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:53 jaapb Exp $
DISTNAME= dose3-5.0.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/36063/
@@ -15,7 +15,7 @@ USE_TOOLS+= aclocal automake autoconf g
MAKE_JOBS_SAFE= no
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} != "yes"
CONFIGURE_ARGS+= --with-bytecodeonly
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-bytecodeonly
pre-configure:
cd ${WRKSRC} && aclocal -I m4 && autoconf
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-cppo/buildlink3.mk"
.include "../../devel/ocaml-extlib/buildlink3.mk"
.include "../../devel/ocaml-re/buildlink3.mk"
Index: pkgsrc/misc/ocaml-cudf/Makefile
diff -u pkgsrc/misc/ocaml-cudf/Makefile:1.18 pkgsrc/misc/ocaml-cudf/Makefile:1.19
--- pkgsrc/misc/ocaml-cudf/Makefile:1.18 Mon Mar 8 08:13:04 2021
+++ pkgsrc/misc/ocaml-cudf/Makefile Tue May 24 18:51:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2021/03/08 08:13:04 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/24 18:51:53 jaapb Exp $
DISTNAME= cudf-0.9
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/36602/
@@ -17,7 +17,7 @@ MAKE_JOBS_SAFE= no
PKGCONFIG_OVERRIDE+= c-lib/cudf.pc.in
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
BUILD_TARGET= all
.if ${OCAML_USE_OPT_COMPILER} == "yes"
Index: pkgsrc/misc/ocaml-opaline/Makefile
diff -u pkgsrc/misc/ocaml-opaline/Makefile:1.9 pkgsrc/misc/ocaml-opaline/Makefile:1.10
--- pkgsrc/misc/ocaml-opaline/Makefile:1.9 Tue Mar 1 09:36:20 2022
+++ pkgsrc/misc/ocaml-opaline/Makefile Tue May 24 18:51:53 2022
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2022/03/01 09:36:20 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/24 18:51:53 jaapb Exp $
-GITHUB_PROJECT= opaline
-GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-0.3.3
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GITHUB:=jaapb/}
+GITHUB_PROJECT= opaline
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= jaapb%NetBSD.org@localhost
HOMEPAGE= https://github.com/jaapb/opaline
@@ -14,7 +15,7 @@ LICENSE= mit
INSTALLATION_DIRS+= bin
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
MAKE_ENV+= OPTNESS=native
Index: pkgsrc/misc/ocaml-opaline/buildlink3.mk
diff -u pkgsrc/misc/ocaml-opaline/buildlink3.mk:1.7 pkgsrc/misc/ocaml-opaline/buildlink3.mk:1.8
--- pkgsrc/misc/ocaml-opaline/buildlink3.mk:1.7 Tue Mar 1 09:36:20 2022
+++ pkgsrc/misc/ocaml-opaline/buildlink3.mk Tue May 24 18:51:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2022/03/01 09:36:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:53 jaapb Exp $
BUILDLINK_TREE+= ocaml-opaline
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-opaline
OCAML_OPALINE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-opaline+= ocaml-opaline>=0.3.1
-BUILDLINK_ABI_DEPENDS.ocaml-opaline+= ocaml-opaline>=0.3.3
+BUILDLINK_ABI_DEPENDS.ocaml-opaline+= ocaml-opaline>=0.3.3nb1
BUILDLINK_PKGSRCDIR.ocaml-opaline?= ../../misc/ocaml-opaline
# We only need this to install
Index: pkgsrc/misc/ocaml-opam/Makefile
diff -u pkgsrc/misc/ocaml-opam/Makefile:1.43 pkgsrc/misc/ocaml-opam/Makefile:1.44
--- pkgsrc/misc/ocaml-opam/Makefile:1.43 Wed Dec 8 16:05:42 2021
+++ pkgsrc/misc/ocaml-opam/Makefile Tue May 24 18:51:54 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:05:42 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/24 18:51:54 jaapb Exp $
VERSION= 2.0.8
GITHUB_PROJECT= opam
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -29,5 +29,5 @@ OPAM_INSTALL_FILES= opam opam-installer
.include "../../misc/ocaml-opam-file-format/buildlink3.mk"
.include "../../textproc/ocaml-jsonm/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/ocaml-topkg/Makefile
diff -u pkgsrc/misc/ocaml-topkg/Makefile:1.12 pkgsrc/misc/ocaml-topkg/Makefile:1.13
--- pkgsrc/misc/ocaml-topkg/Makefile:1.12 Mon Jan 31 12:04:19 2022
+++ pkgsrc/misc/ocaml-topkg/Makefile Tue May 24 18:51:54 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/31 12:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:54 jaapb Exp $
DISTNAME= topkg-1.0.5
PKGNAME= ocaml-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://erratique.ch/software/topkg/releases/
EXTRACT_SUFX= .tbz
@@ -16,7 +17,7 @@ OCAML_USE_OPAM= yes
INSTALLATION_DIRS+= share/doc/topkg
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/ocaml-topkg/buildlink3.mk
diff -u pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.5 pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.6
--- pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.5 Mon Mar 8 20:41:00 2021
+++ pkgsrc/misc/ocaml-topkg/buildlink3.mk Tue May 24 18:51:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2021/03/08 20:41:00 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/05/24 18:51:54 jaapb Exp $
BUILDLINK_TREE+= ocaml-topkg
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-topkg
OCAML_TOPKG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-topkg+= ocaml-topkg>=1.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-topkg+= ocaml-topkg>=1.0.3
+BUILDLINK_ABI_DEPENDS.ocaml-topkg+= ocaml-topkg>=1.0.5nb1
BUILDLINK_PKGSRCDIR.ocaml-topkg?= ../../misc/ocaml-topkg
.endif # OCAML_TOPKG_BUILDLINK3_MK
Index: pkgsrc/mk/ocaml.mk
diff -u pkgsrc/mk/ocaml.mk:1.33 pkgsrc/mk/ocaml.mk:1.34
--- pkgsrc/mk/ocaml.mk:1.33 Tue Apr 12 11:27:13 2022
+++ pkgsrc/mk/ocaml.mk Tue May 24 18:51:54 2022
@@ -1,16 +1,8 @@
-# $NetBSD: ocaml.mk,v 1.33 2022/04/12 11:27:13 tnn Exp $
+# $NetBSD: ocaml.mk,v 1.34 2022/05/24 18:51:54 jaapb Exp $
#
# This Makefile fragment handles the common variables used by OCaml packages.
+# It should be included by every package that uses OCaml.
#
-# Build def variables:
-# OCAML_USE_OPT_COMPILER
-# if set to yes, will enable optimised (native code) compilation
-# default value: depends on architecture
-#
-# PLIST variable:
-# PLIST.ocaml-opt for files only installed when using the optimised compiler
-# Set based on OCAML_USE_OPT_COMPILER
-#
# Package-settable variables:
# OCAML_USE_FINDLIB
# package uses findlib infrastructure
@@ -43,10 +35,9 @@ OCAML_MK= # defined
MKPIE_SUPPORTED= no
.include "../../mk/bsd.fast.prefs.mk"
+.include "../../wip/ocaml/native.mk"
-BUILD_DEFS+= OCAML_USE_OPT_COMPILER
-_VARGROUPS+= ocaml
_PKG_VARS.ocaml= \
OCAML_USE_FINDLIB \
OCAML_FINDLIB_DIRS \
@@ -61,9 +52,6 @@ _PKG_VARS.ocaml= \
OCAML_TOPKG_FLAGS \
OCAML_TOPKG_TARGETS \
OCAML_TOPKG_OPTIONAL_TARGETS \
- JBUILDER_BUILD_FLAGS \
- JBUILDER_BUILD_PACKAGES \
- JBUILDER_BUILD_TARGETS \
OCAML_USE_DUNE \
DUNE_BUILD_FLAGS \
DUNE_BUILD_PACKAGES \
@@ -71,8 +59,6 @@ _PKG_VARS.ocaml= \
OCAML_BUILD_ARGS \
OPAM_INSTALL_DIR \
OPAM_INSTALL_FILES
-_DEF_VARS.ocaml= \
- OCAML_USE_OPT_COMPILER
_SYS_VARS.ocaml= \
OCAML_SITELIBDIR
@@ -99,9 +85,6 @@ OCAML_TOPKG_OPTIONAL_TARGETS?= # empty
OCAML_TOPKG_NATIVE_TARGETS?= # empty
OPAM_INSTALL_FILES?= ${OCAML_TOPKG_NAME}
-JBUILDER_BUILD_FLAGS?= # empty
-JBUILDER_BUILD_TARGETS?= @install
-JBUILDER_BUILD_PACKAGES?= # empty
DUNE_BUILD_FLAGS?= # empty
DUNE_BUILD_TARGETS?= @install
DUNE_BUILD_PACKAGES?= # empty
@@ -109,15 +92,6 @@ DUNE_BUILD_PACKAGES?= # empty
# Default value of OASIS_BUILD_ARGS
OASIS_BUILD_ARGS?= # empty
-# Default value of OCAML_USE_OPT_COMPILER
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
- !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
- (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
-OCAML_USE_OPT_COMPILER?= yes
-.else
-OCAML_USE_OPT_COMPILER?= no
-.endif
-
#
# Configure stuff for OASIS_DYNRUN
#
@@ -189,18 +163,6 @@ OCAML_FINDLIB_REGISTER?= yes
# Compiler stuff
#
-# Things that get installed with the opt compiler
-PLIST_VARS+= ocaml-opt
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-# The opt compiler needs the C compiler suite
-USE_LANGUAGES+= c
-PLIST.ocaml-opt= yes
-.else
-# If we're bytecode compiling, don't strip executables
-INSTALL_UNSTRIPPED= yes
-.endif
-
#
# OASIS targets
#
Index: pkgsrc/net/mldonkey/Makefile
diff -u pkgsrc/net/mldonkey/Makefile:1.102 pkgsrc/net/mldonkey/Makefile:1.103
--- pkgsrc/net/mldonkey/Makefile:1.102 Mon May 24 19:53:19 2021
+++ pkgsrc/net/mldonkey/Makefile Tue May 24 18:51:54 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2021/05/24 19:53:19 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/24 18:51:54 jaapb Exp $
-PKGREVISION= 20
+PKGREVISION= 21
.include "Makefile.common"
RCD_SCRIPTS= mldonkey
Index: pkgsrc/net/mldonkey-gui/Makefile
diff -u pkgsrc/net/mldonkey-gui/Makefile:1.138 pkgsrc/net/mldonkey-gui/Makefile:1.139
--- pkgsrc/net/mldonkey-gui/Makefile:1.138 Mon Apr 18 19:11:52 2022
+++ pkgsrc/net/mldonkey-gui/Makefile Tue May 24 18:51:54 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.138 2022/04/18 19:11:52 adam Exp $
+# $NetBSD: Makefile,v 1.139 2022/05/24 18:51:54 jaapb Exp $
-PKGREVISION= 51
+PKGREVISION= 52
.include "../../net/mldonkey/Makefile.common"
PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/}
Index: pkgsrc/net/unison/Makefile
diff -u pkgsrc/net/unison/Makefile:1.140 pkgsrc/net/unison/Makefile:1.141
--- pkgsrc/net/unison/Makefile:1.140 Sun May 8 15:02:33 2022
+++ pkgsrc/net/unison/Makefile Tue May 24 18:51:54 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2022/05/08 15:02:33 gdt Exp $
+# $NetBSD: Makefile,v 1.141 2022/05/24 18:51:54 jaapb Exp $
DISTNAME= unison-2.52.1
-#PKGREVISION= 0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake bash
MAKE_FLAGS+= CFLAGS=""
MAKE_ENV+= HOME=${WRKDIR:Q}
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if (${OCAML_USE_OPT_COMPILER} == "yes")
MAKE_FLAGS+= NATIVE=true
Index: pkgsrc/print/advi/Makefile
diff -u pkgsrc/print/advi/Makefile:1.139 pkgsrc/print/advi/Makefile:1.140
--- pkgsrc/print/advi/Makefile:1.139 Mon Apr 18 19:11:56 2022
+++ pkgsrc/print/advi/Makefile Tue May 24 18:51:54 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.139 2022/04/18 19:11:56 adam Exp $
+# $NetBSD: Makefile,v 1.140 2022/05/24 18:51:54 jaapb Exp $
DISTNAME= advi-1.10.2
-PKGREVISION= 54
+PKGREVISION= 55
CATEGORIES= print
MASTER_SITES= http://gallium.inria.fr/advi/
Index: pkgsrc/security/ocaml-safepass/Makefile
diff -u pkgsrc/security/ocaml-safepass/Makefile:1.8 pkgsrc/security/ocaml-safepass/Makefile:1.9
--- pkgsrc/security/ocaml-safepass/Makefile:1.8 Mon Mar 8 08:13:06 2021
+++ pkgsrc/security/ocaml-safepass/Makefile Tue May 24 18:51:54 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:06 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:54 jaapb Exp $
GITHUB_PROJECT= ocaml-safepass
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= ${GITHUB_PROJECT}-3.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=darioteixeira/}
@@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes
pre-build:
${RUN} cd ${WRKSRC} && dune upgrade
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/security/sks/Makefile
diff -u pkgsrc/security/sks/Makefile:1.29 pkgsrc/security/sks/Makefile:1.30
--- pkgsrc/security/sks/Makefile:1.29 Mon May 24 19:54:06 2021
+++ pkgsrc/security/sks/Makefile Tue May 24 18:51:54 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2021/05/24 19:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/05/24 18:51:54 jaapb Exp $
#
DISTNAME= sks-1.1.5
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= security
MASTER_SITES= https://bitbucket.org/skskeyserver/sks-keyserver/downloads/
EXTRACT_SUFX= .tgz
Index: pkgsrc/sysutils/hivex/Makefile
diff -u pkgsrc/sysutils/hivex/Makefile:1.16 pkgsrc/sysutils/hivex/Makefile:1.17
--- pkgsrc/sysutils/hivex/Makefile:1.16 Mon Apr 18 19:12:05 2022
+++ pkgsrc/sysutils/hivex/Makefile Tue May 24 18:51:55 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2022/04/18 19:12:05 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/24 18:51:55 jaapb Exp $
DISTNAME= hivex-1.3.18
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= sysutils
MASTER_SITES= http://download.libguestfs.org/hivex/
Index: pkgsrc/textproc/harmony/Makefile
diff -u pkgsrc/textproc/harmony/Makefile:1.28 pkgsrc/textproc/harmony/Makefile:1.29
--- pkgsrc/textproc/harmony/Makefile:1.28 Mon Mar 8 08:13:06 2021
+++ pkgsrc/textproc/harmony/Makefile Tue May 24 18:51:55 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2021/03/08 08:13:06 jaapb Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:55 jaapb Exp $
#
DISTNAME= harmony-stable-${VERSION}
PKGNAME= harmony-${VERSION}
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= misc
MASTER_SITES= https://alliance.seas.upenn.edu/~harmony/download/
@@ -47,7 +47,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
${INSTALL_DATA} ${WRKSRC}/doc/main.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/pcre-ocaml/buildlink3.mk"
.include "../../net/ocamlnet/buildlink3.mk"
Index: pkgsrc/textproc/hevea/Makefile
diff -u pkgsrc/textproc/hevea/Makefile:1.31 pkgsrc/textproc/hevea/Makefile:1.32
--- pkgsrc/textproc/hevea/Makefile:1.31 Thu May 20 13:53:28 2021
+++ pkgsrc/textproc/hevea/Makefile Tue May 24 18:51:55 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2021/05/20 13:53:28 tonio Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/24 18:51:55 jaapb Exp $
DISTNAME= hevea-2.35
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://hevea.inria.fr/distri/
@@ -11,7 +12,7 @@ LICENSE= qpl-v1.0
MAKE_ENV+= DESTDIR=${DESTDIR}
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if !empty(OCAML_USE_OPT_COMPILER:M[Yy][Ee][Ss])
MAKE_ENV+= TARGET=opt
.else
Index: pkgsrc/textproc/ocaml-easy-format/Makefile
diff -u pkgsrc/textproc/ocaml-easy-format/Makefile:1.10 pkgsrc/textproc/ocaml-easy-format/Makefile:1.11
--- pkgsrc/textproc/ocaml-easy-format/Makefile:1.10 Mon Mar 8 08:13:07 2021
+++ pkgsrc/textproc/ocaml-easy-format/Makefile Tue May 24 18:51:55 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/24 18:51:55 jaapb Exp $
GITHUB_PROJECT= easy-format
DISTNAME= ${GITHUB_PROJECT}-1.3.2
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/}
@@ -14,5 +14,5 @@ LICENSE= modified-bsd
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/ocaml-expat/Makefile
diff -u pkgsrc/textproc/ocaml-expat/Makefile:1.20 pkgsrc/textproc/ocaml-expat/Makefile:1.21
--- pkgsrc/textproc/ocaml-expat/Makefile:1.20 Mon Mar 8 08:13:07 2021
+++ pkgsrc/textproc/ocaml-expat/Makefile Tue May 24 18:51:55 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2022/05/24 18:51:55 jaapb Exp $
#
VERSION= 1.0.0
GITHUB_PROJECT= ocaml-expat
GITHUB_TAG= v${VERSION}
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=whitequark/}
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake
USE_LANGUAGES= c
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
BUILD_TARGET= all
.if (${OCAML_USE_OPT_COMPILER} == "yes")
Index: pkgsrc/textproc/ocaml-jsonm/Makefile
diff -u pkgsrc/textproc/ocaml-jsonm/Makefile:1.13 pkgsrc/textproc/ocaml-jsonm/Makefile:1.14
--- pkgsrc/textproc/ocaml-jsonm/Makefile:1.13 Mon Mar 8 08:13:07 2021
+++ pkgsrc/textproc/ocaml-jsonm/Makefile Tue May 24 18:51:55 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:55 jaapb Exp $
DISTNAME= jsonm-1.0.1
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= textproc
MASTER_SITES= http://erratique.ch/software/jsonm/releases/
EXTRACT_SUFX= .tbz
@@ -15,7 +15,7 @@ LICENSE= isc
OCAML_USE_TOPKG= yes
INSTALLATION_DIRS+= bin share/doc/jsonm
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
# Normally, we'd do this using opam-installer, but that requires
# this package.
Index: pkgsrc/textproc/ocaml-jsonm/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-jsonm/buildlink3.mk:1.4 pkgsrc/textproc/ocaml-jsonm/buildlink3.mk:1.5
--- pkgsrc/textproc/ocaml-jsonm/buildlink3.mk:1.4 Thu Jul 19 15:15:29 2018
+++ pkgsrc/textproc/ocaml-jsonm/buildlink3.mk Tue May 24 18:51:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/07/19 15:15:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:55 jaapb Exp $
BUILDLINK_TREE+= ocaml-jsonm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-jsonm
OCAML_JSONM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-jsonm+= ocaml-jsonm>=0.9.1
-BUILDLINK_ABI_DEPENDS.ocaml-jsonm+= ocaml-jsonm>=1.0.1nb4
+BUILDLINK_ABI_DEPENDS.ocaml-jsonm+= ocaml-jsonm>=1.0.1nb7
BUILDLINK_PKGSRCDIR.ocaml-jsonm?= ../../textproc/ocaml-jsonm
.include "../../textproc/ocaml-uutf/buildlink3.mk"
Index: pkgsrc/textproc/ocaml-text/Makefile
diff -u pkgsrc/textproc/ocaml-text/Makefile:1.25 pkgsrc/textproc/ocaml-text/Makefile:1.26
--- pkgsrc/textproc/ocaml-text/Makefile:1.25 Mon Mar 8 08:13:07 2021
+++ pkgsrc/textproc/ocaml-text/Makefile Tue May 24 18:51:55 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2022/05/24 18:51:55 jaapb Exp $
#
DISTNAME= ocaml-text-0.8
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=vbmithr/}
@@ -21,6 +21,6 @@ HAS_CONFIGURE= yes
OCAML_USE_OASIS= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/ocaml-uchar/Makefile
diff -u pkgsrc/textproc/ocaml-uchar/Makefile:1.10 pkgsrc/textproc/ocaml-uchar/Makefile:1.11
--- pkgsrc/textproc/ocaml-uchar/Makefile:1.10 Mon Mar 8 08:13:07 2021
+++ pkgsrc/textproc/ocaml-uchar/Makefile Tue May 24 18:51:55 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/24 18:51:55 jaapb Exp $
VERSION= 0.0.2
GITHUB_PROJECT= uchar
GITHUB_TAG= v${VERSION}
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -16,7 +16,7 @@ LICENSE= gnu-lgpl-v2.1
INSTALLATION_DIRS= ${OCAML_SITELIBDIR}/uchar
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
NATIVE= true
Index: pkgsrc/textproc/ocaml-uchar/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-uchar/buildlink3.mk:1.4 pkgsrc/textproc/ocaml-uchar/buildlink3.mk:1.5
--- pkgsrc/textproc/ocaml-uchar/buildlink3.mk:1.4 Tue Nov 27 16:46:05 2018
+++ pkgsrc/textproc/ocaml-uchar/buildlink3.mk Tue May 24 18:51:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/11/27 16:46:05 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:55 jaapb Exp $
BUILDLINK_TREE+= ocaml-uchar
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-uchar
OCAML_UCHAR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-uchar+= ocaml-uchar>=0.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-uchar+= ocaml-uchar>=0.0.2
+BUILDLINK_ABI_DEPENDS.ocaml-uchar+= ocaml-uchar>=0.0.2nb2
BUILDLINK_PKGSRCDIR.ocaml-uchar?= ../../textproc/ocaml-uchar
.endif # OCAML_UCHAR_BUILDLINK3_MK
Index: pkgsrc/textproc/ocaml-xml-light/Makefile
diff -u pkgsrc/textproc/ocaml-xml-light/Makefile:1.2 pkgsrc/textproc/ocaml-xml-light/Makefile:1.3
--- pkgsrc/textproc/ocaml-xml-light/Makefile:1.2 Mon Mar 8 08:13:08 2021
+++ pkgsrc/textproc/ocaml-xml-light/Makefile Tue May 24 18:51:56 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:56 jaapb Exp $
GITHUB_PROJECT= xml-light
DISTNAME= ${GITHUB_PROJECT}-2.4
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=ncannasse/}
DIST_SUBDIR= ocaml-${GITHUB_PROJECT}
@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE= no
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
BUILD_TARGET= all
.if ${OCAML_USE_OPT_COMPILER} == "yes"
Index: pkgsrc/textproc/ocaml-xml-light/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-xml-light/buildlink3.mk:1.1 pkgsrc/textproc/ocaml-xml-light/buildlink3.mk:1.2
--- pkgsrc/textproc/ocaml-xml-light/buildlink3.mk:1.1 Thu Nov 29 10:45:37 2018
+++ pkgsrc/textproc/ocaml-xml-light/buildlink3.mk Tue May 24 18:51:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/11/29 10:45:37 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:51:56 jaapb Exp $
BUILDLINK_TREE+= ocaml-xml-light
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-xml-light
OCAML_XML_LIGHT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-xml-light+= ocaml-xml-light>=2.4
+BUILDLINK_ABI_DEPENDS.ocaml-xml-light+= ocaml-xml-light>=2.4nb2
BUILDLINK_PKGSRCDIR.ocaml-xml-light?= ../../textproc/ocaml-xml-light
.endif # OCAML_XML_LIGHT_BUILDLINK3_MK
Index: pkgsrc/textproc/pxp/Makefile
diff -u pkgsrc/textproc/pxp/Makefile:1.24 pkgsrc/textproc/pxp/Makefile:1.25
--- pkgsrc/textproc/pxp/Makefile:1.24 Mon Mar 8 08:13:08 2021
+++ pkgsrc/textproc/pxp/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/24 18:51:56 jaapb Exp $
#
DISTNAME= pxp-1.2.8
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= textproc
MASTER_SITES= http://download.camlcity.org/download/
@@ -33,7 +33,7 @@ INSTALLATION_DIRS= ${OCAML_SITELIBDIR}/p
OCAML_USE_FINDLIB= yes
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if (${OCAML_USE_OPT_COMPILER} == "yes")
BUILD_TARGET+= opt
Index: pkgsrc/textproc/py-pybtex-docutils/Makefile
diff -u pkgsrc/textproc/py-pybtex-docutils/Makefile:1.5 pkgsrc/textproc/py-pybtex-docutils/Makefile:1.6
--- pkgsrc/textproc/py-pybtex-docutils/Makefile:1.5 Tue Jan 4 20:55:03 2022
+++ pkgsrc/textproc/py-pybtex-docutils/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:56 jaapb Exp $
DISTNAME= pybtex-docutils-1.0.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_PYPI:=p/pybtex-docutils/}
Index: pkgsrc/time/ocaml-calendar/Makefile
diff -u pkgsrc/time/ocaml-calendar/Makefile:1.24 pkgsrc/time/ocaml-calendar/Makefile:1.25
--- pkgsrc/time/ocaml-calendar/Makefile:1.24 Mon Mar 8 08:13:08 2021
+++ pkgsrc/time/ocaml-calendar/Makefile Tue May 24 18:51:56 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/24 18:51:56 jaapb Exp $
#
DISTNAME= calendar-2.04
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= time devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1481/
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB= yes
TEST_TARGET= tests
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/time/ocaml-mtime/Makefile
diff -u pkgsrc/time/ocaml-mtime/Makefile:1.3 pkgsrc/time/ocaml-mtime/Makefile:1.4
--- pkgsrc/time/ocaml-mtime/Makefile:1.3 Mon Mar 8 08:13:08 2021
+++ pkgsrc/time/ocaml-mtime/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:56 jaapb Exp $
DISTNAME= mtime-1.1.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= time
MASTER_SITES= https://erratique.ch/software/mtime/releases/
EXTRACT_SUFX= .tbz
@@ -16,6 +16,6 @@ OCAML_USE_TOPKG= yes
OCAML_USE_OPAM= yes
.include "options.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/time/wyrd/Makefile
diff -u pkgsrc/time/wyrd/Makefile:1.28 pkgsrc/time/wyrd/Makefile:1.29
--- pkgsrc/time/wyrd/Makefile:1.28 Mon Mar 8 08:13:08 2021
+++ pkgsrc/time/wyrd/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:56 jaapb Exp $
#
DISTNAME= wyrd-1.4.6
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= time
#MASTER_SITES= http://pessimization.com/software/wyrd/
Index: pkgsrc/www/ocaml-curl/Makefile
diff -u pkgsrc/www/ocaml-curl/Makefile:1.43 pkgsrc/www/ocaml-curl/Makefile:1.44
--- pkgsrc/www/ocaml-curl/Makefile:1.43 Wed Dec 8 16:06:58 2021
+++ pkgsrc/www/ocaml-curl/Makefile Tue May 24 18:51:56 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:06:58 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/24 18:51:56 jaapb Exp $
#
DISTNAME= ocurl-0.5.3
PKGNAME= ocaml-curl-0.5.3
EXTRACT_SUFX= .tgz
-PKGREVISION= 39
+PKGREVISION= 40
CATEGORIES= www net devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ocurl/}
@@ -27,5 +27,5 @@ WRKSRC= ${WRKDIR}/ocurl
USE_LANGUAGES= c
.include "../../www/curl/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/ocaml-http/Makefile
diff -u pkgsrc/www/ocaml-http/Makefile:1.19 pkgsrc/www/ocaml-http/Makefile:1.20
--- pkgsrc/www/ocaml-http/Makefile:1.19 Mon Mar 8 08:13:09 2021
+++ pkgsrc/www/ocaml-http/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:56 jaapb Exp $
#
DISTNAME= ocaml-http-0.1.5
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= www
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/545/
@@ -20,7 +20,7 @@ BUILD_TARGET= all
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if (${OCAML_USE_OPT_COMPILER} == "yes")
BUILD_TARGET+= opt
Index: pkgsrc/www/ocsigen-i18n/Makefile
diff -u pkgsrc/www/ocsigen-i18n/Makefile:1.8 pkgsrc/www/ocsigen-i18n/Makefile:1.9
--- pkgsrc/www/ocsigen-i18n/Makefile:1.8 Mon Mar 8 08:13:09 2021
+++ pkgsrc/www/ocsigen-i18n/Makefile Tue May 24 18:51:56 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:56 jaapb Exp $
GITHUB_PROJECT= ocsigen-i18n
DISTNAME= ${GITHUB_PROJECT}-3.7.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=besport/}
@@ -20,7 +20,7 @@ INSTALLATION_DIRS+= bin
OCAML_USE_FINDLIB= yes
OCAML_FINDLIB_DIRS= # empty
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
MAKE_ENV+= OPTNESS=native
Index: pkgsrc/www/ocsigen-start/Makefile
diff -u pkgsrc/www/ocsigen-start/Makefile:1.12 pkgsrc/www/ocsigen-start/Makefile:1.13
--- pkgsrc/www/ocsigen-start/Makefile:1.12 Mon Mar 8 08:13:09 2021
+++ pkgsrc/www/ocsigen-start/Makefile Tue May 24 18:51:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:57 jaapb Exp $
GITHUB_PROJECT= ocsigen-start
DISTNAME= ${GITHUB_PROJECT}-2.21.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -16,7 +16,7 @@ USE_TOOLS= gmake
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
MAKE_ENV+= NATIVE=yes
Index: pkgsrc/www/ocsigen-toolkit/Makefile
diff -u pkgsrc/www/ocsigen-toolkit/Makefile:1.8 pkgsrc/www/ocsigen-toolkit/Makefile:1.9
--- pkgsrc/www/ocsigen-toolkit/Makefile:1.8 Mon Mar 8 08:13:09 2021
+++ pkgsrc/www/ocsigen-toolkit/Makefile Tue May 24 18:51:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:57 jaapb Exp $
GITHUB_PROJECT= ocsigen-toolkit
DISTNAME= ${GITHUB_PROJECT}-2.8.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -16,7 +16,7 @@ USE_TOOLS= gmake
OCAML_USE_FINDLIB= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if ${OCAML_USE_OPT_COMPILER} == "yes"
MAKE_ENV+= NATIVE=yes
Index: pkgsrc/www/swiftsurf/Makefile
diff -u pkgsrc/www/swiftsurf/Makefile:1.38 pkgsrc/www/swiftsurf/Makefile:1.39
--- pkgsrc/www/swiftsurf/Makefile:1.38 Mon Mar 8 08:13:09 2021
+++ pkgsrc/www/swiftsurf/Makefile Tue May 24 18:51:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.39 2022/05/24 18:51:57 jaapb Exp $
DISTNAME= swiftsurf-1.2.5
-PKGREVISION= 20
+PKGREVISION= 21
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swiftsurf/}
@@ -16,7 +16,7 @@ SUBST_FILES.conf= src/conf.ml
SUBST_VARS.conf= PKG_SYSCONFDIR
SUBST_STAGE.conf= pre-configure
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.if !empty(OCAML_USE_OPT_COMPILER:M[Yy][Ee][Ss])
BUILD_TARGET= nat
Index: pkgsrc/x11/labltk/Makefile
diff -u pkgsrc/x11/labltk/Makefile:1.39 pkgsrc/x11/labltk/Makefile:1.40
--- pkgsrc/x11/labltk/Makefile:1.39 Mon Mar 8 08:13:10 2021
+++ pkgsrc/x11/labltk/Makefile Tue May 24 18:51:57 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2021/03/08 08:13:10 jaapb Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:57 jaapb Exp $
DISTNAME= labltk-8.06.3
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
# caution: it's the 1701, not the filename, that identifies the download
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1701/
Index: pkgsrc/x11/ocaml-graphics/Makefile
diff -u pkgsrc/x11/ocaml-graphics/Makefile:1.41 pkgsrc/x11/ocaml-graphics/Makefile:1.42
--- pkgsrc/x11/ocaml-graphics/Makefile:1.41 Sun Dec 26 05:09:45 2021
+++ pkgsrc/x11/ocaml-graphics/Makefile Tue May 24 18:51:57 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2021/12/26 05:09:45 dholland Exp $
+# $NetBSD: Makefile,v 1.42 2022/05/24 18:51:57 jaapb Exp $
GITHUB_PROJECT= graphics
DISTNAME= ocaml-${GITHUB_PROJECT}-2.0.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
@@ -15,6 +15,6 @@ WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PK
OCAML_USE_DUNE= yes
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/ocaml-graphics/buildlink3.mk
diff -u pkgsrc/x11/ocaml-graphics/buildlink3.mk:1.26 pkgsrc/x11/ocaml-graphics/buildlink3.mk:1.27
--- pkgsrc/x11/ocaml-graphics/buildlink3.mk:1.26 Mon Mar 8 08:13:10 2021
+++ pkgsrc/x11/ocaml-graphics/buildlink3.mk Tue May 24 18:51:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2021/03/08 08:13:10 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2022/05/24 18:51:57 jaapb Exp $
BUILDLINK_TREE+= ocaml-graphics
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-graphics
OCAML_GRAPHICS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-graphics+= ocaml-graphics>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-graphics?= ocaml-graphics>=2.0.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-graphics?= ocaml-graphics>=2.0.0nb3
BUILDLINK_PKGSRCDIR.ocaml-graphics?= ../../x11/ocaml-graphics
.include "../../lang/ocaml/buildlink3.mk"
Index: pkgsrc/x11/ocaml-lablgtk/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/Makefile:1.70 pkgsrc/x11/ocaml-lablgtk/Makefile:1.71
--- pkgsrc/x11/ocaml-lablgtk/Makefile:1.70 Mon Apr 18 19:10:17 2022
+++ pkgsrc/x11/ocaml-lablgtk/Makefile Tue May 24 18:51:57 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2022/04/18 19:10:17 adam Exp $
+# $NetBSD: Makefile,v 1.71 2022/05/24 18:51:57 jaapb Exp $
GITHUB_PROJECT= lablgtk
DISTNAME= ${GITHUB_PROJECT}-2.18.12
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=garrigue/}
@@ -44,7 +44,7 @@ PLIST_VARS+= stubs
PLIST.stubs= yes
.endif
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "options.mk"
Index: pkgsrc/x11/ocaml-lablgtk3/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk3/Makefile:1.13 pkgsrc/x11/ocaml-lablgtk3/Makefile:1.14
--- pkgsrc/x11/ocaml-lablgtk3/Makefile:1.13 Mon Apr 18 19:10:17 2022
+++ pkgsrc/x11/ocaml-lablgtk3/Makefile Tue May 24 18:51:57 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2022/04/18 19:10:17 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:57 jaapb Exp $
GITHUB_PROJECT= lablgtk
GITHUB_TAG= ${VERSION}
VERSION= 3.1.2
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${GITHUB_PROJECT}3-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=garrigue/}
@@ -22,7 +22,7 @@ OPAM_INSTALL_FILES= ${OCAML_FINDLIB_DIRS
DUNE_BUILD_PACKAGES= ${OCAML_FINDLIB_DIRS}
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
.include "options.mk"
Home |
Main Index |
Thread Index |
Old Index