Received: by mail.netbsd.org (Postfix, from userid 605) id B3F9084D8D; Tue, 24 May 2022 18:58:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E8CE784D6C for ; Tue, 24 May 2022 18:58:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id K7qdC3LWDWdd for ; Tue, 24 May 2022 18:58:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5569284CE2 for ; Tue, 24 May 2022 18:58:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0552DFAEB; Tue, 24 May 2022 18:59:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1653418777227210" MIME-Version: 1.0 Date: Tue, 24 May 2022 18:59:37 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20220524185938.0552DFAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1653418777227210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Tue May 24 18:59:36 UTC 2022 Modified Files: pkgsrc/archivers/ocaml-bz2: Makefile pkgsrc/archivers/ocaml-decompress: Makefile pkgsrc/archivers/ocaml-zip: Makefile pkgsrc/databases/ocaml-dbm: Makefile pkgsrc/databases/ocaml-ldap: Makefile pkgsrc/databases/ocaml-mysql: Makefile pkgsrc/databases/ocaml-sqlite3: Makefile pkgsrc/databases/ocsipersist: Makefile pkgsrc/databases/pgocaml: Makefile pkgsrc/devel/js_of_ocaml: Makefile pkgsrc/devel/js_of_ocaml-ocamlbuild: Makefile pkgsrc/devel/menhir: Makefile pkgsrc/devel/ocaml-angstrom: Makefile pkgsrc/devel/ocaml-astring: Makefile pkgsrc/devel/ocaml-async: Makefile pkgsrc/devel/ocaml-async_extra: Makefile pkgsrc/devel/ocaml-async_kernel: Makefile pkgsrc/devel/ocaml-async_rpc_kernel: Makefile pkgsrc/devel/ocaml-async_unix: Makefile pkgsrc/devel/ocaml-base: Makefile pkgsrc/devel/ocaml-base64: Makefile pkgsrc/devel/ocaml-base_bigstring: Makefile pkgsrc/devel/ocaml-base_quickcheck: Makefile pkgsrc/devel/ocaml-batteries: buildlink3.mk pkgsrc/devel/ocaml-bigarray-compat: Makefile pkgsrc/devel/ocaml-bigstringaf: Makefile pkgsrc/devel/ocaml-bin_prot: Makefile pkgsrc/devel/ocaml-biniou: buildlink3.mk pkgsrc/devel/ocaml-bos: buildlink3.mk pkgsrc/devel/ocaml-checkseum: Makefile pkgsrc/devel/ocaml-cmdliner: Makefile pkgsrc/devel/ocaml-compiler-libs: Makefile pkgsrc/devel/ocaml-core: Makefile pkgsrc/devel/ocaml-core_kernel: Makefile pkgsrc/devel/ocaml-cstruct: Makefile pkgsrc/devel/ocaml-digestif: buildlink3.mk pkgsrc/devel/ocaml-duff: buildlink3.mk pkgsrc/devel/ocaml-encore: buildlink3.mk pkgsrc/devel/ocaml-eqaf: buildlink3.mk pkgsrc/devel/ocaml-expect_test_helpers_core: Makefile pkgsrc/devel/ocaml-extlib: buildlink3.mk pkgsrc/devel/ocaml-fieldslib: Makefile pkgsrc/devel/ocaml-fmt: Makefile pkgsrc/devel/ocaml-fpath: buildlink3.mk pkgsrc/devel/ocaml-hex: Makefile pkgsrc/devel/ocaml-hmap: Makefile pkgsrc/devel/ocaml-int_repr: Makefile pkgsrc/devel/ocaml-intrinsics: Makefile pkgsrc/devel/ocaml-jane-street-headers: Makefile pkgsrc/devel/ocaml-js-build-tools: buildlink3.mk pkgsrc/devel/ocaml-jst-config: Makefile pkgsrc/devel/ocaml-ke: buildlink3.mk pkgsrc/devel/ocaml-logs: buildlink3.mk pkgsrc/devel/ocaml-lru: buildlink3.mk pkgsrc/devel/ocaml-lwt: Makefile pkgsrc/devel/ocaml-lwt_camlp4: buildlink3.mk pkgsrc/devel/ocaml-lwt_ppx: Makefile pkgsrc/devel/ocaml-lwt_react: Makefile pkgsrc/devel/ocaml-migrate-parsetree: Makefile pkgsrc/devel/ocaml-mmap: Makefile pkgsrc/devel/ocaml-ocplib-endian: Makefile pkgsrc/devel/ocaml-optcomp: buildlink3.mk pkgsrc/devel/ocaml-optint: Makefile pkgsrc/devel/ocaml-parsexp: Makefile pkgsrc/devel/ocaml-ppx_assert: Makefile pkgsrc/devel/ocaml-ppx_base: Makefile pkgsrc/devel/ocaml-ppx_bench: Makefile pkgsrc/devel/ocaml-ppx_bin_prot: Makefile pkgsrc/devel/ocaml-ppx_cold: Makefile pkgsrc/devel/ocaml-ppx_compare: Makefile pkgsrc/devel/ocaml-ppx_custom_printf: Makefile pkgsrc/devel/ocaml-ppx_deriving: Makefile pkgsrc/devel/ocaml-ppx_disable_unused_warnings: Makefile pkgsrc/devel/ocaml-ppx_enumerate: Makefile pkgsrc/devel/ocaml-ppx_expect: Makefile pkgsrc/devel/ocaml-ppx_fail: Makefile pkgsrc/devel/ocaml-ppx_fixed_literal: Makefile pkgsrc/devel/ocaml-ppx_hash: Makefile pkgsrc/devel/ocaml-ppx_here: Makefile pkgsrc/devel/ocaml-ppx_ignore_instrumentation: Makefile pkgsrc/devel/ocaml-ppx_inline_test: Makefile pkgsrc/devel/ocaml-ppx_jane: Makefile pkgsrc/devel/ocaml-ppx_let: Makefile pkgsrc/devel/ocaml-ppx_log: Makefile pkgsrc/devel/ocaml-ppx_module_timer: Makefile pkgsrc/devel/ocaml-ppx_optcomp: Makefile pkgsrc/devel/ocaml-ppx_optional: Makefile pkgsrc/devel/ocaml-ppx_pipebang: Makefile pkgsrc/devel/ocaml-ppx_sexp_conv: Makefile pkgsrc/devel/ocaml-ppx_sexp_message: Makefile pkgsrc/devel/ocaml-ppx_sexp_value: Makefile pkgsrc/devel/ocaml-ppx_stable: Makefile pkgsrc/devel/ocaml-ppx_string: Makefile pkgsrc/devel/ocaml-ppx_tools: Makefile pkgsrc/devel/ocaml-ppx_tools_versioned: buildlink3.mk pkgsrc/devel/ocaml-ppx_typerep_conv: Makefile pkgsrc/devel/ocaml-ppx_variants_conv: Makefile pkgsrc/devel/ocaml-ppxfind: buildlink3.mk pkgsrc/devel/ocaml-ppxlib: Makefile pkgsrc/devel/ocaml-psq: buildlink3.mk pkgsrc/devel/ocaml-re: Makefile pkgsrc/devel/ocaml-react: Makefile pkgsrc/devel/ocaml-reactiveData: Makefile pkgsrc/devel/ocaml-rresult: Makefile pkgsrc/devel/ocaml-seq: Makefile pkgsrc/devel/ocaml-sexp_pretty: Makefile pkgsrc/devel/ocaml-sexplib: Makefile pkgsrc/devel/ocaml-sexplib0: Makefile pkgsrc/devel/ocaml-spawn: Makefile pkgsrc/devel/ocaml-splittable_random: Makefile pkgsrc/devel/ocaml-stdio: Makefile pkgsrc/devel/ocaml-stdlib-shims: Makefile pkgsrc/devel/ocaml-typerep: Makefile pkgsrc/devel/ocaml-variantslib: Makefile pkgsrc/devel/ocaml-yojson: buildlink3.mk pkgsrc/devel/ocamlgraph: buildlink3.mk pkgsrc/devel/ocamlify: buildlink3.mk pkgsrc/devel/ocamlmod: buildlink3.mk pkgsrc/devel/pcre-ocaml: Makefile pkgsrc/graphics/camlimages: buildlink3.mk pkgsrc/graphics/ocaml-cairo: buildlink3.mk pkgsrc/math/ocaml-num: buildlink3.mk pkgsrc/math/scilab: buildlink3.mk pkgsrc/misc/ocaml-magic-mime: Makefile pkgsrc/misc/ocaml-opam-file-format: Makefile pkgsrc/net/ocaml-conduit: Makefile pkgsrc/net/ocaml-domain-name: Makefile pkgsrc/net/ocaml-ipaddr: Makefile pkgsrc/net/ocaml-protocol_version_header: Makefile pkgsrc/net/ocamlnet: Makefile pkgsrc/security/ocaml-cryptokit: Makefile pkgsrc/security/ocaml-ssl: Makefile pkgsrc/sysutils/hivex: options.mk pkgsrc/textproc/ocaml-csv: Makefile pkgsrc/textproc/ocaml-markup: Makefile pkgsrc/textproc/ocaml-textutils: Makefile pkgsrc/textproc/ocaml-textutils_kernel: Makefile pkgsrc/textproc/ocaml-tyxml: Makefile pkgsrc/textproc/ocaml-uutf: Makefile pkgsrc/time/ocaml-time_now: Makefile pkgsrc/time/ocaml-timezone: Makefile pkgsrc/www/eliom: Makefile pkgsrc/www/ocaml-cohttp: Makefile pkgsrc/www/ocaml-uri: Makefile pkgsrc/www/ocsigen: Makefile Log Message: Replaced mk/ocaml.mk with lang/ocaml/ocaml.mk in ocaml packages To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/archivers/ocaml-bz2/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/ocaml-decompress/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/archivers/ocaml-zip/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/ocaml-dbm/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/ocaml-ldap/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/ocaml-mysql/Makefile cvs rdiff -u -r1.53 -r1.54 pkgsrc/databases/ocaml-sqlite3/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/ocsipersist/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/pgocaml/Makefile cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/js_of_ocaml/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/menhir/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-angstrom/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-astring/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-async/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-async_extra/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-async_kernel/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-async_rpc_kernel/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-async_unix/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ocaml-base/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-base64/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-base_bigstring/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-base_quickcheck/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-batteries/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-bigarray-compat/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-bigstringaf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-bin_prot/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-biniou/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-bos/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-checkseum/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-cmdliner/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-compiler-libs/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-core/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-core_kernel/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-cstruct/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-digestif/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-duff/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-encore/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-eqaf/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-extlib/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-fieldslib/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-fmt/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-fpath/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-hex/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-hmap/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-int_repr/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-intrinsics/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-jane-street-headers/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-jst-config/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ke/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-logs/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-lru/buildlink3.mk cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/ocaml-lwt/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-lwt_ppx/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-lwt_react/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ocaml-migrate-parsetree/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-mmap/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ocplib-endian/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-optcomp/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-optint/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-parsexp/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_assert/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-ppx_base/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_bench/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_bin_prot/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_cold/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-ppx_compare/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_custom_printf/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-ppx_deriving/Makefile cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-ppx_enumerate/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-ppx_expect/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_fail/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-ppx_hash/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_here/Makefile cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_inline_test/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-ppx_jane/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_let/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_log/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_module_timer/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-ppx_optcomp/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_optional/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_pipebang/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_sexp_message/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_sexp_value/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-ppx_stable/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_string/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-ppx_tools/Makefile cvs rdiff -u -r1.9 -r1.10 \ pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-ppx_variants_conv/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-ppxfind/buildlink3.mk cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-ppxlib/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-psq/buildlink3.mk cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/ocaml-re/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-react/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ocaml-reactiveData/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-rresult/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-seq/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-sexp_pretty/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/ocaml-sexplib/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-sexplib0/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-spawn/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-splittable_random/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-stdio/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-stdlib-shims/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-typerep/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-variantslib/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-yojson/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocamlgraph/buildlink3.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocamlify/buildlink3.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocamlmod/buildlink3.mk cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/pcre-ocaml/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/camlimages/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/ocaml-cairo/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/ocaml-num/buildlink3.mk cvs rdiff -u -r1.16 -r1.17 pkgsrc/math/scilab/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/ocaml-magic-mime/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/ocaml-opam-file-format/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ocaml-conduit/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ocaml-domain-name/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/ocaml-ipaddr/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ocaml-protocol_version_header/Makefile cvs rdiff -u -r1.83 -r1.84 pkgsrc/net/ocamlnet/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/ocaml-cryptokit/Makefile cvs rdiff -u -r1.40 -r1.41 pkgsrc/security/ocaml-ssl/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hivex/options.mk cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/ocaml-csv/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/ocaml-markup/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ocaml-textutils/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ocaml-textutils_kernel/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/ocaml-tyxml/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/ocaml-uutf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/time/ocaml-time_now/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/ocaml-timezone/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/eliom/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/ocaml-cohttp/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ocaml-uri/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/ocsigen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1653418777227210 Content-Disposition: inline Content-Length: 108482 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/ocaml-bz2/Makefile diff -u pkgsrc/archivers/ocaml-bz2/Makefile:1.21 pkgsrc/archivers/ocaml-bz2/Makefile:1.22 --- pkgsrc/archivers/ocaml-bz2/Makefile:1.21 Tue May 3 18:29:18 2022 +++ pkgsrc/archivers/ocaml-bz2/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/archivers/ocaml-decompress/Makefile diff -u pkgsrc/archivers/ocaml-decompress/Makefile:1.3 pkgsrc/archivers/ocaml-decompress/Makefile:1.4 --- pkgsrc/archivers/ocaml-decompress/Makefile:1.3 Tue May 3 19:45:12 2022 +++ pkgsrc/archivers/ocaml-decompress/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/archivers/ocaml-zip/Makefile diff -u pkgsrc/archivers/ocaml-zip/Makefile:1.27 pkgsrc/archivers/ocaml-zip/Makefile:1.28 --- pkgsrc/archivers/ocaml-zip/Makefile:1.27 Tue May 3 09:27:09 2022 +++ pkgsrc/archivers/ocaml-zip/Makefile Tue May 24 18:59:20 2022 @@ -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 Index: pkgsrc/databases/ocaml-dbm/Makefile diff -u pkgsrc/databases/ocaml-dbm/Makefile:1.23 pkgsrc/databases/ocaml-dbm/Makefile:1.24 --- pkgsrc/databases/ocaml-dbm/Makefile:1.23 Thu May 5 06:27:39 2022 +++ pkgsrc/databases/ocaml-dbm/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/databases/ocaml-ldap/Makefile diff -u pkgsrc/databases/ocaml-ldap/Makefile:1.16 pkgsrc/databases/ocaml-ldap/Makefile:1.17 --- pkgsrc/databases/ocaml-ldap/Makefile:1.16 Wed May 4 10:06:59 2022 +++ pkgsrc/databases/ocaml-ldap/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/databases/ocaml-mysql/Makefile diff -u pkgsrc/databases/ocaml-mysql/Makefile:1.32 pkgsrc/databases/ocaml-mysql/Makefile:1.33 --- pkgsrc/databases/ocaml-mysql/Makefile:1.32 Wed May 4 12:55:21 2022 +++ pkgsrc/databases/ocaml-mysql/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/databases/ocaml-sqlite3/Makefile diff -u pkgsrc/databases/ocaml-sqlite3/Makefile:1.53 pkgsrc/databases/ocaml-sqlite3/Makefile:1.54 --- pkgsrc/databases/ocaml-sqlite3/Makefile:1.53 Wed May 4 13:10:14 2022 +++ pkgsrc/databases/ocaml-sqlite3/Makefile Tue May 24 18:59:20 2022 @@ -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" Index: pkgsrc/databases/ocsipersist/Makefile diff -u pkgsrc/databases/ocsipersist/Makefile:1.1 pkgsrc/databases/ocsipersist/Makefile:1.2 --- pkgsrc/databases/ocsipersist/Makefile:1.1 Fri May 20 06:47:28 2022 +++ pkgsrc/databases/ocsipersist/Makefile Tue May 24 18:59:20 2022 @@ -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_PACKAGE .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" Index: pkgsrc/databases/pgocaml/Makefile diff -u pkgsrc/databases/pgocaml/Makefile:1.19 pkgsrc/databases/pgocaml/Makefile:1.20 --- pkgsrc/databases/pgocaml/Makefile:1.19 Thu May 5 12:11:18 2022 +++ pkgsrc/databases/pgocaml/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/js_of_ocaml/Makefile diff -u pkgsrc/devel/js_of_ocaml/Makefile:1.40 pkgsrc/devel/js_of_ocaml/Makefile:1.41 --- pkgsrc/devel/js_of_ocaml/Makefile:1.40 Wed May 11 08:42:37 2022 +++ pkgsrc/devel/js_of_ocaml/Makefile Tue May 24 18:59:21 2022 @@ -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_FILE .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" Index: pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile diff -u pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile:1.1 pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile:1.2 --- pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile:1.1 Mon May 23 15:09:44 2022 +++ pkgsrc/devel/js_of_ocaml-ocamlbuild/Makefile Tue May 24 18:59:21 2022 @@ -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_PACKA WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-852302c8f35b946e2ec275c529a79e46d8749be6 -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/menhir/Makefile diff -u pkgsrc/devel/menhir/Makefile:1.32 pkgsrc/devel/menhir/Makefile:1.33 --- pkgsrc/devel/menhir/Makefile:1.32 Tue May 10 08:20:33 2022 +++ pkgsrc/devel/menhir/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-angstrom/Makefile diff -u pkgsrc/devel/ocaml-angstrom/Makefile:1.3 pkgsrc/devel/ocaml-angstrom/Makefile:1.4 --- pkgsrc/devel/ocaml-angstrom/Makefile:1.3 Wed May 11 10:20:21 2022 +++ pkgsrc/devel/ocaml-angstrom/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-astring/Makefile diff -u pkgsrc/devel/ocaml-astring/Makefile:1.4 pkgsrc/devel/ocaml-astring/Makefile:1.5 --- pkgsrc/devel/ocaml-astring/Makefile:1.4 Wed May 11 08:26:28 2022 +++ pkgsrc/devel/ocaml-astring/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-async/Makefile diff -u pkgsrc/devel/ocaml-async/Makefile:1.6 pkgsrc/devel/ocaml-async/Makefile:1.7 --- pkgsrc/devel/ocaml-async/Makefile:1.6 Thu May 5 11:33:13 2022 +++ pkgsrc/devel/ocaml-async/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-async_extra/Makefile diff -u pkgsrc/devel/ocaml-async_extra/Makefile:1.6 pkgsrc/devel/ocaml-async_extra/Makefile:1.7 --- pkgsrc/devel/ocaml-async_extra/Makefile:1.6 Thu May 5 10:53:17 2022 +++ pkgsrc/devel/ocaml-async_extra/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-async_kernel/Makefile diff -u pkgsrc/devel/ocaml-async_kernel/Makefile:1.4 pkgsrc/devel/ocaml-async_kernel/Makefile:1.5 --- pkgsrc/devel/ocaml-async_kernel/Makefile:1.4 Thu May 5 08:20:45 2022 +++ pkgsrc/devel/ocaml-async_kernel/Makefile Tue May 24 18:59:21 2022 @@ -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" Index: pkgsrc/devel/ocaml-async_rpc_kernel/Makefile diff -u pkgsrc/devel/ocaml-async_rpc_kernel/Makefile:1.6 pkgsrc/devel/ocaml-async_rpc_kernel/Makefile:1.7 --- pkgsrc/devel/ocaml-async_rpc_kernel/Makefile:1.6 Thu May 5 08:31:12 2022 +++ pkgsrc/devel/ocaml-async_rpc_kernel/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-async_unix/Makefile diff -u pkgsrc/devel/ocaml-async_unix/Makefile:1.7 pkgsrc/devel/ocaml-async_unix/Makefile:1.8 --- pkgsrc/devel/ocaml-async_unix/Makefile:1.7 Thu May 5 09:35:33 2022 +++ pkgsrc/devel/ocaml-async_unix/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-base/Makefile diff -u pkgsrc/devel/ocaml-base/Makefile:1.16 pkgsrc/devel/ocaml-base/Makefile:1.17 --- pkgsrc/devel/ocaml-base/Makefile:1.16 Tue May 10 08:33:34 2022 +++ pkgsrc/devel/ocaml-base/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-base64/Makefile diff -u pkgsrc/devel/ocaml-base64/Makefile:1.15 pkgsrc/devel/ocaml-base64/Makefile:1.16 --- pkgsrc/devel/ocaml-base64/Makefile:1.15 Wed May 11 13:26:05 2022 +++ pkgsrc/devel/ocaml-base64/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-base_bigstring/Makefile diff -u pkgsrc/devel/ocaml-base_bigstring/Makefile:1.3 pkgsrc/devel/ocaml-base_bigstring/Makefile:1.4 --- pkgsrc/devel/ocaml-base_bigstring/Makefile:1.3 Thu May 5 07:18:20 2022 +++ pkgsrc/devel/ocaml-base_bigstring/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-base_quickcheck/Makefile diff -u pkgsrc/devel/ocaml-base_quickcheck/Makefile:1.4 pkgsrc/devel/ocaml-base_quickcheck/Makefile:1.5 --- pkgsrc/devel/ocaml-base_quickcheck/Makefile:1.4 Wed May 4 17:12:41 2022 +++ pkgsrc/devel/ocaml-base_quickcheck/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-batteries/buildlink3.mk diff -u pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.6 pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.7 --- pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.6 Thu Mar 12 11:12:45 2020 +++ pkgsrc/devel/ocaml-batteries/buildlink3.mk Tue May 24 18:59:22 2022 @@ -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 Index: pkgsrc/devel/ocaml-bigarray-compat/Makefile diff -u pkgsrc/devel/ocaml-bigarray-compat/Makefile:1.3 pkgsrc/devel/ocaml-bigarray-compat/Makefile:1.4 --- pkgsrc/devel/ocaml-bigarray-compat/Makefile:1.3 Mon May 2 13:23:44 2022 +++ pkgsrc/devel/ocaml-bigarray-compat/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-bigstringaf/Makefile diff -u pkgsrc/devel/ocaml-bigstringaf/Makefile:1.4 pkgsrc/devel/ocaml-bigstringaf/Makefile:1.5 --- pkgsrc/devel/ocaml-bigstringaf/Makefile:1.4 Wed May 11 09:52:09 2022 +++ pkgsrc/devel/ocaml-bigstringaf/Makefile Tue May 24 18:59:22 2022 @@ -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" Index: pkgsrc/devel/ocaml-bin_prot/Makefile diff -u pkgsrc/devel/ocaml-bin_prot/Makefile:1.5 pkgsrc/devel/ocaml-bin_prot/Makefile:1.6 --- pkgsrc/devel/ocaml-bin_prot/Makefile:1.5 Sun May 15 02:19:31 2022 +++ pkgsrc/devel/ocaml-bin_prot/Makefile Tue May 24 18:59:23 2022 @@ -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" Index: pkgsrc/devel/ocaml-biniou/buildlink3.mk diff -u pkgsrc/devel/ocaml-biniou/buildlink3.mk:1.6 pkgsrc/devel/ocaml-biniou/buildlink3.mk:1.7 --- pkgsrc/devel/ocaml-biniou/buildlink3.mk:1.6 Fri Jan 31 11:32:30 2020 +++ pkgsrc/devel/ocaml-biniou/buildlink3.mk Tue May 24 18:59:23 2022 @@ -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 Index: pkgsrc/devel/ocaml-bos/buildlink3.mk diff -u pkgsrc/devel/ocaml-bos/buildlink3.mk:1.2 pkgsrc/devel/ocaml-bos/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-bos/buildlink3.mk:1.2 Sun Nov 3 10:39:22 2019 +++ pkgsrc/devel/ocaml-bos/buildlink3.mk Tue May 24 18:59:23 2022 @@ -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 Index: pkgsrc/devel/ocaml-checkseum/Makefile diff -u pkgsrc/devel/ocaml-checkseum/Makefile:1.6 pkgsrc/devel/ocaml-checkseum/Makefile:1.7 --- pkgsrc/devel/ocaml-checkseum/Makefile:1.6 Tue May 3 19:34:52 2022 +++ pkgsrc/devel/ocaml-checkseum/Makefile Tue May 24 18:59:23 2022 @@ -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" Index: pkgsrc/devel/ocaml-cmdliner/Makefile diff -u pkgsrc/devel/ocaml-cmdliner/Makefile:1.22 pkgsrc/devel/ocaml-cmdliner/Makefile:1.23 --- pkgsrc/devel/ocaml-cmdliner/Makefile:1.22 Mon May 2 18:12:13 2022 +++ pkgsrc/devel/ocaml-cmdliner/Makefile Tue May 24 18:59:23 2022 @@ -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=${D 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" Index: pkgsrc/devel/ocaml-compiler-libs/Makefile diff -u pkgsrc/devel/ocaml-compiler-libs/Makefile:1.13 pkgsrc/devel/ocaml-compiler-libs/Makefile:1.14 --- pkgsrc/devel/ocaml-compiler-libs/Makefile:1.13 Mon May 2 14:27:07 2022 +++ pkgsrc/devel/ocaml-compiler-libs/Makefile Tue May 24 18:59:23 2022 @@ -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" Index: pkgsrc/devel/ocaml-core/Makefile diff -u pkgsrc/devel/ocaml-core/Makefile:1.5 pkgsrc/devel/ocaml-core/Makefile:1.6 --- pkgsrc/devel/ocaml-core/Makefile:1.5 Thu May 5 07:58:36 2022 +++ pkgsrc/devel/ocaml-core/Makefile Tue May 24 18:59:23 2022 @@ -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" Index: pkgsrc/devel/ocaml-core_kernel/Makefile diff -u pkgsrc/devel/ocaml-core_kernel/Makefile:1.8 pkgsrc/devel/ocaml-core_kernel/Makefile:1.9 --- pkgsrc/devel/ocaml-core_kernel/Makefile:1.8 Thu May 5 08:04:05 2022 +++ pkgsrc/devel/ocaml-core_kernel/Makefile Tue May 24 18:59:23 2022 @@ -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" Index: pkgsrc/devel/ocaml-cstruct/Makefile diff -u pkgsrc/devel/ocaml-cstruct/Makefile:1.4 pkgsrc/devel/ocaml-cstruct/Makefile:1.5 --- pkgsrc/devel/ocaml-cstruct/Makefile:1.4 Thu May 5 11:40:16 2022 +++ pkgsrc/devel/ocaml-cstruct/Makefile Tue May 24 18:59:23 2022 @@ -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 .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" Index: pkgsrc/devel/ocaml-digestif/buildlink3.mk diff -u pkgsrc/devel/ocaml-digestif/buildlink3.mk:1.3 pkgsrc/devel/ocaml-digestif/buildlink3.mk:1.4 --- pkgsrc/devel/ocaml-digestif/buildlink3.mk:1.3 Mon Mar 21 07:59:31 2022 +++ pkgsrc/devel/ocaml-digestif/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-duff/buildlink3.mk diff -u pkgsrc/devel/ocaml-duff/buildlink3.mk:1.1 pkgsrc/devel/ocaml-duff/buildlink3.mk:1.2 --- pkgsrc/devel/ocaml-duff/buildlink3.mk:1.1 Tue Mar 19 11:31:30 2019 +++ pkgsrc/devel/ocaml-duff/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-encore/buildlink3.mk diff -u pkgsrc/devel/ocaml-encore/buildlink3.mk:1.2 pkgsrc/devel/ocaml-encore/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-encore/buildlink3.mk:1.2 Tue Apr 14 08:56:07 2020 +++ pkgsrc/devel/ocaml-encore/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-eqaf/buildlink3.mk diff -u pkgsrc/devel/ocaml-eqaf/buildlink3.mk:1.1 pkgsrc/devel/ocaml-eqaf/buildlink3.mk:1.2 --- pkgsrc/devel/ocaml-eqaf/buildlink3.mk:1.1 Mon Mar 25 09:30:27 2019 +++ pkgsrc/devel/ocaml-eqaf/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile diff -u pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile:1.1 pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile:1.2 --- pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile:1.1 Thu May 5 08:53:02 2022 +++ pkgsrc/devel/ocaml-expect_test_helpers_core/Makefile Tue May 24 18:59:24 2022 @@ -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" Index: pkgsrc/devel/ocaml-extlib/buildlink3.mk diff -u pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.10 pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.11 --- pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.10 Mon Mar 8 20:36:53 2021 +++ pkgsrc/devel/ocaml-extlib/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-fieldslib/Makefile diff -u pkgsrc/devel/ocaml-fieldslib/Makefile:1.4 pkgsrc/devel/ocaml-fieldslib/Makefile:1.5 --- pkgsrc/devel/ocaml-fieldslib/Makefile:1.4 Wed May 4 15:39:58 2022 +++ pkgsrc/devel/ocaml-fieldslib/Makefile Tue May 24 18:59:24 2022 @@ -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" Index: pkgsrc/devel/ocaml-fmt/Makefile diff -u pkgsrc/devel/ocaml-fmt/Makefile:1.7 pkgsrc/devel/ocaml-fmt/Makefile:1.8 --- pkgsrc/devel/ocaml-fmt/Makefile:1.7 Tue May 3 19:24:37 2022 +++ pkgsrc/devel/ocaml-fmt/Makefile Tue May 24 18:59:24 2022 @@ -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" Index: pkgsrc/devel/ocaml-fpath/buildlink3.mk diff -u pkgsrc/devel/ocaml-fpath/buildlink3.mk:1.1 pkgsrc/devel/ocaml-fpath/buildlink3.mk:1.2 --- pkgsrc/devel/ocaml-fpath/buildlink3.mk:1.1 Tue Mar 19 11:19:17 2019 +++ pkgsrc/devel/ocaml-fpath/buildlink3.mk Tue May 24 18:59:24 2022 @@ -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 Index: pkgsrc/devel/ocaml-hex/Makefile diff -u pkgsrc/devel/ocaml-hex/Makefile:1.3 pkgsrc/devel/ocaml-hex/Makefile:1.4 --- pkgsrc/devel/ocaml-hex/Makefile:1.3 Thu May 5 11:45:46 2022 +++ pkgsrc/devel/ocaml-hex/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-hmap/Makefile diff -u pkgsrc/devel/ocaml-hmap/Makefile:1.1 pkgsrc/devel/ocaml-hmap/Makefile:1.2 --- pkgsrc/devel/ocaml-hmap/Makefile:1.1 Wed May 11 11:25:03 2022 +++ pkgsrc/devel/ocaml-hmap/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-int_repr/Makefile diff -u pkgsrc/devel/ocaml-int_repr/Makefile:1.1 pkgsrc/devel/ocaml-int_repr/Makefile:1.2 --- pkgsrc/devel/ocaml-int_repr/Makefile:1.1 Thu May 5 07:02:21 2022 +++ pkgsrc/devel/ocaml-int_repr/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-intrinsics/Makefile diff -u pkgsrc/devel/ocaml-intrinsics/Makefile:1.1 pkgsrc/devel/ocaml-intrinsics/Makefile:1.2 --- pkgsrc/devel/ocaml-intrinsics/Makefile:1.1 Thu May 5 09:02:05 2022 +++ pkgsrc/devel/ocaml-intrinsics/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-jane-street-headers/Makefile diff -u pkgsrc/devel/ocaml-jane-street-headers/Makefile:1.5 pkgsrc/devel/ocaml-jane-street-headers/Makefile:1.6 --- pkgsrc/devel/ocaml-jane-street-headers/Makefile:1.5 Wed May 4 16:32:13 2022 +++ pkgsrc/devel/ocaml-jane-street-headers/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk diff -u pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk:1.4 pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk:1.5 --- pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk:1.4 Fri Dec 4 04:55:49 2020 +++ pkgsrc/devel/ocaml-js-build-tools/buildlink3.mk Tue May 24 18:59:25 2022 @@ -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 Index: pkgsrc/devel/ocaml-jst-config/Makefile diff -u pkgsrc/devel/ocaml-jst-config/Makefile:1.3 pkgsrc/devel/ocaml-jst-config/Makefile:1.4 --- pkgsrc/devel/ocaml-jst-config/Makefile:1.3 Wed May 4 16:37:41 2022 +++ pkgsrc/devel/ocaml-jst-config/Makefile Tue May 24 18:59:25 2022 @@ -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" Index: pkgsrc/devel/ocaml-ke/buildlink3.mk diff -u pkgsrc/devel/ocaml-ke/buildlink3.mk:1.1 pkgsrc/devel/ocaml-ke/buildlink3.mk:1.2 --- pkgsrc/devel/ocaml-ke/buildlink3.mk:1.1 Tue Apr 14 08:18:30 2020 +++ pkgsrc/devel/ocaml-ke/buildlink3.mk Tue May 24 18:59:25 2022 @@ -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 Index: pkgsrc/devel/ocaml-logs/buildlink3.mk diff -u pkgsrc/devel/ocaml-logs/buildlink3.mk:1.3 pkgsrc/devel/ocaml-logs/buildlink3.mk:1.4 --- pkgsrc/devel/ocaml-logs/buildlink3.mk:1.3 Thu Apr 30 13:29:07 2020 +++ pkgsrc/devel/ocaml-logs/buildlink3.mk Tue May 24 18:59:25 2022 @@ -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 Index: pkgsrc/devel/ocaml-lru/buildlink3.mk diff -u pkgsrc/devel/ocaml-lru/buildlink3.mk:1.2 pkgsrc/devel/ocaml-lru/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-lru/buildlink3.mk:1.2 Sun Nov 3 10:39:23 2019 +++ pkgsrc/devel/ocaml-lru/buildlink3.mk Tue May 24 18:59:26 2022 @@ -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 Index: pkgsrc/devel/ocaml-lwt/Makefile diff -u pkgsrc/devel/ocaml-lwt/Makefile:1.45 pkgsrc/devel/ocaml-lwt/Makefile:1.46 --- pkgsrc/devel/ocaml-lwt/Makefile:1.45 Mon May 2 14:02:09 2022 +++ pkgsrc/devel/ocaml-lwt/Makefile Tue May 24 18:59:26 2022 @@ -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_SEMANTIC 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" Index: pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk diff -u pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk:1.4 pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk:1.5 --- pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk:1.4 Sun Nov 3 10:39:24 2019 +++ pkgsrc/devel/ocaml-lwt_camlp4/buildlink3.mk Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-lwt_ppx/Makefile diff -u pkgsrc/devel/ocaml-lwt_ppx/Makefile:1.10 pkgsrc/devel/ocaml-lwt_ppx/Makefile:1.11 --- pkgsrc/devel/ocaml-lwt_ppx/Makefile:1.10 Mon May 2 14:07:16 2022 +++ pkgsrc/devel/ocaml-lwt_ppx/Makefile Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-lwt_react/Makefile diff -u pkgsrc/devel/ocaml-lwt_react/Makefile:1.11 pkgsrc/devel/ocaml-lwt_react/Makefile:1.12 --- pkgsrc/devel/ocaml-lwt_react/Makefile:1.11 Mon May 2 14:12:12 2022 +++ pkgsrc/devel/ocaml-lwt_react/Makefile Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-migrate-parsetree/Makefile diff -u pkgsrc/devel/ocaml-migrate-parsetree/Makefile:1.20 pkgsrc/devel/ocaml-migrate-parsetree/Makefile:1.21 --- pkgsrc/devel/ocaml-migrate-parsetree/Makefile:1.20 Mon May 2 13:13:34 2022 +++ pkgsrc/devel/ocaml-migrate-parsetree/Makefile Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-mmap/Makefile diff -u pkgsrc/devel/ocaml-mmap/Makefile:1.3 pkgsrc/devel/ocaml-mmap/Makefile:1.4 --- pkgsrc/devel/ocaml-mmap/Makefile:1.3 Mon May 2 13:33:00 2022 +++ pkgsrc/devel/ocaml-mmap/Makefile Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-ocplib-endian/Makefile diff -u pkgsrc/devel/ocaml-ocplib-endian/Makefile:1.4 pkgsrc/devel/ocaml-ocplib-endian/Makefile:1.5 --- pkgsrc/devel/ocaml-ocplib-endian/Makefile:1.4 Mon May 2 13:44:25 2022 +++ pkgsrc/devel/ocaml-ocplib-endian/Makefile Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-optcomp/buildlink3.mk diff -u pkgsrc/devel/ocaml-optcomp/buildlink3.mk:1.8 pkgsrc/devel/ocaml-optcomp/buildlink3.mk:1.9 --- pkgsrc/devel/ocaml-optcomp/buildlink3.mk:1.8 Thu Jul 19 15:15:23 2018 +++ pkgsrc/devel/ocaml-optcomp/buildlink3.mk Tue May 24 18:59:26 2022 @@ -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" Index: pkgsrc/devel/ocaml-optint/Makefile diff -u pkgsrc/devel/ocaml-optint/Makefile:1.6 pkgsrc/devel/ocaml-optint/Makefile:1.7 --- pkgsrc/devel/ocaml-optint/Makefile:1.6 Tue May 3 19:11:52 2022 +++ pkgsrc/devel/ocaml-optint/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-parsexp/Makefile diff -u pkgsrc/devel/ocaml-parsexp/Makefile:1.8 pkgsrc/devel/ocaml-parsexp/Makefile:1.9 --- pkgsrc/devel/ocaml-parsexp/Makefile:1.8 Wed May 4 13:25:03 2022 +++ pkgsrc/devel/ocaml-parsexp/Makefile Tue May 24 18:59:27 2022 @@ -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 f .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" Index: pkgsrc/devel/ocaml-ppx_assert/Makefile diff -u pkgsrc/devel/ocaml-ppx_assert/Makefile:1.4 pkgsrc/devel/ocaml-ppx_assert/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_assert/Makefile:1.4 Wed May 4 16:27:10 2022 +++ pkgsrc/devel/ocaml-ppx_assert/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_base/Makefile diff -u pkgsrc/devel/ocaml-ppx_base/Makefile:1.10 pkgsrc/devel/ocaml-ppx_base/Makefile:1.11 --- pkgsrc/devel/ocaml-ppx_base/Makefile:1.10 Wed May 4 15:32:22 2022 +++ pkgsrc/devel/ocaml-ppx_base/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_bench/Makefile diff -u pkgsrc/devel/ocaml-ppx_bench/Makefile:1.5 pkgsrc/devel/ocaml-ppx_bench/Makefile:1.6 --- pkgsrc/devel/ocaml-ppx_bench/Makefile:1.5 Wed May 4 17:01:19 2022 +++ pkgsrc/devel/ocaml-ppx_bench/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_bin_prot/Makefile diff -u pkgsrc/devel/ocaml-ppx_bin_prot/Makefile:1.5 pkgsrc/devel/ocaml-ppx_bin_prot/Makefile:1.6 --- pkgsrc/devel/ocaml-ppx_bin_prot/Makefile:1.5 Wed May 4 17:58:56 2022 +++ pkgsrc/devel/ocaml-ppx_bin_prot/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_cold/Makefile diff -u pkgsrc/devel/ocaml-ppx_cold/Makefile:1.4 pkgsrc/devel/ocaml-ppx_cold/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_cold/Makefile:1.4 Wed May 4 15:24:10 2022 +++ pkgsrc/devel/ocaml-ppx_cold/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_compare/Makefile diff -u pkgsrc/devel/ocaml-ppx_compare/Makefile:1.11 pkgsrc/devel/ocaml-ppx_compare/Makefile:1.12 --- pkgsrc/devel/ocaml-ppx_compare/Makefile:1.11 Wed May 4 13:57:10 2022 +++ pkgsrc/devel/ocaml-ppx_compare/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_custom_printf/Makefile diff -u pkgsrc/devel/ocaml-ppx_custom_printf/Makefile:1.4 pkgsrc/devel/ocaml-ppx_custom_printf/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_custom_printf/Makefile:1.4 Wed May 4 17:18:53 2022 +++ pkgsrc/devel/ocaml-ppx_custom_printf/Makefile Tue May 24 18:59:27 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_deriving/Makefile diff -u pkgsrc/devel/ocaml-ppx_deriving/Makefile:1.22 pkgsrc/devel/ocaml-ppx_deriving/Makefile:1.23 --- pkgsrc/devel/ocaml-ppx_deriving/Makefile:1.22 Thu May 5 11:52:00 2022 +++ pkgsrc/devel/ocaml-ppx_deriving/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile diff -u pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile:1.1 pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile:1.2 --- pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile:1.1 Thu May 5 06:36:25 2022 +++ pkgsrc/devel/ocaml-ppx_disable_unused_warnings/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_enumerate/Makefile diff -u pkgsrc/devel/ocaml-ppx_enumerate/Makefile:1.11 pkgsrc/devel/ocaml-ppx_enumerate/Makefile:1.12 --- pkgsrc/devel/ocaml-ppx_enumerate/Makefile:1.11 Wed May 4 14:11:35 2022 +++ pkgsrc/devel/ocaml-ppx_enumerate/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_expect/Makefile diff -u pkgsrc/devel/ocaml-ppx_expect/Makefile:1.6 pkgsrc/devel/ocaml-ppx_expect/Makefile:1.7 --- pkgsrc/devel/ocaml-ppx_expect/Makefile:1.6 Wed May 4 18:04:15 2022 +++ pkgsrc/devel/ocaml-ppx_expect/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_fail/Makefile diff -u pkgsrc/devel/ocaml-ppx_fail/Makefile:1.3 pkgsrc/devel/ocaml-ppx_fail/Makefile:1.4 --- pkgsrc/devel/ocaml-ppx_fail/Makefile:1.3 Wed May 4 18:16:40 2022 +++ pkgsrc/devel/ocaml-ppx_fail/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile diff -u pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile:1.1 pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile:1.2 --- pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile:1.1 Thu May 5 06:25:51 2022 +++ pkgsrc/devel/ocaml-ppx_fixed_literal/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_hash/Makefile diff -u pkgsrc/devel/ocaml-ppx_hash/Makefile:1.11 pkgsrc/devel/ocaml-ppx_hash/Makefile:1.12 --- pkgsrc/devel/ocaml-ppx_hash/Makefile:1.11 Wed May 4 15:09:51 2022 +++ pkgsrc/devel/ocaml-ppx_hash/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_here/Makefile diff -u pkgsrc/devel/ocaml-ppx_here/Makefile:1.4 pkgsrc/devel/ocaml-ppx_here/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_here/Makefile:1.4 Wed May 4 16:00:58 2022 +++ pkgsrc/devel/ocaml-ppx_here/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile diff -u pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile:1.1 pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile:1.2 --- pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile:1.1 Thu May 5 06:01:03 2022 +++ pkgsrc/devel/ocaml-ppx_ignore_instrumentation/Makefile Tue May 24 18:59:28 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_inline_test/Makefile diff -u pkgsrc/devel/ocaml-ppx_inline_test/Makefile:1.5 pkgsrc/devel/ocaml-ppx_inline_test/Makefile:1.6 --- pkgsrc/devel/ocaml-ppx_inline_test/Makefile:1.5 Wed May 4 16:55:50 2022 +++ pkgsrc/devel/ocaml-ppx_inline_test/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_jane/Makefile diff -u pkgsrc/devel/ocaml-ppx_jane/Makefile:1.6 pkgsrc/devel/ocaml-ppx_jane/Makefile:1.7 --- pkgsrc/devel/ocaml-ppx_jane/Makefile:1.6 Thu May 5 07:13:22 2022 +++ pkgsrc/devel/ocaml-ppx_jane/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_let/Makefile diff -u pkgsrc/devel/ocaml-ppx_let/Makefile:1.4 pkgsrc/devel/ocaml-ppx_let/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_let/Makefile:1.4 Wed May 4 16:07:51 2022 +++ pkgsrc/devel/ocaml-ppx_let/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_log/Makefile diff -u pkgsrc/devel/ocaml-ppx_log/Makefile:1.1 pkgsrc/devel/ocaml-ppx_log/Makefile:1.2 --- pkgsrc/devel/ocaml-ppx_log/Makefile:1.1 Thu May 5 06:10:54 2022 +++ pkgsrc/devel/ocaml-ppx_log/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_module_timer/Makefile diff -u pkgsrc/devel/ocaml-ppx_module_timer/Makefile:1.4 pkgsrc/devel/ocaml-ppx_module_timer/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_module_timer/Makefile:1.4 Wed May 4 18:10:01 2022 +++ pkgsrc/devel/ocaml-ppx_module_timer/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_optcomp/Makefile diff -u pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.19 pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.20 --- pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.19 Wed May 4 16:43:36 2022 +++ pkgsrc/devel/ocaml-ppx_optcomp/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_optional/Makefile diff -u pkgsrc/devel/ocaml-ppx_optional/Makefile:1.4 pkgsrc/devel/ocaml-ppx_optional/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_optional/Makefile:1.4 Wed May 4 18:21:38 2022 +++ pkgsrc/devel/ocaml-ppx_optional/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_pipebang/Makefile diff -u pkgsrc/devel/ocaml-ppx_pipebang/Makefile:1.3 pkgsrc/devel/ocaml-ppx_pipebang/Makefile:1.4 --- pkgsrc/devel/ocaml-ppx_pipebang/Makefile:1.3 Wed May 4 18:27:14 2022 +++ pkgsrc/devel/ocaml-ppx_pipebang/Makefile Tue May 24 18:59:29 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile diff -u pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.19 pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.20 --- pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile:1.19 Wed May 4 14:43:45 2022 +++ pkgsrc/devel/ocaml-ppx_sexp_conv/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_sexp_message/Makefile diff -u pkgsrc/devel/ocaml-ppx_sexp_message/Makefile:1.4 pkgsrc/devel/ocaml-ppx_sexp_message/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_sexp_message/Makefile:1.4 Wed May 4 16:14:30 2022 +++ pkgsrc/devel/ocaml-ppx_sexp_message/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_sexp_value/Makefile diff -u pkgsrc/devel/ocaml-ppx_sexp_value/Makefile:1.3 pkgsrc/devel/ocaml-ppx_sexp_value/Makefile:1.4 --- pkgsrc/devel/ocaml-ppx_sexp_value/Makefile:1.3 Wed May 4 16:20:15 2022 +++ pkgsrc/devel/ocaml-ppx_sexp_value/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_stable/Makefile diff -u pkgsrc/devel/ocaml-ppx_stable/Makefile:1.4 pkgsrc/devel/ocaml-ppx_stable/Makefile:1.5 --- pkgsrc/devel/ocaml-ppx_stable/Makefile:1.4 Wed May 4 18:33:21 2022 +++ pkgsrc/devel/ocaml-ppx_stable/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_string/Makefile diff -u pkgsrc/devel/ocaml-ppx_string/Makefile:1.1 pkgsrc/devel/ocaml-ppx_string/Makefile:1.2 --- pkgsrc/devel/ocaml-ppx_string/Makefile:1.1 Thu May 5 06:17:53 2022 +++ pkgsrc/devel/ocaml-ppx_string/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_tools/Makefile diff -u pkgsrc/devel/ocaml-ppx_tools/Makefile:1.19 pkgsrc/devel/ocaml-ppx_tools/Makefile:1.20 --- pkgsrc/devel/ocaml-ppx_tools/Makefile:1.19 Thu May 5 12:06:10 2022 +++ pkgsrc/devel/ocaml-ppx_tools/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk diff -u pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.9 pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.10 --- pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk:1.9 Wed Dec 9 11:28:57 2020 +++ pkgsrc/devel/ocaml-ppx_tools_versioned/buildlink3.mk Tue May 24 18:59:30 2022 @@ -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_version 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 Index: pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile diff -u pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile:1.5 pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile:1.6 --- pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile:1.5 Wed May 4 18:45:39 2022 +++ pkgsrc/devel/ocaml-ppx_typerep_conv/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppx_variants_conv/Makefile diff -u pkgsrc/devel/ocaml-ppx_variants_conv/Makefile:1.5 pkgsrc/devel/ocaml-ppx_variants_conv/Makefile:1.6 --- pkgsrc/devel/ocaml-ppx_variants_conv/Makefile:1.5 Wed May 4 17:36:36 2022 +++ pkgsrc/devel/ocaml-ppx_variants_conv/Makefile Tue May 24 18:59:30 2022 @@ -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" Index: pkgsrc/devel/ocaml-ppxfind/buildlink3.mk diff -u pkgsrc/devel/ocaml-ppxfind/buildlink3.mk:1.2 pkgsrc/devel/ocaml-ppxfind/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-ppxfind/buildlink3.mk:1.2 Thu Dec 10 08:43:15 2020 +++ pkgsrc/devel/ocaml-ppxfind/buildlink3.mk Tue May 24 18:59:31 2022 @@ -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 Index: pkgsrc/devel/ocaml-ppxlib/Makefile diff -u pkgsrc/devel/ocaml-ppxlib/Makefile:1.14 pkgsrc/devel/ocaml-ppxlib/Makefile:1.15 --- pkgsrc/devel/ocaml-ppxlib/Makefile:1.14 Mon May 2 15:04:06 2022 +++ pkgsrc/devel/ocaml-ppxlib/Makefile Tue May 24 18:59:31 2022 @@ -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" Index: pkgsrc/devel/ocaml-psq/buildlink3.mk diff -u pkgsrc/devel/ocaml-psq/buildlink3.mk:1.2 pkgsrc/devel/ocaml-psq/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-psq/buildlink3.mk:1.2 Sun Nov 3 10:39:25 2019 +++ pkgsrc/devel/ocaml-psq/buildlink3.mk Tue May 24 18:59:31 2022 @@ -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 Index: pkgsrc/devel/ocaml-re/Makefile diff -u pkgsrc/devel/ocaml-re/Makefile:1.27 pkgsrc/devel/ocaml-re/Makefile:1.28 --- pkgsrc/devel/ocaml-re/Makefile:1.27 Mon May 2 15:20:39 2022 +++ pkgsrc/devel/ocaml-re/Makefile Tue May 24 18:59:31 2022 @@ -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}/ 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" Index: pkgsrc/devel/ocaml-react/Makefile diff -u pkgsrc/devel/ocaml-react/Makefile:1.22 pkgsrc/devel/ocaml-react/Makefile:1.23 --- pkgsrc/devel/ocaml-react/Makefile:1.22 Tue May 10 08:11:07 2022 +++ pkgsrc/devel/ocaml-react/Makefile Tue May 24 18:59:31 2022 @@ -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}/ 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" Index: pkgsrc/devel/ocaml-reactiveData/Makefile diff -u pkgsrc/devel/ocaml-reactiveData/Makefile:1.16 pkgsrc/devel/ocaml-reactiveData/Makefile:1.17 --- pkgsrc/devel/ocaml-reactiveData/Makefile:1.16 Tue May 10 08:14:02 2022 +++ pkgsrc/devel/ocaml-reactiveData/Makefile Tue May 24 18:59:31 2022 @@ -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" Index: pkgsrc/devel/ocaml-rresult/Makefile diff -u pkgsrc/devel/ocaml-rresult/Makefile:1.5 pkgsrc/devel/ocaml-rresult/Makefile:1.6 --- pkgsrc/devel/ocaml-rresult/Makefile:1.5 Tue May 3 19:30:18 2022 +++ pkgsrc/devel/ocaml-rresult/Makefile Tue May 24 18:59:31 2022 @@ -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" Index: pkgsrc/devel/ocaml-seq/Makefile diff -u pkgsrc/devel/ocaml-seq/Makefile:1.4 pkgsrc/devel/ocaml-seq/Makefile:1.5 --- pkgsrc/devel/ocaml-seq/Makefile:1.4 Mon May 2 13:53:44 2022 +++ pkgsrc/devel/ocaml-seq/Makefile Tue May 24 18:59:31 2022 @@ -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" Index: pkgsrc/devel/ocaml-sexp_pretty/Makefile diff -u pkgsrc/devel/ocaml-sexp_pretty/Makefile:1.1 pkgsrc/devel/ocaml-sexp_pretty/Makefile:1.2 --- pkgsrc/devel/ocaml-sexp_pretty/Makefile:1.1 Thu May 5 08:46:43 2022 +++ pkgsrc/devel/ocaml-sexp_pretty/Makefile Tue May 24 18:59:31 2022 @@ -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" Index: pkgsrc/devel/ocaml-sexplib/Makefile diff -u pkgsrc/devel/ocaml-sexplib/Makefile:1.23 pkgsrc/devel/ocaml-sexplib/Makefile:1.24 --- pkgsrc/devel/ocaml-sexplib/Makefile:1.23 Wed May 4 13:32:12 2022 +++ pkgsrc/devel/ocaml-sexplib/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-sexplib0/Makefile diff -u pkgsrc/devel/ocaml-sexplib0/Makefile:1.9 pkgsrc/devel/ocaml-sexplib0/Makefile:1.10 --- pkgsrc/devel/ocaml-sexplib0/Makefile:1.9 Mon May 2 14:41:56 2022 +++ pkgsrc/devel/ocaml-sexplib0/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-spawn/Makefile diff -u pkgsrc/devel/ocaml-spawn/Makefile:1.4 pkgsrc/devel/ocaml-spawn/Makefile:1.5 --- pkgsrc/devel/ocaml-spawn/Makefile:1.4 Thu May 5 07:23:10 2022 +++ pkgsrc/devel/ocaml-spawn/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-splittable_random/Makefile diff -u pkgsrc/devel/ocaml-splittable_random/Makefile:1.4 pkgsrc/devel/ocaml-splittable_random/Makefile:1.5 --- pkgsrc/devel/ocaml-splittable_random/Makefile:1.4 Wed May 4 17:07:55 2022 +++ pkgsrc/devel/ocaml-splittable_random/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-stdio/Makefile diff -u pkgsrc/devel/ocaml-stdio/Makefile:1.14 pkgsrc/devel/ocaml-stdio/Makefile:1.15 --- pkgsrc/devel/ocaml-stdio/Makefile:1.14 Tue May 3 09:09:08 2022 +++ pkgsrc/devel/ocaml-stdio/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-stdlib-shims/Makefile diff -u pkgsrc/devel/ocaml-stdlib-shims/Makefile:1.4 pkgsrc/devel/ocaml-stdlib-shims/Makefile:1.5 --- pkgsrc/devel/ocaml-stdlib-shims/Makefile:1.4 Mon May 2 14:54:16 2022 +++ pkgsrc/devel/ocaml-stdlib-shims/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-typerep/Makefile diff -u pkgsrc/devel/ocaml-typerep/Makefile:1.4 pkgsrc/devel/ocaml-typerep/Makefile:1.5 --- pkgsrc/devel/ocaml-typerep/Makefile:1.4 Wed May 4 18:38:58 2022 +++ pkgsrc/devel/ocaml-typerep/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-variantslib/Makefile diff -u pkgsrc/devel/ocaml-variantslib/Makefile:1.3 pkgsrc/devel/ocaml-variantslib/Makefile:1.4 --- pkgsrc/devel/ocaml-variantslib/Makefile:1.3 Wed May 4 17:24:19 2022 +++ pkgsrc/devel/ocaml-variantslib/Makefile Tue May 24 18:59:32 2022 @@ -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" Index: pkgsrc/devel/ocaml-yojson/buildlink3.mk diff -u pkgsrc/devel/ocaml-yojson/buildlink3.mk:1.4 pkgsrc/devel/ocaml-yojson/buildlink3.mk:1.5 --- pkgsrc/devel/ocaml-yojson/buildlink3.mk:1.4 Tue Mar 5 18:21:04 2019 +++ pkgsrc/devel/ocaml-yojson/buildlink3.mk Tue May 24 18:59:32 2022 @@ -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 Index: pkgsrc/devel/ocamlgraph/buildlink3.mk diff -u pkgsrc/devel/ocamlgraph/buildlink3.mk:1.6 pkgsrc/devel/ocamlgraph/buildlink3.mk:1.7 --- pkgsrc/devel/ocamlgraph/buildlink3.mk:1.6 Thu Jul 19 15:15:26 2018 +++ pkgsrc/devel/ocamlgraph/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/devel/ocamlify/buildlink3.mk diff -u pkgsrc/devel/ocamlify/buildlink3.mk:1.7 pkgsrc/devel/ocamlify/buildlink3.mk:1.8 --- pkgsrc/devel/ocamlify/buildlink3.mk:1.7 Sun Nov 3 10:39:27 2019 +++ pkgsrc/devel/ocamlify/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/devel/ocamlmod/buildlink3.mk diff -u pkgsrc/devel/ocamlmod/buildlink3.mk:1.7 pkgsrc/devel/ocamlmod/buildlink3.mk:1.8 --- pkgsrc/devel/ocamlmod/buildlink3.mk:1.7 Sun Nov 3 10:39:27 2019 +++ pkgsrc/devel/ocamlmod/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/devel/pcre-ocaml/Makefile diff -u pkgsrc/devel/pcre-ocaml/Makefile:1.40 pkgsrc/devel/pcre-ocaml/Makefile:1.41 --- pkgsrc/devel/pcre-ocaml/Makefile:1.40 Tue May 3 09:21:36 2022 +++ pkgsrc/devel/pcre-ocaml/Makefile Tue May 24 18:59:33 2022 @@ -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} Index: pkgsrc/graphics/camlimages/buildlink3.mk diff -u pkgsrc/graphics/camlimages/buildlink3.mk:1.12 pkgsrc/graphics/camlimages/buildlink3.mk:1.13 --- pkgsrc/graphics/camlimages/buildlink3.mk:1.12 Thu Jul 19 15:15:26 2018 +++ pkgsrc/graphics/camlimages/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/graphics/ocaml-cairo/buildlink3.mk diff -u pkgsrc/graphics/ocaml-cairo/buildlink3.mk:1.3 pkgsrc/graphics/ocaml-cairo/buildlink3.mk:1.4 --- pkgsrc/graphics/ocaml-cairo/buildlink3.mk:1.3 Mon Feb 28 12:55:08 2022 +++ pkgsrc/graphics/ocaml-cairo/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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" Index: pkgsrc/math/ocaml-num/buildlink3.mk diff -u pkgsrc/math/ocaml-num/buildlink3.mk:1.4 pkgsrc/math/ocaml-num/buildlink3.mk:1.5 --- pkgsrc/math/ocaml-num/buildlink3.mk:1.4 Tue Mar 1 09:50:00 2022 +++ pkgsrc/math/ocaml-num/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/math/scilab/buildlink3.mk diff -u pkgsrc/math/scilab/buildlink3.mk:1.16 pkgsrc/math/scilab/buildlink3.mk:1.17 --- pkgsrc/math/scilab/buildlink3.mk:1.16 Thu Jul 19 15:15:27 2018 +++ pkgsrc/math/scilab/buildlink3.mk Tue May 24 18:59:33 2022 @@ -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 Index: pkgsrc/misc/ocaml-magic-mime/Makefile diff -u pkgsrc/misc/ocaml-magic-mime/Makefile:1.4 pkgsrc/misc/ocaml-magic-mime/Makefile:1.5 --- pkgsrc/misc/ocaml-magic-mime/Makefile:1.4 Wed May 11 11:56:46 2022 +++ pkgsrc/misc/ocaml-magic-mime/Makefile Tue May 24 18:59:33 2022 @@ -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" Index: pkgsrc/misc/ocaml-opam-file-format/Makefile diff -u pkgsrc/misc/ocaml-opam-file-format/Makefile:1.14 pkgsrc/misc/ocaml-opam-file-format/Makefile:1.15 --- pkgsrc/misc/ocaml-opam-file-format/Makefile:1.14 Mon May 2 12:46:54 2022 +++ pkgsrc/misc/ocaml-opam-file-format/Makefile Tue May 24 18:59:34 2022 @@ -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 Index: pkgsrc/net/ocaml-conduit/Makefile diff -u pkgsrc/net/ocaml-conduit/Makefile:1.6 pkgsrc/net/ocaml-conduit/Makefile:1.7 --- pkgsrc/net/ocaml-conduit/Makefile:1.6 Wed May 11 10:40:58 2022 +++ pkgsrc/net/ocaml-conduit/Makefile Tue May 24 18:59:34 2022 @@ -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_PACKAGE .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" Index: pkgsrc/net/ocaml-domain-name/Makefile diff -u pkgsrc/net/ocaml-domain-name/Makefile:1.3 pkgsrc/net/ocaml-domain-name/Makefile:1.4 --- pkgsrc/net/ocaml-domain-name/Makefile:1.3 Wed May 11 08:49:56 2022 +++ pkgsrc/net/ocaml-domain-name/Makefile Tue May 24 18:59:34 2022 @@ -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" Index: pkgsrc/net/ocaml-ipaddr/Makefile diff -u pkgsrc/net/ocaml-ipaddr/Makefile:1.22 pkgsrc/net/ocaml-ipaddr/Makefile:1.23 --- pkgsrc/net/ocaml-ipaddr/Makefile:1.22 Wed May 11 08:58:03 2022 +++ pkgsrc/net/ocaml-ipaddr/Makefile Tue May 24 18:59:34 2022 @@ -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_PACKAGE .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" Index: pkgsrc/net/ocaml-protocol_version_header/Makefile diff -u pkgsrc/net/ocaml-protocol_version_header/Makefile:1.4 pkgsrc/net/ocaml-protocol_version_header/Makefile:1.5 --- pkgsrc/net/ocaml-protocol_version_header/Makefile:1.4 Thu May 5 08:25:44 2022 +++ pkgsrc/net/ocaml-protocol_version_header/Makefile Tue May 24 18:59:34 2022 @@ -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" Index: pkgsrc/net/ocamlnet/Makefile diff -u pkgsrc/net/ocamlnet/Makefile:1.83 pkgsrc/net/ocamlnet/Makefile:1.84 --- pkgsrc/net/ocamlnet/Makefile:1.83 Tue May 3 09:40:28 2022 +++ pkgsrc/net/ocamlnet/Makefile Tue May 24 18:59:34 2022 @@ -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 Index: pkgsrc/security/ocaml-cryptokit/Makefile diff -u pkgsrc/security/ocaml-cryptokit/Makefile:1.25 pkgsrc/security/ocaml-cryptokit/Makefile:1.26 --- pkgsrc/security/ocaml-cryptokit/Makefile:1.25 Wed May 11 11:07:39 2022 +++ pkgsrc/security/ocaml-cryptokit/Makefile Tue May 24 18:59:34 2022 @@ -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 compi 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" Index: pkgsrc/security/ocaml-ssl/Makefile diff -u pkgsrc/security/ocaml-ssl/Makefile:1.40 pkgsrc/security/ocaml-ssl/Makefile:1.41 --- pkgsrc/security/ocaml-ssl/Makefile:1.40 Wed May 4 09:08:23 2022 +++ pkgsrc/security/ocaml-ssl/Makefile Tue May 24 18:59:34 2022 @@ -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" Index: pkgsrc/sysutils/hivex/options.mk diff -u pkgsrc/sysutils/hivex/options.mk:1.1 pkgsrc/sysutils/hivex/options.mk:1.2 --- pkgsrc/sysutils/hivex/options.mk:1.1 Thu Oct 4 16:01:40 2018 +++ pkgsrc/sysutils/hivex/options.mk Tue May 24 18:59:34 2022 @@ -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 Index: pkgsrc/textproc/ocaml-csv/Makefile diff -u pkgsrc/textproc/ocaml-csv/Makefile:1.26 pkgsrc/textproc/ocaml-csv/Makefile:1.27 --- pkgsrc/textproc/ocaml-csv/Makefile:1.26 Thu May 19 08:22:33 2022 +++ pkgsrc/textproc/ocaml-csv/Makefile Tue May 24 18:59:35 2022 @@ -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_PACKAGE OCAML_FINDLIB_DIRS= ${DUNE_BUILD_PACKAGES} .include "options.mk" -.include "../../mk/ocaml.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/ocaml-markup/Makefile diff -u pkgsrc/textproc/ocaml-markup/Makefile:1.14 pkgsrc/textproc/ocaml-markup/Makefile:1.15 --- pkgsrc/textproc/ocaml-markup/Makefile:1.14 Mon May 2 18:20:27 2022 +++ pkgsrc/textproc/ocaml-markup/Makefile Tue May 24 18:59:35 2022 @@ -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" Index: pkgsrc/textproc/ocaml-textutils/Makefile diff -u pkgsrc/textproc/ocaml-textutils/Makefile:1.6 pkgsrc/textproc/ocaml-textutils/Makefile:1.7 --- pkgsrc/textproc/ocaml-textutils/Makefile:1.6 Thu May 5 11:22:01 2022 +++ pkgsrc/textproc/ocaml-textutils/Makefile Tue May 24 18:59:35 2022 @@ -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" Index: pkgsrc/textproc/ocaml-textutils_kernel/Makefile diff -u pkgsrc/textproc/ocaml-textutils_kernel/Makefile:1.1 pkgsrc/textproc/ocaml-textutils_kernel/Makefile:1.2 --- pkgsrc/textproc/ocaml-textutils_kernel/Makefile:1.1 Thu May 5 11:08:13 2022 +++ pkgsrc/textproc/ocaml-textutils_kernel/Makefile Tue May 24 18:59:35 2022 @@ -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" Index: pkgsrc/textproc/ocaml-tyxml/Makefile diff -u pkgsrc/textproc/ocaml-tyxml/Makefile:1.27 pkgsrc/textproc/ocaml-tyxml/Makefile:1.28 --- pkgsrc/textproc/ocaml-tyxml/Makefile:1.27 Mon May 2 18:22:27 2022 +++ pkgsrc/textproc/ocaml-tyxml/Makefile Tue May 24 18:59:35 2022 @@ -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 --bindi 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" Index: pkgsrc/textproc/ocaml-uutf/Makefile diff -u pkgsrc/textproc/ocaml-uutf/Makefile:1.19 pkgsrc/textproc/ocaml-uutf/Makefile:1.20 --- pkgsrc/textproc/ocaml-uutf/Makefile:1.19 Mon May 2 18:17:18 2022 +++ pkgsrc/textproc/ocaml-uutf/Makefile Tue May 24 18:59:35 2022 @@ -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. Index: pkgsrc/time/ocaml-time_now/Makefile diff -u pkgsrc/time/ocaml-time_now/Makefile:1.5 pkgsrc/time/ocaml-time_now/Makefile:1.6 --- pkgsrc/time/ocaml-time_now/Makefile:1.5 Wed May 4 16:50:34 2022 +++ pkgsrc/time/ocaml-time_now/Makefile Tue May 24 18:59:35 2022 @@ -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" Index: pkgsrc/time/ocaml-timezone/Makefile diff -u pkgsrc/time/ocaml-timezone/Makefile:1.1 pkgsrc/time/ocaml-timezone/Makefile:1.2 --- pkgsrc/time/ocaml-timezone/Makefile:1.1 Thu May 5 09:19:34 2022 +++ pkgsrc/time/ocaml-timezone/Makefile Tue May 24 18:59:35 2022 @@ -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" Index: pkgsrc/www/eliom/Makefile diff -u pkgsrc/www/eliom/Makefile:1.35 pkgsrc/www/eliom/Makefile:1.36 --- pkgsrc/www/eliom/Makefile:1.35 Mon May 23 15:31:34 2022 +++ pkgsrc/www/eliom/Makefile Tue May 24 18:59:36 2022 @@ -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 Index: pkgsrc/www/ocaml-cohttp/Makefile diff -u pkgsrc/www/ocaml-cohttp/Makefile:1.6 pkgsrc/www/ocaml-cohttp/Makefile:1.7 --- pkgsrc/www/ocaml-cohttp/Makefile:1.6 Wed May 11 14:16:37 2022 +++ pkgsrc/www/ocaml-cohttp/Makefile Tue May 24 18:59:36 2022 @@ -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_PACKAGE .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" Index: pkgsrc/www/ocaml-uri/Makefile diff -u pkgsrc/www/ocaml-uri/Makefile:1.4 pkgsrc/www/ocaml-uri/Makefile:1.5 --- pkgsrc/www/ocaml-uri/Makefile:1.4 Wed May 11 10:27:50 2022 +++ pkgsrc/www/ocaml-uri/Makefile Tue May 24 18:59:36 2022 @@ -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" Index: pkgsrc/www/ocsigen/Makefile diff -u pkgsrc/www/ocsigen/Makefile:1.42 pkgsrc/www/ocsigen/Makefile:1.43 --- pkgsrc/www/ocsigen/Makefile:1.42 Fri May 20 07:04:06 2022 +++ pkgsrc/www/ocsigen/Makefile Tue May 24 18:59:36 2022 @@ -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 --_----------=_1653418777227210--