diff options
| author | jaapb <jaapb@pkgsrc.org> | 2022-05-24 18:59:20 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2022-05-24 18:59:20 +0000 |
| commit | 0c88cd3be92fb083f4acdf5e8fc77863657bec7a (patch) | |
| tree | e3b82e6f44f736a359e4dc49ae94669368aabf96 | |
| parent | abf70898ce2de69598e9638711f601733d406ed9 (diff) | |
| download | pkgsrc-0c88cd3be92fb083f4acdf5e8fc77863657bec7a.tar.gz | |
Replaced mk/ocaml.mk with lang/ocaml/ocaml.mk in ocaml packages
145 files changed, 290 insertions, 282 deletions
diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile index 64f03e07934..6f247fdfba0 100644 --- a/archivers/ocaml-bz2/Makefile +++ b/archivers/ocaml-bz2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/05/03 18:29:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.22 2022/05/24 18:59:20 jaapb Exp $ PKGNAME= ocaml-bz2-${VERSION} DISTNAME= camlbz2-${VERSION} @@ -19,7 +19,7 @@ OCAML_USE_FINDLIB= yes pre-configure: cd ${WRKSRC} && autoconf -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.prefs.mk" .include "../../archivers/bzip2/buildlink3.mk" diff --git a/archivers/ocaml-decompress/Makefile b/archivers/ocaml-decompress/Makefile index cca5f7845e0..db38eb78c07 100644 --- a/archivers/ocaml-decompress/Makefile +++ b/archivers/ocaml-decompress/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/03 19:45:12 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:20 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-1.4.3 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-checkseum/buildlink3.mk" .include "../../devel/ocaml-cmdliner/buildlink3.mk" .include "../../devel/ocaml-optint/buildlink3.mk" diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile index 071e2844b84..e9f0b854935 100644 --- a/archivers/ocaml-zip/Makefile +++ b/archivers/ocaml-zip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/05/03 09:27:09 jaapb Exp $ +# $NetBSD: Makefile,v 1.28 2022/05/24 18:59:20 jaapb Exp $ # VERSION= 1.11 @@ -19,7 +19,7 @@ INSTALL_TARGET= install-findlib USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" BUILD_TARGET+= allopt diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile index e1f2822f873..d6f3bf3c088 100644 --- a/databases/ocaml-dbm/Makefile +++ b/databases/ocaml-dbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2022/05/05 06:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2022/05/24 18:59:20 jaapb Exp $ # DISTNAME= caml${GITHUB_PROJECT}-1.3 @@ -26,5 +26,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/META ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/dbm .include "../../databases/gdbm/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ocaml-ldap/Makefile b/databases/ocaml-ldap/Makefile index 1429d67b6f6..6902b20ddc5 100644 --- a/databases/ocaml-ldap/Makefile +++ b/databases/ocaml-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/05/04 10:06:59 jaapb Exp $ +# $NetBSD: Makefile,v 1.17 2022/05/24 18:59:20 jaapb Exp $ VERSION= 2.4.2 GITHUB_PROJECT= ocamldap @@ -16,7 +16,7 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/pcre-ocaml/buildlink3.mk" .include "../../net/ocamlnet/buildlink3.mk" .include "../../security/ocaml-ssl/buildlink3.mk" diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile index 390d9084dd6..82bbc5e80af 100644 --- a/databases/ocaml-mysql/Makefile +++ b/databases/ocaml-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/05/04 12:55:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.33 2022/05/24 18:59:20 jaapb Exp $ # VERSION= 1.2.4 @@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= no # in parallel anyway OCAML_USE_FINDLIB= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" BUILD_TARGET= all htdoc .if ${OCAML_USE_OPT_COMPILER} == "yes" diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile index bfc9f070e43..ce880dfa551 100644 --- a/databases/ocaml-sqlite3/Makefile +++ b/databases/ocaml-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2022/05/04 13:10:14 jaapb Exp $ +# $NetBSD: Makefile,v 1.54 2022/05/24 18:59:20 jaapb Exp $ DISTNAME= sqlite3-5.1.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ LICENSE= mit USE_TOOLS+= gmake pkg-config OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-stdio/buildlink3.mk" diff --git a/databases/ocsipersist/Makefile b/databases/ocsipersist/Makefile index 3dea7c22f71..7c328ffe899 100644 --- a/databases/ocsipersist/Makefile +++ b/databases/ocsipersist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/20 06:47:28 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:20 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-1.1.0 CATEGORIES= databases @@ -21,7 +21,7 @@ OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "options.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../databases/ocaml-dbm/buildlink3.mk" .include "../../devel/ocaml-lwt/buildlink3.mk" .include "../../devel/ocaml-lwt_ppx/buildlink3.mk" diff --git a/databases/pgocaml/Makefile b/databases/pgocaml/Makefile index 785f3c17265..5501173f6c8 100644 --- a/databases/pgocaml/Makefile +++ b/databases/pgocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/05/05 12:11:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-4.3.0 CATEGORIES= databases @@ -18,7 +18,7 @@ OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= pgocaml pgocaml_ppx OPAM_INSTALL_FILES= ${DUNE_BUILD_PACKAGES} -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../devel/ocaml-hex/buildlink3.mk" .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" diff --git a/devel/js_of_ocaml-ocamlbuild/Makefile b/devel/js_of_ocaml-ocamlbuild/Makefile index b9509e725f3..9827f423bed 100644 --- a/devel/js_of_ocaml-ocamlbuild/Makefile +++ b/devel/js_of_ocaml-ocamlbuild/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/23 15:09:44 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:21 jaapb Exp $ # DISTNAME= ${GITHUB_PROJECT}-0.0.0.3693 @@ -23,6 +23,6 @@ OCAML_FINDLIB_DIRS= ${DUNE_INSTALL_PACKAGES} WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-852302c8f35b946e2ec275c529a79e46d8749be6 -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile index 61c4c51c8b3..4b895a8aa55 100644 --- a/devel/js_of_ocaml/Makefile +++ b/devel/js_of_ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/05/11 08:42:37 jaapb Exp $ +# $NetBSD: Makefile,v 1.41 2022/05/24 18:59:21 jaapb Exp $ # DISTNAME= ${GITHUB_PROJECT}-4.0.0 @@ -30,5 +30,5 @@ DUNE_BUILD_PACKAGES= ${OPAM_INSTALL_FILES} .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-yojson/buildlink3.mk" .include "../../math/ocaml-num/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile index 5764434301f..29150eaf038 100644 --- a/devel/menhir/Makefile +++ b/devel/menhir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/05/10 08:20:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.33 2022/05/24 18:59:21 jaapb Exp $ # DISTNAME= menhir-20220210 @@ -15,5 +15,5 @@ OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= menhir menhirLib menhirSdk OPAM_INSTALL_FILES= ${DUNE_BUILD_PACKAGES} -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-angstrom/Makefile b/devel/ocaml-angstrom/Makefile index 770cb78e960..80899497a50 100644 --- a/devel/ocaml-angstrom/Makefile +++ b/devel/ocaml-angstrom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/11 10:20:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= modified-bsd USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-async/buildlink3.mk" .include "../../devel/ocaml-bigstringaf/buildlink3.mk" .include "../../devel/ocaml-lwt/buildlink3.mk" diff --git a/devel/ocaml-astring/Makefile b/devel/ocaml-astring/Makefile index c228f1e0edb..0795331adda 100644 --- a/devel/ocaml-astring/Makefile +++ b/devel/ocaml-astring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/11 08:26:28 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= astring-0.8.5 PKGNAME= ocaml-${DISTNAME} @@ -17,5 +17,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" diff --git a/devel/ocaml-async/Makefile b/devel/ocaml-async/Makefile index 4ca3004cf98..5ba40919b1b 100644 --- a/devel/ocaml-async/Makefile +++ b/devel/ocaml-async/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/05 11:33:13 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-async_kernel/buildlink3.mk" .include "../../devel/ocaml-async_rpc_kernel/buildlink3.mk" .include "../../devel/ocaml-async_unix/buildlink3.mk" diff --git a/devel/ocaml-async_extra/Makefile b/devel/ocaml-async_extra/Makefile index 8d48c104010..a4edaa1d330 100644 --- a/devel/ocaml-async_extra/Makefile +++ b/devel/ocaml-async_extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/05 10:53:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-async_kernel/buildlink3.mk" .include "../../devel/ocaml-core/buildlink3.mk" .include "../../devel/ocaml-core_kernel/buildlink3.mk" diff --git a/devel/ocaml-async_kernel/Makefile b/devel/ocaml-async_kernel/Makefile index f322900f98a..a909db1080c 100644 --- a/devel/ocaml-async_kernel/Makefile +++ b/devel/ocaml-async_kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/05 08:20:45 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:21 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.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-ppx_jane/buildlink3.mk" diff --git a/devel/ocaml-async_rpc_kernel/Makefile b/devel/ocaml-async_rpc_kernel/Makefile index 4eaec5612a5..98420709088 100644 --- a/devel/ocaml-async_rpc_kernel/Makefile +++ b/devel/ocaml-async_rpc_kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/05 08:31:12 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-async_kernel/buildlink3.mk" .include "../../devel/ocaml-core_kernel/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" diff --git a/devel/ocaml-async_unix/Makefile b/devel/ocaml-async_unix/Makefile index 6ba785f21b5..d73cffcad02 100644 --- a/devel/ocaml-async_unix/Makefile +++ b/devel/ocaml-async_unix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/05/05 09:35:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.8 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-async_kernel/buildlink3.mk" .include "../../devel/ocaml-core/buildlink3.mk" .include "../../devel/ocaml-core_kernel/buildlink3.mk" diff --git a/devel/ocaml-base/Makefile b/devel/ocaml-base/Makefile index 7c5e2f9fe04..63159224261 100644 --- a/devel/ocaml-base/Makefile +++ b/devel/ocaml-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/05/10 08:33:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.17 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= apache-2.0 OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-dune-configurator/buildlink3.mk" .include "../../devel/ocaml-sexplib0/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-base64/Makefile b/devel/ocaml-base64/Makefile index e97652e39d0..59f6a34d1c6 100644 --- a/devel/ocaml-base64/Makefile +++ b/devel/ocaml-base64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2022/05/11 13:26:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.16 2022/05/24 18:59:22 jaapb Exp $ VERSION= 3.5.0 GITHUB_PROJECT= ocaml-base64 @@ -15,5 +15,5 @@ LICENSE= isc OCAML_USE_OPAM= yes OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-base_bigstring/Makefile b/devel/ocaml-base_bigstring/Makefile index 93bd069d8ee..9b1c0442335 100644 --- a/devel/ocaml-base_bigstring/Makefile +++ b/devel/ocaml-base_bigstring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/05 07:18:20 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-int_repr/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-base_quickcheck/Makefile b/devel/ocaml-base_quickcheck/Makefile index 8c1e63acb96..421185e0b13 100644 --- a/devel/ocaml-base_quickcheck/Makefile +++ b/devel/ocaml-base_quickcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 17:12:41 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -24,5 +24,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-splittable_random/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-batteries/buildlink3.mk b/devel/ocaml-batteries/buildlink3.mk index fd8136b3c32..be6fb0525ed 100644 --- a/devel/ocaml-batteries/buildlink3.mk +++ b/devel/ocaml-batteries/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2020/03/12 11:12:45 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2022/05/24 18:59:22 jaapb Exp $ BUILDLINK_TREE+= ocaml-batteries @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-batteries OCAML_BATTERIES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-batteries+= ocaml-batteries>=2.0 -BUILDLINK_ABI_DEPENDS.ocaml-batteries+= ocaml-batteries>=2.11.0 +BUILDLINK_ABI_DEPENDS.ocaml-batteries+= ocaml-batteries>=2.11.0nb2 BUILDLINK_PKGSRCDIR.ocaml-batteries?= ../../devel/ocaml-batteries .endif # OCAML_BATTERIES_BUILDLINK3_MK diff --git a/devel/ocaml-bigarray-compat/Makefile b/devel/ocaml-bigarray-compat/Makefile index 53b25173a14..fe51b6ad0ed 100644 --- a/devel/ocaml-bigarray-compat/Makefile +++ b/devel/ocaml-bigarray-compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/02 13:23:44 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:22 jaapb Exp $ VERSION= 1.1.0 GITHUB_PROJECT= bigarray-compat @@ -15,5 +15,5 @@ LICENSE= isc OCAML_USE_OPAM= yes OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-bigstringaf/Makefile b/devel/ocaml-bigstringaf/Makefile index df70b424805..0ba7a2b345a 100644 --- a/devel/ocaml-bigstringaf/Makefile +++ b/devel/ocaml-bigstringaf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/11 09:52:09 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:22 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.9.0 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= modified-bsd USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-bigarray-compat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-bin_prot/Makefile b/devel/ocaml-bin_prot/Makefile index b3adf1f590d..05f00f9b1aa 100644 --- a/devel/ocaml-bin_prot/Makefile +++ b/devel/ocaml-bin_prot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/15 02:19:31 mef Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.14.1 PKGNAME= ocaml-${DISTNAME} @@ -23,5 +23,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" .include "../../devel/ocaml-ppx_variants_conv/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-biniou/buildlink3.mk b/devel/ocaml-biniou/buildlink3.mk index fed0e6e5562..a281feefd8f 100644 --- a/devel/ocaml-biniou/buildlink3.mk +++ b/devel/ocaml-biniou/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2020/01/31 11:32:30 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2022/05/24 18:59:23 jaapb Exp $ BUILDLINK_TREE+= ocaml-biniou @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-biniou OCAML_BINIOU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-biniou+= ocaml-biniou>=1.0.13 -BUILDLINK_ABI_DEPENDS.ocaml-biniou+= ocaml-biniou>=1.2.1 +BUILDLINK_ABI_DEPENDS.ocaml-biniou+= ocaml-biniou>=1.2.1nb2 BUILDLINK_PKGSRCDIR.ocaml-biniou?= ../../devel/ocaml-biniou .endif # OCAML_BINIOU_BUILDLINK3_MK diff --git a/devel/ocaml-bos/buildlink3.mk b/devel/ocaml-bos/buildlink3.mk index 404d3e22412..15856957dbd 100644 --- a/devel/ocaml-bos/buildlink3.mk +++ b/devel/ocaml-bos/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:22 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:59:23 jaapb Exp $ BUILDLINK_TREE+= ocaml-bos @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-bos OCAML_BOS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-bos+= ocaml-bos>=0.2.0 +BUILDLINK_ABI_DEPENDS.ocaml-bos+= ocaml-bos>=0.2.0nb2 BUILDLINK_PKGSRCDIR.ocaml-bos?= ../../devel/ocaml-bos .endif # OCAML_BOS_BUILDLINK3_MK diff --git a/devel/ocaml-checkseum/Makefile b/devel/ocaml-checkseum/Makefile index b5a04507c5c..3cf4d63c199 100644 --- a/devel/ocaml-checkseum/Makefile +++ b/devel/ocaml-checkseum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/03 19:34:52 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= checkseum-0.3.3 PKGNAME= ocaml-${DISTNAME} @@ -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-cmdliner/buildlink3.mk" .include "../../devel/ocaml-fmt/buildlink3.mk" .include "../../devel/ocaml-optint/buildlink3.mk" diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile index d40dde098a7..bef842bf800 100644 --- a/devel/ocaml-cmdliner/Makefile +++ b/devel/ocaml-cmdliner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/05/02 18:12:13 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= cmdliner-1.1.1 PKGNAME= ocaml-${DISTNAME} @@ -18,7 +18,7 @@ MAKE_FLAGS+= PREFIX=${PREFIX} LIBDIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmd INSTALL_TARGET= install install-doc -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../devel/ocaml-result/buildlink3.mk" diff --git a/devel/ocaml-compiler-libs/Makefile b/devel/ocaml-compiler-libs/Makefile index 74002bcbb44..04e05673c44 100644 --- a/devel/ocaml-compiler-libs/Makefile +++ b/devel/ocaml-compiler-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2022/05/02 14:27:07 jaapb Exp $ +# $NetBSD: Makefile,v 1.14 2022/05/24 18:59:23 jaapb Exp $ VERSION= 0.12.4 GITHUB_PROJECT= ocaml-compiler-libs @@ -16,5 +16,5 @@ OCAML_USE_DUNE= yes OCAML_TOPKG_NAME= ${GITHUB_PROJECT} -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-core/Makefile b/devel/ocaml-core/Makefile index 67aacad9bbd..ad44dfd2d29 100644 --- a/devel/ocaml-core/Makefile +++ b/devel/ocaml-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/05 07:58:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_TOOLS+= bash OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-base_bigstring/buildlink3.mk" .include "../../devel/ocaml-base_quickcheck/buildlink3.mk" diff --git a/devel/ocaml-core_kernel/Makefile b/devel/ocaml-core_kernel/Makefile index 4cb4a4432b7..2199fccb4df 100644 --- a/devel/ocaml-core_kernel/Makefile +++ b/devel/ocaml-core_kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/05/05 08:04:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.9 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_TOOLS+= bash USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-core/buildlink3.mk" .include "../../devel/ocaml-int_repr/buildlink3.mk" diff --git a/devel/ocaml-cstruct/Makefile b/devel/ocaml-cstruct/Makefile index 33931c25bff..88b4c5ccd09 100644 --- a/devel/ocaml-cstruct/Makefile +++ b/devel/ocaml-cstruct/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/05 11:40:16 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:23 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-6.1.0 CATEGORIES= devel @@ -18,5 +18,5 @@ OPAM_INSTALL_FILES= cstruct cstruct-unix cstruct-sexp .include "options.mk" .include "../../devel/ocaml-fmt/buildlink3.mk" .include "../../devel/ocaml-sexplib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-digestif/buildlink3.mk b/devel/ocaml-digestif/buildlink3.mk index df0b86fc4d7..2548af31cc1 100644 --- a/devel/ocaml-digestif/buildlink3.mk +++ b/devel/ocaml-digestif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2022/03/21 07:59:31 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-digestif @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-digestif OCAML_DIGESTIF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-digestif+= ocaml-digestif>=0.7.1 -BUILDLINK_ABI_DEPENDS.ocaml-digestif+= ocaml-digestif>=1.1.0nb1 +BUILDLINK_ABI_DEPENDS.ocaml-digestif+= ocaml-digestif>=1.1.0nb2 BUILDLINK_PKGSRCDIR.ocaml-digestif?= ../../devel/ocaml-digestif .endif # OCAML_DIGESTIF_BUILDLINK3_MK diff --git a/devel/ocaml-duff/buildlink3.mk b/devel/ocaml-duff/buildlink3.mk index 6bb7c7e17c7..bd888948600 100644 --- a/devel/ocaml-duff/buildlink3.mk +++ b/devel/ocaml-duff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 11:31:30 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-duff @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-duff OCAML_DUFF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-duff+= ocaml-duff>=0.2 +BUILDLINK_ABI_DEPENDS.ocaml-duff+= ocaml-duff>=0.2nb2 BUILDLINK_PKGSRCDIR.ocaml-duff?= ../../devel/ocaml-duff .endif # OCAML_DUFF_BUILDLINK3_MK diff --git a/devel/ocaml-encore/buildlink3.mk b/devel/ocaml-encore/buildlink3.mk index d497fe31e15..6a15b094f39 100644 --- a/devel/ocaml-encore/buildlink3.mk +++ b/devel/ocaml-encore/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2020/04/14 08:56:07 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-encore @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-encore OCAML_ENCORE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-encore+= ocaml-encore>=0.2 -BUILDLINK_ABI_DEPENDS.ocaml-encore+= ocaml-encore>=0.4 +BUILDLINK_ABI_DEPENDS.ocaml-encore+= ocaml-encore>=0.4nb2 BUILDLINK_PKGSRCDIR.ocaml-encore?= ../../devel/ocaml-encore .endif # OCAML_ENCORE_BUILDLINK3_MK diff --git a/devel/ocaml-eqaf/buildlink3.mk b/devel/ocaml-eqaf/buildlink3.mk index 9e1b115ab6e..5d7721ce3b4 100644 --- a/devel/ocaml-eqaf/buildlink3.mk +++ b/devel/ocaml-eqaf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/25 09:30:27 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-eqaf @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-eqaf OCAML_EQAF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-eqaf+= ocaml-eqaf>=0.2 +BUILDLINK_ABI_DEPENDS.ocaml-eqaf+= ocaml-eqaf>=0.2nb2 BUILDLINK_PKGSRCDIR.ocaml-eqaf?= ../../devel/ocaml-eqaf .endif # OCAML_EQAF_BUILDLINK3_MK diff --git a/devel/ocaml-expect_test_helpers_core/Makefile b/devel/ocaml-expect_test_helpers_core/Makefile index 37f95c9ecca..4df69d514b6 100644 --- a/devel/ocaml-expect_test_helpers_core/Makefile +++ b/devel/ocaml-expect_test_helpers_core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 08:53:02 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:24 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-base_quickcheck/buildlink3.mk" .include "../../devel/ocaml-core/buildlink3.mk" diff --git a/devel/ocaml-extlib/buildlink3.mk b/devel/ocaml-extlib/buildlink3.mk index c34b74103cf..4172f313893 100644 --- a/devel/ocaml-extlib/buildlink3.mk +++ b/devel/ocaml-extlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2021/03/08 20:36:53 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-extlib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-extlib OCAML_EXTLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-extlib+= ocaml-extlib>=1.7.0 -BUILDLINK_ABI_DEPENDS.ocaml-extlib+= ocaml-extlib>=1.7.8 +BUILDLINK_ABI_DEPENDS.ocaml-extlib+= ocaml-extlib>=1.7.8nb1 BUILDLINK_PKGSRCDIR.ocaml-extlib?= ../../devel/ocaml-extlib .endif # OCAML_EXTLIB_BUILDLINK3_MK diff --git a/devel/ocaml-fieldslib/Makefile b/devel/ocaml-fieldslib/Makefile index 8e22527f6cd..542d84a7e69 100644 --- a/devel/ocaml-fieldslib/Makefile +++ b/devel/ocaml-fieldslib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 15:39:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:24 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -14,6 +14,6 @@ LICENSE= mit OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-fmt/Makefile b/devel/ocaml-fmt/Makefile index 8eee3523c5a..9209a2f2e96 100644 --- a/devel/ocaml-fmt/Makefile +++ b/devel/ocaml-fmt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2022/05/03 19:24:37 jaapb Exp $ +# $NetBSD: Makefile,v 1.8 2022/05/24 18:59:24 jaapb Exp $ DISTNAME= fmt-0.9.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none 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-cmdliner/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-fpath/buildlink3.mk b/devel/ocaml-fpath/buildlink3.mk index 553bfdaf8dd..2e20e83de35 100644 --- a/devel/ocaml-fpath/buildlink3.mk +++ b/devel/ocaml-fpath/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 11:19:17 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:59:24 jaapb Exp $ BUILDLINK_TREE+= ocaml-fpath @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-fpath OCAML_FPATH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-fpath+= ocaml-fpath>=0.7.2 +BUILDLINK_ABI_DEPENDS.ocaml-fpath+= ocaml-fpath>=0.7.2nb2 BUILDLINK_PKGSRCDIR.ocaml-fpath?= ../../devel/ocaml-fpath .endif # OCAML_FPATH_BUILDLINK3_MK diff --git a/devel/ocaml-hex/Makefile b/devel/ocaml-hex/Makefile index 122605823b3..f39db4a7c98 100644 --- a/devel/ocaml-hex/Makefile +++ b/devel/ocaml-hex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/05 11:45:46 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-1.5.0 CATEGORIES= devel @@ -16,5 +16,5 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes .include "../../devel/ocaml-cstruct/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-hmap/Makefile b/devel/ocaml-hmap/Makefile index c81b38379ce..008e860619b 100644 --- a/devel/ocaml-hmap/Makefile +++ b/devel/ocaml-hmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/11 11:25:03 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= hmap-0.8.1 PKGNAME= ocaml-${DISTNAME} @@ -16,6 +16,6 @@ USE_LANGUAGES= # none OCAML_USE_TOPKG= yes OCAML_USE_OPAM= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-int_repr/Makefile b/devel/ocaml-int_repr/Makefile index a89ea975b8e..b95040a330f 100644 --- a/devel/ocaml-int_repr/Makefile +++ b/devel/ocaml-int_repr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 07:02:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-intrinsics/Makefile b/devel/ocaml-intrinsics/Makefile index 3ed1acf1270..769769df411 100644 --- a/devel/ocaml-intrinsics/Makefile +++ b/devel/ocaml-intrinsics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 09:02:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.2 PKGNAME= ${DISTNAME:S/_/-/} @@ -18,5 +18,5 @@ OPAM_INSTALL_FILES= ${GITHUB_PROJECT} OCAML_FINDLIB_DIRS= ${GITHUB_PROJECT} .include "../../devel/ocaml-dune-configurator/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-jane-street-headers/Makefile b/devel/ocaml-jane-street-headers/Makefile index fad275bde81..833a8475d95 100644 --- a/devel/ocaml-jane-street-headers/Makefile +++ b/devel/ocaml-jane-street-headers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 16:32:13 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,5 +15,5 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-js-build-tools/buildlink3.mk b/devel/ocaml-js-build-tools/buildlink3.mk index 58d68be4183..b157d71bb50 100644 --- a/devel/ocaml-js-build-tools/buildlink3.mk +++ b/devel/ocaml-js-build-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2020/12/04 04:55:49 riastradh Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:59:25 jaapb Exp $ BUILDLINK_TREE+= ocaml-js-build-tools @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-js-build-tools OCAML_JS_BUILD_TOOLS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-js-build-tools+= ocaml-js-build-tools>=113.33.04 -BUILDLINK_ABI_DEPENDS.ocaml-js-build-tools+= ocaml-js-build-tools>=113.33.06nb6 +BUILDLINK_ABI_DEPENDS.ocaml-js-build-tools+= ocaml-js-build-tools>=113.33.06nb8 BUILDLINK_PKGSRCDIR.ocaml-js-build-tools?= ../../devel/ocaml-js-build-tools .endif # OCAML_JS_BUILD_TOOLS_BUILDLINK3_MK diff --git a/devel/ocaml-jst-config/Makefile b/devel/ocaml-jst-config/Makefile index 3c16a307045..79ec8ac0505 100644 --- a/devel/ocaml-jst-config/Makefile +++ b/devel/ocaml-jst-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/04 16:37:41 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:25 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.1 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_assert/buildlink3.mk" .include "../../devel/ocaml-stdio/buildlink3.mk" diff --git a/devel/ocaml-ke/buildlink3.mk b/devel/ocaml-ke/buildlink3.mk index cedfaa1c751..a6d294cde08 100644 --- a/devel/ocaml-ke/buildlink3.mk +++ b/devel/ocaml-ke/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2020/04/14 08:18:30 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:59:25 jaapb Exp $ BUILDLINK_TREE+= ocaml-ke @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-ke OCAML_KE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ke+= ocaml-ke>=0.4 +BUILDLINK_ABI_DEPENDS.ocaml-ke+= ocaml-ke>=0.4nb2 BUILDLINK_PKGSRCDIR.ocaml-ke?= ../../devel/ocaml-ke .endif # OCAML_KE_BUILDLINK3_MK diff --git a/devel/ocaml-logs/buildlink3.mk b/devel/ocaml-logs/buildlink3.mk index fd19e4b6d73..643e3c49dff 100644 --- a/devel/ocaml-logs/buildlink3.mk +++ b/devel/ocaml-logs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2020/04/30 13:29:07 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2022/05/24 18:59:25 jaapb Exp $ BUILDLINK_TREE+= ocaml-logs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-logs OCAML_LOGS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-logs+= ocaml-logs>=0.6.2 -BUILDLINK_ABI_DEPENDS.ocaml-logs+= ocaml-logs>=0.7.0nb1 +BUILDLINK_ABI_DEPENDS.ocaml-logs+= ocaml-logs>=0.7.0nb3 BUILDLINK_PKGSRCDIR.ocaml-logs?= ../../devel/ocaml-logs .endif # OCAML_LOGS_BUILDLINK3_MK diff --git a/devel/ocaml-lru/buildlink3.mk b/devel/ocaml-lru/buildlink3.mk index 325765e04c4..829c0526c7d 100644 --- a/devel/ocaml-lru/buildlink3.mk +++ b/devel/ocaml-lru/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:23 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:59:26 jaapb Exp $ BUILDLINK_TREE+= ocaml-lru @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-lru OCAML_LRU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-lru+= ocaml-lru>=0.2.0 +BUILDLINK_ABI_DEPENDS.ocaml-lru+= ocaml-lru>=0.2.0nb2 BUILDLINK_PKGSRCDIR.ocaml-lru?= ../../devel/ocaml-lru .endif # OCAML_LRU_BUILDLINK3_MK diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 10a93f3c2c8..d597506ec97 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2022/05/02 14:02:09 jaapb Exp $ +# $NetBSD: Makefile,v 1.46 2022/05/24 18:59:26 jaapb Exp $ # .include "Makefile.common" @@ -17,7 +17,7 @@ CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS MAKE_ENV+= LWT_DISCOVER_ARGUMENTS="--use-pthread true --use-libev true --verbose" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../devel/libev/buildlink3.mk" .include "../../devel/ocaml-cppo/buildlink3.mk" diff --git a/devel/ocaml-lwt_camlp4/buildlink3.mk b/devel/ocaml-lwt_camlp4/buildlink3.mk index 21851ac5763..60436854c6f 100644 --- a/devel/ocaml-lwt_camlp4/buildlink3.mk +++ b/devel/ocaml-lwt_camlp4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2019/11/03 10:39:24 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:59:26 jaapb Exp $ BUILDLINK_TREE+= ocaml-lwt_camlp4 @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-lwt_camlp4 OCAML_LWT_CAMLP4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb4 +BUILDLINK_ABI_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb6 BUILDLINK_PKGSRCDIR.ocaml-lwt_camlp4?= ../../devel/ocaml-lwt_camlp4 .include "../../devel/ocaml-lwt/buildlink3.mk" diff --git a/devel/ocaml-lwt_ppx/Makefile b/devel/ocaml-lwt_ppx/Makefile index dc302128f50..c1741d2c73d 100644 --- a/devel/ocaml-lwt_ppx/Makefile +++ b/devel/ocaml-lwt_ppx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/05/02 14:07:16 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2022/05/24 18:59:26 jaapb Exp $ .include "../../devel/ocaml-lwt/Makefile.common" @@ -13,7 +13,7 @@ CONFLICTS= ocaml-lwt<3.0.0 DUNE_BUILD_PACKAGES= lwt_ppx -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-lwt/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-lwt_react/Makefile b/devel/ocaml-lwt_react/Makefile index 8a245829d10..d5b7f135a5d 100644 --- a/devel/ocaml-lwt_react/Makefile +++ b/devel/ocaml-lwt_react/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/02 14:12:12 jaapb Exp $ +# $NetBSD: Makefile,v 1.12 2022/05/24 18:59:26 jaapb Exp $ .include "../../devel/ocaml-lwt/Makefile.common" @@ -13,7 +13,7 @@ CONFLICTS= ocaml-lwt<3.0.0 DUNE_BUILD_PACKAGES= lwt_react -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-lwt/buildlink3.mk" .include "../../devel/ocaml-react/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-migrate-parsetree/Makefile b/devel/ocaml-migrate-parsetree/Makefile index 72846614e2f..4d4ac8c364f 100644 --- a/devel/ocaml-migrate-parsetree/Makefile +++ b/devel/ocaml-migrate-parsetree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2022/05/02 13:13:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.21 2022/05/24 18:59:26 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-2.3.0 CATEGORIES= devel @@ -17,6 +17,6 @@ OCAML_FINDLIB_DIRS= ${GITHUB_PROJECT} OCAML_USE_DUNE= yes OPAM_INSTALL_FILES= ${GITHUB_PROJECT} -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-mmap/Makefile b/devel/ocaml-mmap/Makefile index a6acea59b2b..7dd33a00406 100644 --- a/devel/ocaml-mmap/Makefile +++ b/devel/ocaml-mmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/02 13:33:00 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:26 jaapb Exp $ GITHUB_PROJECT= mmap GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,6 +13,6 @@ LICENSE= gnu-lgpl-v2.1 OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-bigarray-compat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ocplib-endian/Makefile b/devel/ocaml-ocplib-endian/Makefile index 0adcbbf94df..95b6e2fd79f 100644 --- a/devel/ocaml-ocplib-endian/Makefile +++ b/devel/ocaml-ocplib-endian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/02 13:44:25 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:26 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-1.2 PKGNAME= ocaml-${DISTNAME} @@ -14,6 +14,6 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-cppo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-optcomp/buildlink3.mk b/devel/ocaml-optcomp/buildlink3.mk index 108a32662ad..397efdc2656 100644 --- a/devel/ocaml-optcomp/buildlink3.mk +++ b/devel/ocaml-optcomp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2018/07/19 15:15:23 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2022/05/24 18:59:26 jaapb Exp $ BUILDLINK_TREE+= ocaml-optcomp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-optcomp OCAML_OPTCOMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6nb1 -BUILDLINK_ABI_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6nb11 +BUILDLINK_ABI_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6nb14 BUILDLINK_PKGSRCDIR.ocaml-optcomp?= ../../devel/ocaml-optcomp .include "../../lang/camlp4/buildlink3.mk" diff --git a/devel/ocaml-optint/Makefile b/devel/ocaml-optint/Makefile index 3ab55926b2c..f3b1649a30c 100644 --- a/devel/ocaml-optint/Makefile +++ b/devel/ocaml-optint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/03 19:11:52 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= optint-0.2.0 PKGNAME= ocaml-${DISTNAME} @@ -16,5 +16,5 @@ OCAML_USE_DUNE= yes USE_LANGUAGES= # none -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-parsexp/Makefile b/devel/ocaml-parsexp/Makefile index 5a07822bf18..d180d7f23ed 100644 --- a/devel/ocaml-parsexp/Makefile +++ b/devel/ocaml-parsexp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/05/04 13:25:03 jaapb Exp $ +# $NetBSD: Makefile,v 1.9 2022/05/24 18:59:27 jaapb Exp $ GITHUB_PROJECT= parsexp GITHUB_TAG= v${PKGVERSION_NOREV} @@ -18,5 +18,5 @@ UNLIMIT_RESOURCES+= stacksize # needed for very large constant .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-sexplib0/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_assert/Makefile b/devel/ocaml-ppx_assert/Makefile index 6c6bf75ed6f..7224b76f433 100644 --- a/devel/ocaml-ppx_assert/Makefile +++ b/devel/ocaml-ppx_assert/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 16:27:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_compare/buildlink3.mk" .include "../../devel/ocaml-ppx_cold/buildlink3.mk" diff --git a/devel/ocaml-ppx_base/Makefile b/devel/ocaml-ppx_base/Makefile index 29067eac6d4..c7dd6ff9a74 100644 --- a/devel/ocaml-ppx_base/Makefile +++ b/devel/ocaml-ppx_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/05/04 15:32:22 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-ppx_cold/buildlink3.mk" .include "../../devel/ocaml-ppx_compare/buildlink3.mk" .include "../../devel/ocaml-ppx_enumerate/buildlink3.mk" diff --git a/devel/ocaml-ppx_bench/Makefile b/devel/ocaml-ppx_bench/Makefile index 4a7ce843899..e083809f0b4 100644 --- a/devel/ocaml-ppx_bench/Makefile +++ b/devel/ocaml-ppx_bench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 17:01:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_inline_test/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_bin_prot/Makefile b/devel/ocaml-ppx_bin_prot/Makefile index a125f392c22..54a00d0e9bf 100644 --- a/devel/ocaml-ppx_bin_prot/Makefile +++ b/devel/ocaml-ppx_bin_prot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 17:58:56 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -20,5 +20,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_here/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_cold/Makefile b/devel/ocaml-ppx_cold/Makefile index cea8d4a32c1..479d1b532ba 100644 --- a/devel/ocaml-ppx_cold/Makefile +++ b/devel/ocaml-ppx_cold/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 15:24:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:27 jaapb Exp $ GITHUB_PROJECT= ppx_cold GITHUB_TAG= v${PKGVERSION_NOREV} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_compare/Makefile b/devel/ocaml-ppx_compare/Makefile index 2e24c3df016..f998870e508 100644 --- a/devel/ocaml-ppx_compare/Makefile +++ b/devel/ocaml-ppx_compare/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/04 13:57:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.12 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_custom_printf/Makefile b/devel/ocaml-ppx_custom_printf/Makefile index b7616ebebce..67288a06921 100644 --- a/devel/ocaml-ppx_custom_printf/Makefile +++ b/devel/ocaml-ppx_custom_printf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 17:18:53 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:27 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" diff --git a/devel/ocaml-ppx_deriving/Makefile b/devel/ocaml-ppx_deriving/Makefile index ce417193e5a..f8b5d3dc1ba 100644 --- a/devel/ocaml-ppx_deriving/Makefile +++ b/devel/ocaml-ppx_deriving/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/05/05 11:52:00 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-5.2.1 PKGNAME= ocaml-${DISTNAME} @@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_derivers/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-result/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_disable_unused_warnings/Makefile b/devel/ocaml-ppx_disable_unused_warnings/Makefile index 5af884b22cf..e2c7f876017 100644 --- a/devel/ocaml-ppx_disable_unused_warnings/Makefile +++ b/devel/ocaml-ppx_disable_unused_warnings/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 06:36:25 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_enumerate/Makefile b/devel/ocaml-ppx_enumerate/Makefile index 729d5118310..6c588a91fb0 100644 --- a/devel/ocaml-ppx_enumerate/Makefile +++ b/devel/ocaml-ppx_enumerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/04 14:11:35 jaapb Exp $ +# $NetBSD: Makefile,v 1.12 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_expect/Makefile b/devel/ocaml-ppx_expect/Makefile index 20452036bd0..924c39615b2 100644 --- a/devel/ocaml-ppx_expect/Makefile +++ b/devel/ocaml-ppx_expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/04 18:04:15 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_assert/buildlink3.mk" .include "../../devel/ocaml-ppx_compare/buildlink3.mk" diff --git a/devel/ocaml-ppx_fail/Makefile b/devel/ocaml-ppx_fail/Makefile index 69e24f90c51..550d19e7209 100644 --- a/devel/ocaml-ppx_fail/Makefile +++ b/devel/ocaml-ppx_fail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/04 18:16:40 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.14.0 PKGNAME= ocaml-${DISTNAME} @@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_here/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_fixed_literal/Makefile b/devel/ocaml-ppx_fixed_literal/Makefile index 7306843b5f7..3092835f87b 100644 --- a/devel/ocaml-ppx_fixed_literal/Makefile +++ b/devel/ocaml-ppx_fixed_literal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 06:25:51 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_hash/Makefile b/devel/ocaml-ppx_hash/Makefile index 99e253e71c6..6b6e924327b 100644 --- a/devel/ocaml-ppx_hash/Makefile +++ b/devel/ocaml-ppx_hash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2022/05/04 15:09:51 jaapb Exp $ +# $NetBSD: Makefile,v 1.12 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_compare/buildlink3.mk" .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" diff --git a/devel/ocaml-ppx_here/Makefile b/devel/ocaml-ppx_here/Makefile index 2ee4bf3b6c8..ebc2828f54a 100644 --- a/devel/ocaml-ppx_here/Makefile +++ b/devel/ocaml-ppx_here/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 16:00:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_ignore_instrumentation/Makefile b/devel/ocaml-ppx_ignore_instrumentation/Makefile index c2abec0f7e9..5bc637a64e6 100644 --- a/devel/ocaml-ppx_ignore_instrumentation/Makefile +++ b/devel/ocaml-ppx_ignore_instrumentation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 06:01:03 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:28 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,5 +16,5 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_inline_test/Makefile b/devel/ocaml-ppx_inline_test/Makefile index 1e14a620538..3a871e26957 100644 --- a/devel/ocaml-ppx_inline_test/Makefile +++ b/devel/ocaml-ppx_inline_test/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 16:55:50 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../time/ocaml-time_now/buildlink3.mk" diff --git a/devel/ocaml-ppx_jane/Makefile b/devel/ocaml-ppx_jane/Makefile index 35d50c1a423..19283f91b31 100644 --- a/devel/ocaml-ppx_jane/Makefile +++ b/devel/ocaml-ppx_jane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/05 07:13:22 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -43,5 +43,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_variants_conv/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_let/Makefile b/devel/ocaml-ppx_let/Makefile index 059b9e06671..90d88825195 100644 --- a/devel/ocaml-ppx_let/Makefile +++ b/devel/ocaml-ppx_let/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 16:07:51 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_here/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_log/Makefile b/devel/ocaml-ppx_log/Makefile index f6694c812f4..683e27fa004 100644 --- a/devel/ocaml-ppx_log/Makefile +++ b/devel/ocaml-ppx_log/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 06:10:54 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -21,5 +21,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_sexp_message/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-sexplib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_module_timer/Makefile b/devel/ocaml-ppx_module_timer/Makefile index 4a7c6f0eb7e..66e44e230b3 100644 --- a/devel/ocaml-ppx_module_timer/Makefile +++ b/devel/ocaml-ppx_module_timer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 18:10:01 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -20,5 +20,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-stdio/buildlink3.mk" .include "../../time/ocaml-time_now/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_optcomp/Makefile b/devel/ocaml-ppx_optcomp/Makefile index f6d08a33b88..090b41a2501 100644 --- a/devel/ocaml-ppx_optcomp/Makefile +++ b/devel/ocaml-ppx_optcomp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/05/04 16:43:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= apache-2.0 OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-stdio/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" diff --git a/devel/ocaml-ppx_optional/Makefile b/devel/ocaml-ppx_optional/Makefile index dcbb7020fe3..79540ac0897 100644 --- a/devel/ocaml-ppx_optional/Makefile +++ b/devel/ocaml-ppx_optional/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 18:21:38 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_pipebang/Makefile b/devel/ocaml-ppx_pipebang/Makefile index 1c033ce841e..5187885c55f 100644 --- a/devel/ocaml-ppx_pipebang/Makefile +++ b/devel/ocaml-ppx_pipebang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/04 18:27:14 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:29 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,5 +16,5 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_sexp_conv/Makefile b/devel/ocaml-ppx_sexp_conv/Makefile index 4c1d4e10fe4..05f375f1758 100644 --- a/devel/ocaml-ppx_sexp_conv/Makefile +++ b/devel/ocaml-ppx_sexp_conv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/05/04 14:43:45 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/24 18:59:30 jaapb Exp $ GITHUB_PROJECT= ppx_sexp_conv GITHUB_TAG= v${PKGVERSION_NOREV} @@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_sexp_message/Makefile b/devel/ocaml-ppx_sexp_message/Makefile index f6bf5b33af5..8b093ee35e5 100644 --- a/devel/ocaml-ppx_sexp_message/Makefile +++ b/devel/ocaml-ppx_sexp_message/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 16:14:30 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:30 jaapb Exp $ GITHUB_PROJECT= ppx_sexp_message GITHUB_TAG= v${PKGVERSION_NOREV} @@ -20,5 +20,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_sexp_value/Makefile b/devel/ocaml-ppx_sexp_value/Makefile index 42b4e67f15f..91583b7aa8c 100644 --- a/devel/ocaml-ppx_sexp_value/Makefile +++ b/devel/ocaml-ppx_sexp_value/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/04 16:20:15 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:30 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -19,5 +19,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_here/buildlink3.mk" .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_stable/Makefile b/devel/ocaml-ppx_stable/Makefile index 7af469bf615..ae356dddd11 100644 --- a/devel/ocaml-ppx_stable/Makefile +++ b/devel/ocaml-ppx_stable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 18:33:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:30 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_string/Makefile b/devel/ocaml-ppx_string/Makefile index cc758f0c6a5..038ef1cf4e0 100644 --- a/devel/ocaml-ppx_string/Makefile +++ b/devel/ocaml-ppx_string/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 06:17:53 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:30 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppx_base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_tools/Makefile b/devel/ocaml-ppx_tools/Makefile index 53aa3f9e7dc..b4539ce3df1 100644 --- a/devel/ocaml-ppx_tools/Makefile +++ b/devel/ocaml-ppx_tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/05/05 12:06:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/24 18:59:30 jaapb Exp $ VERSION= 6.5 GITHUB_PROJECT= ppx_tools @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-cppo/buildlink3.mk" BUILDLINK_DEPMETHOD.ocaml-cppo= build .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_tools_versioned/buildlink3.mk b/devel/ocaml-ppx_tools_versioned/buildlink3.mk index b4127c4fdc7..12f5c29240d 100644 --- a/devel/ocaml-ppx_tools_versioned/buildlink3.mk +++ b/devel/ocaml-ppx_tools_versioned/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2020/12/09 11:28:57 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2022/05/24 18:59:30 jaapb Exp $ BUILDLINK_TREE+= ocaml-ppx_tools_versioned @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_tools_versioned OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_tools_versioned+= ocaml-ppx_tools_versioned>=5.0.1 -BUILDLINK_ABI_DEPENDS.ocaml-ppx_tools_versioned+= ocaml-ppx_tools_versioned>=5.4.0 +BUILDLINK_ABI_DEPENDS.ocaml-ppx_tools_versioned+= ocaml-ppx_tools_versioned>=5.4.0nb2 BUILDLINK_PKGSRCDIR.ocaml-ppx_tools_versioned?= ../../devel/ocaml-ppx_tools_versioned .endif # OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_typerep_conv/Makefile b/devel/ocaml-ppx_typerep_conv/Makefile index aaaa956fb1d..4cb857cec89 100644 --- a/devel/ocaml-ppx_typerep_conv/Makefile +++ b/devel/ocaml-ppx_typerep_conv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 18:45:39 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:30 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-typerep/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_variants_conv/Makefile b/devel/ocaml-ppx_variants_conv/Makefile index c0578f5cc2e..0f025b83e36 100644 --- a/devel/ocaml-ppx_variants_conv/Makefile +++ b/devel/ocaml-ppx_variants_conv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 17:36:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:30 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-variantslib/buildlink3.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" diff --git a/devel/ocaml-ppxfind/buildlink3.mk b/devel/ocaml-ppxfind/buildlink3.mk index cff0f226c5c..e7e85900d15 100644 --- a/devel/ocaml-ppxfind/buildlink3.mk +++ b/devel/ocaml-ppxfind/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2020/12/10 08:43:15 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:59:31 jaapb Exp $ BUILDLINK_TREE+= ocaml-ppxfind @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppxfind OCAML_PPXFIND_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppxfind+= ocaml-ppxfind>=1.3 -BUILDLINK_ABI_DEPENDS.ocaml-ppxfind+= ocaml-ppxfind>=1.4 +BUILDLINK_ABI_DEPENDS.ocaml-ppxfind+= ocaml-ppxfind>=1.4nb2 BUILDLINK_PKGSRCDIR.ocaml-ppxfind?= ../../devel/ocaml-ppxfind .endif # OCAML_PPXFIND_BUILDLINK3_MK diff --git a/devel/ocaml-ppxlib/Makefile b/devel/ocaml-ppxlib/Makefile index 4cfc4bb87a5..5826721223f 100644 --- a/devel/ocaml-ppxlib/Makefile +++ b/devel/ocaml-ppxlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/05/02 15:04:06 jaapb Exp $ +# $NetBSD: Makefile,v 1.15 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.26.0 PKGNAME= ocaml-${DISTNAME} @@ -28,5 +28,5 @@ SUPERSEDES= ocaml-ppx_ast-[0-9]* \ .include "../../devel/ocaml-ppx_derivers/buildlink3.mk" .include "../../devel/ocaml-sexplib0/buildlink3.mk" .include "../../devel/ocaml-stdlib-shims/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-psq/buildlink3.mk b/devel/ocaml-psq/buildlink3.mk index 9e2892a2c2c..4dab125335d 100644 --- a/devel/ocaml-psq/buildlink3.mk +++ b/devel/ocaml-psq/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 10:39:25 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:59:31 jaapb Exp $ BUILDLINK_TREE+= ocaml-psq @@ -6,6 +6,7 @@ BUILDLINK_TREE+= ocaml-psq OCAML_PSQ_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-psq+= ocaml-psq>=0.1.0 +BUILDLINK_ABI_DEPENDS.ocaml-psq+= ocaml-psq>=0.1.0nb2 BUILDLINK_PKGSRCDIR.ocaml-psq?= ../../devel/ocaml-psq .endif # OCAML_PSQ_BUILDLINK3_MK diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile index 701563e9330..d61ee8b900f 100644 --- a/devel/ocaml-re/Makefile +++ b/devel/ocaml-re/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/05/02 15:20:39 jaapb Exp $ +# $NetBSD: Makefile,v 1.28 2022/05/24 18:59:31 jaapb Exp $ VERSION= 1.10.4 GITHUB_PROJECT= ocaml-re @@ -17,6 +17,6 @@ INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \ share/doc/re OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-seq/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile index 21273e0c525..13747826cee 100644 --- a/devel/ocaml-react/Makefile +++ b/devel/ocaml-react/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/05/10 08:11:07 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= react-1.2.2 PKGNAME= ocaml-${DISTNAME} @@ -17,6 +17,6 @@ INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/react OCAML_USE_TOPKG= yes OCAML_USE_OPAM= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-reactiveData/Makefile b/devel/ocaml-reactiveData/Makefile index 72f12c66256..af7ace0cd3c 100644 --- a/devel/ocaml-reactiveData/Makefile +++ b/devel/ocaml-reactiveData/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/05/10 08:14:02 jaapb Exp $ +# $NetBSD: Makefile,v 1.17 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.3 PKGNAME= ocaml-${DISTNAME} @@ -13,6 +13,6 @@ LICENSE= gnu-lgpl-v2.1 OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-react/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-rresult/Makefile b/devel/ocaml-rresult/Makefile index 846cb0d6525..a191b251eeb 100644 --- a/devel/ocaml-rresult/Makefile +++ b/devel/ocaml-rresult/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/03 19:30:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= rresult-0.7.0 PKGNAME= ocaml-${DISTNAME} @@ -18,5 +18,5 @@ OCAML_USE_OPAM= yes .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../devel/ocaml-compiler-libs/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-seq/Makefile b/devel/ocaml-seq/Makefile index 2a1e99b90f8..6a01cd6df1a 100644 --- a/devel/ocaml-seq/Makefile +++ b/devel/ocaml-seq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/02 13:53:44 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.2.2 PKGNAME= ocaml-${DISTNAME} @@ -14,5 +14,5 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-sexp_pretty/Makefile b/devel/ocaml-sexp_pretty/Makefile index fa54c76676a..4d070d67269 100644 --- a/devel/ocaml-sexp_pretty/Makefile +++ b/devel/ocaml-sexp_pretty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 08:46:43 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:31 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -20,5 +20,5 @@ BUILD_TARGET= default .include "../../devel/ocaml-ppx_base/buildlink3.mk" .include "../../devel/ocaml-sexplib/buildlink3.mk" .include "../../devel/ocaml-re/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index d35ad501472..0246cca48f8 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2022/05/04 13:32:12 jaapb Exp $ +# $NetBSD: Makefile,v 1.24 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -20,5 +20,5 @@ BUILD_TARGET= default .include "../../devel/ocaml-parsexp/buildlink3.mk" .include "../../devel/ocaml-sexplib0/buildlink3.mk" .include "../../math/ocaml-num/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-sexplib0/Makefile b/devel/ocaml-sexplib0/Makefile index 827ce32f535..d5e987561c2 100644 --- a/devel/ocaml-sexplib0/Makefile +++ b/devel/ocaml-sexplib0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/05/02 14:41:56 jaapb Exp $ +# $NetBSD: Makefile,v 1.10 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -17,5 +17,5 @@ OCAML_USE_DUNE= yes BUILD_TARGET= default -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-spawn/Makefile b/devel/ocaml-spawn/Makefile index 2a8f0810c91..3dfae7328d3 100644 --- a/devel/ocaml-spawn/Makefile +++ b/devel/ocaml-spawn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/05 07:23:10 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.1 PKGNAME= ocaml-${DISTNAME} @@ -15,6 +15,6 @@ LICENSE= mit OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-ppx_expect/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-splittable_random/Makefile b/devel/ocaml-splittable_random/Makefile index 6b8b4d1a2fe..8b80526feed 100644 --- a/devel/ocaml-splittable_random/Makefile +++ b/devel/ocaml-splittable_random/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 17:07:55 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -21,5 +21,5 @@ OCAML_USE_DUNE= yes .include "../../devel/ocaml-ppx_inline_test/buildlink3.mk" .include "../../devel/ocaml-ppx_sexp_message/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-stdio/Makefile b/devel/ocaml-stdio/Makefile index 353d1a95cdb..5f31b244161 100644 --- a/devel/ocaml-stdio/Makefile +++ b/devel/ocaml-stdio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/05/03 09:09:08 jaapb Exp $ +# $NetBSD: Makefile,v 1.15 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,6 +16,6 @@ USE_LANGUAGES= # none OCAML_USE_FINDLIB= yes OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-stdlib-shims/Makefile b/devel/ocaml-stdlib-shims/Makefile index 327a785739d..8700aa5ead1 100644 --- a/devel/ocaml-stdlib-shims/Makefile +++ b/devel/ocaml-stdlib-shims/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/02 14:54:16 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.3.0 PKGNAME= ocaml-${DISTNAME} @@ -15,5 +15,5 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-typerep/Makefile b/devel/ocaml-typerep/Makefile index bcaa1f2490a..a734650a600 100644 --- a/devel/ocaml-typerep/Makefile +++ b/devel/ocaml-typerep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/04 18:38:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -14,6 +14,6 @@ LICENSE= mit OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-variantslib/Makefile b/devel/ocaml-variantslib/Makefile index 6cd4791e031..f731a211260 100644 --- a/devel/ocaml-variantslib/Makefile +++ b/devel/ocaml-variantslib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/04 17:24:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:32 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -14,6 +14,6 @@ LICENSE= mit OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-yojson/buildlink3.mk b/devel/ocaml-yojson/buildlink3.mk index 9ac10e5bb82..8d2184b2bdf 100644 --- a/devel/ocaml-yojson/buildlink3.mk +++ b/devel/ocaml-yojson/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2019/03/05 18:21:04 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:59:32 jaapb Exp $ BUILDLINK_TREE+= ocaml-yojson @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-yojson OCAML_YOJSON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-yojson+= ocaml-yojson>=1.7.0 -BUILDLINK_ABI_DEPENDS.ocaml-yojson+= ocaml-yojson>=1.7.0 +BUILDLINK_ABI_DEPENDS.ocaml-yojson+= ocaml-yojson>=1.7.0nb2 BUILDLINK_PKGSRCDIR.ocaml-yojson?= ../../devel/ocaml-yojson .endif # OCAML_YOJSON_BUILDLINK3_MK diff --git a/devel/ocamlgraph/buildlink3.mk b/devel/ocamlgraph/buildlink3.mk index 9da7cb72d22..a61c2c6d285 100644 --- a/devel/ocamlgraph/buildlink3.mk +++ b/devel/ocamlgraph/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/07/19 15:15:26 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= ocamlgraph @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocamlgraph OCAMLGRAPH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlgraph+= ocamlgraph>=1.8.7 -BUILDLINK_ABI_DEPENDS.ocamlgraph+= ocamlgraph>=1.8.8nb10 +BUILDLINK_ABI_DEPENDS.ocamlgraph+= ocamlgraph>=1.8.8nb33 BUILDLINK_PKGSRCDIR.ocamlgraph?= ../../devel/ocamlgraph .endif # OCAMLGRAPH_BUILDLINK3_MK diff --git a/devel/ocamlify/buildlink3.mk b/devel/ocamlify/buildlink3.mk index 582cf9eb07a..05aeef3e046 100644 --- a/devel/ocamlify/buildlink3.mk +++ b/devel/ocamlify/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2019/11/03 10:39:27 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= ocamlify @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocamlify OCAMLIFY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlify+= ocamlify>=0.0.2nb1 -BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb9 +BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb12 BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify .endif # OCAMLIFY_BUILDLINK3_MK diff --git a/devel/ocamlmod/buildlink3.mk b/devel/ocamlmod/buildlink3.mk index b202e4286d7..df03e3ac5de 100644 --- a/devel/ocamlmod/buildlink3.mk +++ b/devel/ocamlmod/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2019/11/03 10:39:27 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= ocamlmod @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocamlmod OCAMLMOD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlmod+= ocamlmod>=0.0.7nb1 -BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8nb4 +BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8nb7 BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod .endif # OCAMLMOD_BUILDLINK3_MK diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile index 4679fe56043..c5a882c0ee4 100644 --- a/devel/pcre-ocaml/Makefile +++ b/devel/pcre-ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/05/03 09:21:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.41 2022/05/24 18:59:33 jaapb Exp $ VERSION= 7.5.0 DISTNAME= pcre-${VERSION} @@ -18,7 +18,7 @@ OPAM_INSTALL_FILES= pcre USE_TOOLS= pax .include "../../mk/bsd.prefs.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" EGDIR= ${PREFIX}/share/examples/pcre-ocaml INSTALLATION_DIRS+= ${EGDIR} diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk index fffdb0f2762..c6425a33d99 100644 --- a/graphics/camlimages/buildlink3.mk +++ b/graphics/camlimages/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2018/07/19 15:15:26 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= camlimages @@ -6,7 +6,7 @@ BUILDLINK_TREE+= camlimages CAMLIMAGES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.camlimages+= camlimages>=4.0.1 -BUILDLINK_ABI_DEPENDS.camlimages+= camlimages>=4.0.1nb69 +BUILDLINK_ABI_DEPENDS.camlimages+= camlimages>=4.0.1nb98 BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages .endif # CAMLIMAGES_BUILDLINK3_MK diff --git a/graphics/ocaml-cairo/buildlink3.mk b/graphics/ocaml-cairo/buildlink3.mk index e22c4e30441..30bd81d9e7f 100644 --- a/graphics/ocaml-cairo/buildlink3.mk +++ b/graphics/ocaml-cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2022/02/28 12:55:08 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= ocaml-cairo @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-cairo OCAML_CAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-cairo+= ocaml-cairo>=0.6.1 -BUILDLINK_ABI_DEPENDS.ocaml-cairo?= ocaml-cairo>=0.6.2 +BUILDLINK_ABI_DEPENDS.ocaml-cairo?= ocaml-cairo>=0.6.2nb2 BUILDLINK_PKGSRCDIR.ocaml-cairo?= ../../graphics/ocaml-cairo .include "../../graphics/cairo/buildlink3.mk" diff --git a/math/ocaml-num/buildlink3.mk b/math/ocaml-num/buildlink3.mk index 0b7410ea822..de97a6a721d 100644 --- a/math/ocaml-num/buildlink3.mk +++ b/math/ocaml-num/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2022/03/01 09:50:00 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:59:33 jaapb Exp $ BUILDLINK_TREE+= ocaml-num @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-num OCAML_NUM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-num+= ocaml-num>=1.1 -BUILDLINK_ABI_DEPENDS.ocaml-num+= ocaml-num>=1.4 +BUILDLINK_ABI_DEPENDS.ocaml-num+= ocaml-num>=1.4nb1 BUILDLINK_PKGSRCDIR.ocaml-num?= ../../math/ocaml-num .endif # OCAML_NUM_BUILDLINK3_MK diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk index 244f80fccd0..bdc108a908b 100644 --- a/math/scilab/buildlink3.mk +++ b/math/scilab/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2018/07/19 15:15:27 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2022/05/24 18:59:33 jaapb Exp $ # BUILDLINK_TREE+= scilab @@ -7,7 +7,7 @@ BUILDLINK_TREE+= scilab SCILAB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.scilab+= scilab>=4.1 -BUILDLINK_ABI_DEPENDS.scilab+= scilab>=4.1nb25 +BUILDLINK_ABI_DEPENDS.scilab+= scilab>=4.1nb28 BUILDLINK_PKGSRCDIR.scilab?= ../../math/scilab BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl diff --git a/misc/ocaml-magic-mime/Makefile b/misc/ocaml-magic-mime/Makefile index 4e10d09fa45..b84a98798a4 100644 --- a/misc/ocaml-magic-mime/Makefile +++ b/misc/ocaml-magic-mime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/11 11:56:46 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:33 jaapb Exp $ GITHUB_PROJECT= ocaml-magic-mime GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,5 +15,5 @@ USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/ocaml-opam-file-format/Makefile b/misc/ocaml-opam-file-format/Makefile index 0b53f938210..ba0d1c1e537 100644 --- a/misc/ocaml-opam-file-format/Makefile +++ b/misc/ocaml-opam-file-format/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/05/02 12:46:54 jaapb Exp $ +# $NetBSD: Makefile,v 1.15 2022/05/24 18:59:34 jaapb Exp $ VERSION= 2.1.4 GITHUB_PROJECT= opam-file-format @@ -19,7 +19,7 @@ OCAML_USE_FINDLIB= yes INSTALL_ENV+= LIBDIR=${PREFIX}/${OCAML_SITELIBDIR} -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" BUILD_TARGET= all diff --git a/net/ocaml-conduit/Makefile b/net/ocaml-conduit/Makefile index 05b1009e782..f58fbc45fcb 100644 --- a/net/ocaml-conduit/Makefile +++ b/net/ocaml-conduit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/11 10:40:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:34 jaapb Exp $ GITHUB_PROJECT= ocaml-conduit GITHUB_TAG= v${PKGVERSION_NOREV} @@ -26,5 +26,5 @@ OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "../../devel/ocaml-sexplib/buildlink3.mk" .include "../../net/ocaml-ipaddr/buildlink3.mk" .include "../../www/ocaml-uri/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ocaml-domain-name/Makefile b/net/ocaml-domain-name/Makefile index 102a5f457f0..296fea6a895 100644 --- a/net/ocaml-domain-name/Makefile +++ b/net/ocaml-domain-name/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/05/11 08:49:56 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2022/05/24 18:59:34 jaapb Exp $ DISTNAME= ocaml-${GITHUB_PROJECT}-0.4.0 CATEGORIES= net @@ -13,5 +13,5 @@ LICENSE= isc OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile index 3d3b6f59cff..844941a5e5c 100644 --- a/net/ocaml-ipaddr/Makefile +++ b/net/ocaml-ipaddr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/05/11 08:58:03 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2022/05/24 18:59:34 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-5.3.0 CATEGORIES= net @@ -23,5 +23,5 @@ OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "../../devel/ocaml-stdlib-shims/buildlink3.mk" .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk" .include "../../net/ocaml-domain-name/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ocaml-protocol_version_header/Makefile b/net/ocaml-protocol_version_header/Makefile index a37621712b6..20c60095a31 100644 --- a/net/ocaml-protocol_version_header/Makefile +++ b/net/ocaml-protocol_version_header/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/05 08:25:44 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:34 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-core_kernel/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile index 92943c71c0d..b3f2fbabcd4 100644 --- a/net/ocamlnet/Makefile +++ b/net/ocamlnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2022/05/03 09:40:28 jaapb Exp $ +# $NetBSD: Makefile,v 1.84 2022/05/24 18:59:34 jaapb Exp $ # DISTNAME= ocamlnet-4.1.9 @@ -23,7 +23,7 @@ OCAML_FINDLIB_DIRS= \ netplex netshm netstring-pcre netstring netsys netunidata \ netzip rpc-auth-local rpc-generator rpc -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.prefs.mk" PLIST_VARS+= xti diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile index 5a488056238..e476ca02f11 100644 --- a/security/ocaml-cryptokit/Makefile +++ b/security/ocaml-cryptokit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2022/05/11 11:07:39 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2022/05/24 18:59:34 jaapb Exp $ # VERSION= 1.17 @@ -16,7 +16,7 @@ LICENSE= gnu-lgpl-v2 # with static compilation exception OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-dune-configurator/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../math/ocaml-zarith/buildlink3.mk" diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile index 093a048fb79..883b1f08b06 100644 --- a/security/ocaml-ssl/Makefile +++ b/security/ocaml-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/05/04 09:08:23 jaapb Exp $ +# $NetBSD: Makefile,v 1.41 2022/05/24 18:59:34 jaapb Exp $ # DISTNAME= ocaml-ssl-0.5.10 @@ -16,7 +16,7 @@ OCAML_USE_DUNE= yes .include "../../mk/bsd.prefs.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-dune-configurator/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/hivex/options.mk b/sysutils/hivex/options.mk index 8d41005759f..236dd8d8b61 100644 --- a/sysutils/hivex/options.mk +++ b/sysutils/hivex/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/10/04 16:01:40 tnn Exp $ +# $NetBSD: options.mk,v 1.2 2022/05/24 18:59:34 jaapb Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.hivex PKG_SUPPORTED_OPTIONS= ocaml perl python readline ruby @@ -12,7 +12,7 @@ PLIST.ocaml= yes INSTALL_ENV+= OCAML_SITELIBDIR=${OCAML_SITELIBDIR} OCAML_USE_FINDLIB= yes CONFIGURE_ARGS+= --enable-ocaml -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .else CONFIGURE_ARGS+= --disable-ocaml .endif diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile index 5ebf0798495..86c7d24b419 100644 --- a/textproc/ocaml-csv/Makefile +++ b/textproc/ocaml-csv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2022/05/19 08:22:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.27 2022/05/24 18:59:35 jaapb Exp $ VERSION= 2.4 PKGREVISION= 1 @@ -21,5 +21,5 @@ OPAM_INSTALL_FILES= ${DUNE_BUILD_PACKAGES} OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "options.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ocaml-markup/Makefile b/textproc/ocaml-markup/Makefile index ebd8cedd0ce..730f0290ab3 100644 --- a/textproc/ocaml-markup/Makefile +++ b/textproc/ocaml-markup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/05/02 18:20:27 jaapb Exp $ +# $NetBSD: Makefile,v 1.15 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= markup-1.0.3 PKGNAME= ocaml-${DISTNAME} @@ -25,5 +25,5 @@ OPAM_INSTALL_FILES= markup .include "options.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../textproc/ocaml-uutf/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ocaml-textutils/Makefile b/textproc/ocaml-textutils/Makefile index 16a21ff5eed..e98c8ccd313 100644 --- a/textproc/ocaml-textutils/Makefile +++ b/textproc/ocaml-textutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/05 11:22:01 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.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-core_unix/buildlink3.mk" diff --git a/textproc/ocaml-textutils_kernel/Makefile b/textproc/ocaml-textutils_kernel/Makefile index 34b69b5bb54..80b51ea384b 100644 --- a/textproc/ocaml-textutils_kernel/Makefile +++ b/textproc/ocaml-textutils_kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 11:08:13 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_LANGUAGES= # none OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-core/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" .include "../../textproc/ocaml-uutf/buildlink3.mk" diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile index 372b1c72e0d..6c669aa28c4 100644 --- a/textproc/ocaml-tyxml/Makefile +++ b/textproc/ocaml-tyxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/05/02 18:22:27 jaapb Exp $ +# $NetBSD: Makefile,v 1.28 2022/05/24 18:59:35 jaapb Exp $ # VERSION= 4.5.0 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --enable-syntax --bindir ${DESTDIR}${PREFIX}/bin USE_TOOLS= gmake OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-ppxlib/buildlink3.mk" .include "../../devel/ocaml-re/buildlink3.mk" .include "../../textproc/ocaml-markup/buildlink3.mk" diff --git a/textproc/ocaml-uutf/Makefile b/textproc/ocaml-uutf/Makefile index 8b46c21540a..756e207f332 100644 --- a/textproc/ocaml-uutf/Makefile +++ b/textproc/ocaml-uutf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/05/02 18:17:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= uutf-1.0.3 PKGNAME= ocaml-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= isc OCAML_USE_TOPKG= yes INSTALLATION_DIRS+= bin share/doc/uutf -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" # Normally, we'd do this using opam-installer, but that requires # this package. diff --git a/time/ocaml-time_now/Makefile b/time/ocaml-time_now/Makefile index 729108bb60d..c3d549ad89f 100644 --- a/time/ocaml-time_now/Makefile +++ b/time/ocaml-time_now/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/05/04 16:50:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= mit USE_TOOLS+= bash OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-base/buildlink3.mk" .include "../../devel/ocaml-jane-street-headers/buildlink3.mk" .include "../../devel/ocaml-jst-config/buildlink3.mk" diff --git a/time/ocaml-timezone/Makefile b/time/ocaml-timezone/Makefile index 70bdd1d2e98..39cb05fc0ac 100644 --- a/time/ocaml-timezone/Makefile +++ b/time/ocaml-timezone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/05/05 09:19:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/24 18:59:35 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-0.15.0 PKGNAME= ocaml-${DISTNAME} @@ -16,7 +16,7 @@ USE_TOOLS+= bash OCAML_USE_DUNE= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocaml-core/buildlink3.mk" .include "../../devel/ocaml-ppx_jane/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/eliom/Makefile b/www/eliom/Makefile index 21a5e0fe166..a56c530569d 100644 --- a/www/eliom/Makefile +++ b/www/eliom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2022/05/23 15:31:34 jaapb Exp $ +# $NetBSD: Makefile,v 1.36 2022/05/24 18:59:36 jaapb Exp $ # GITHUB_PROJECT= eliom @@ -18,7 +18,7 @@ UNLIMIT_RESOURCES+= stacksize DEPENDS+= ocsigen>=5.0.0:../../www/ocsigen -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" BUILD_TARGET= native diff --git a/www/ocaml-cohttp/Makefile b/www/ocaml-cohttp/Makefile index 8a4233d7909..0258f6399d1 100644 --- a/www/ocaml-cohttp/Makefile +++ b/www/ocaml-cohttp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/05/11 14:16:37 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:36 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-5.0.0 CATEGORIES= www @@ -26,5 +26,5 @@ OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "../../devel/ocaml-sexplib0/buildlink3.mk" .include "../../devel/ocaml-stringext/buildlink3.mk" .include "../../www/ocaml-uri/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ocaml-uri/Makefile b/www/ocaml-uri/Makefile index e8e28fe4494..9fd54172225 100644 --- a/www/ocaml-uri/Makefile +++ b/www/ocaml-uri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/05/11 10:27:50 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2022/05/24 18:59:36 jaapb Exp $ DISTNAME= ${GITHUB_PROJECT}-4.2.0 CATEGORIES= www @@ -22,5 +22,5 @@ OPAM_INSTALL_FILES= uri uri-sexp .include "../../devel/ocaml-re/buildlink3.mk" .include "../../devel/ocaml-sexplib0/buildlink3.mk" .include "../../devel/ocaml-stringext/buildlink3.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile index 2c433e99139..1f8c15b2680 100644 --- a/www/ocsigen/Makefile +++ b/www/ocsigen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2022/05/20 07:04:06 jaapb Exp $ +# $NetBSD: Makefile,v 1.43 2022/05/24 18:59:36 jaapb Exp $ # VERSION= 5.0.1 @@ -55,7 +55,7 @@ OCAML_USE_DUNE= yes OPAM_INSTALL_FILES= ocsigenserver INSTALL_UNSTRIPPED= yes -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" #.if ${OCAML_USE_OPT_COMPILER} == "yes" #CONFIGURE_ARGS+= --enable-natdynlink |