head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.32 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.30 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.28 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.26 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.24 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.22 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.20 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.18 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.16 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.14 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.12 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.10 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.8 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.6 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.4 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.2 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.3.0.4 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.2 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.2.0.24 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.22 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.20 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.18 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.16 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.14 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.10 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.12 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.8 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.6 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.4 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.2 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.1.0.4 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.2 pkgsrc-2018Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2022.05.02.18.12.13; author jaapb; state Exp; branches; next 1.3; commitid 5mo9tvMRDuehDvCD; 1.3 date 2021.11.01.19.50.50; author wiz; state Exp; branches; next 1.2; commitid SV0wFfRx87qS28fD; 1.2 date 2018.11.27.15.56.11; author jaapb; state Exp; branches; next 1.1; commitid ExZTWtWwoi1l8B1B; 1.1 date 2018.04.09.08.54.36; author jaapb; state Exp; branches; next ; commitid dWq7SlyJcjbpgKxA; desc @@ 1.4 log @Updated devel/ocaml-cmdliner to version 1.1.1. There are several upstream changes, mostly minor, but 1.1.0 introduced a new Cmd module and deprecated the Term module. @ text @$NetBSD$ PREFIX, LIBDIR and DOCDIR set by the package Makefile Use BSD_INSTALL_* --- Makefile.orig 2022-02-06 14:17:34.000000000 +0000 +++ Makefile @@@@ -12,9 +12,9 @@@@ -include $(shell ocamlc -where)/Makefile.config -PREFIX=/usr -LIBDIR=$(DESTDIR)$(PREFIX)/lib/ocaml/cmdliner -DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/cmdliner +#PREFIX=/usr +#LIBDIR=$(DESTDIR)$(PREFIX)/lib/ocaml/cmdliner +#DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/cmdliner NATIVE=$(shell ocamlopt -version > /dev/null 2>&1 && echo true) # EXT_LIB by default value of OCaml's Makefile.config # NATDYNLINK by default value of OCaml's Makefile.config @@@@ -40,9 +40,9 @@@@ all: $(BUILD-TARGETS) install: $(INSTALL-TARGETS) install-doc: - $(INSTALL) -d $(DOCDIR)/odoc-pages - $(INSTALL) CHANGES.md LICENSE.md README.md $(DOCDIR) - $(INSTALL) doc/index.mld doc/cli.mld doc/examples.mld doc/tutorial.mld \ + $(BSD_INSTALL_DATA_DIR) -d $(DOCDIR)/odoc-pages + $(BSD_INSTALL_DATA) CHANGES.md LICENSE.md README.md $(DOCDIR) + $(BSD_INSTALL_DATA) doc/index.mld doc/cli.mld doc/examples.mld doc/tutorial.mld \ doc/tool_man.mld $(DOCDIR)/odoc-pages clean: @@@@ -61,18 +61,18 @@@@ create-libdir: $(INSTALL) -d $(LIBDIR) install-common: create-libdir - $(INSTALL) pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR) - $(INSTALL) cmdliner.opam $(LIBDIR)/opam + $(BSD_INSTALL_DATA) pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR) + $(BSD_INSTALL_DATA) cmdliner.opam $(LIBDIR)/opam install-byte: create-libdir - $(INSTALL) $(BASE).cma $(LIBDIR) + $(BSD_INSTALL_DATA) $(BASE).cma $(LIBDIR) install-native: create-libdir - $(INSTALL) $(BASE).cmxa $(BASE)$(EXT_LIB) $(wildcard $(B)/cmdliner*.cmx) \ + $(BSD_INSTALL_DATA) $(BASE).cmxa $(BASE)$(EXT_LIB) $(wildcard $(B)/cmdliner*.cmx) \ $(LIBDIR) install-native-dynlink: create-libdir - $(INSTALL) $(BASE).cmxs $(LIBDIR) + $(BSD_INSTALL_DATA) $(BASE).cmxs $(LIBDIR) .PHONY: all install install-doc clean build-byte build-native \ build-native-dynlink create-libdir install-common install-byte \ @ 1.3 log @ocaml-cmdliner: update to 1.0.4. v1.0.4 2019-06-14 Zagreb ------------------------ - Change the way `Error (_, e)` term evaluation results are formatted. Instead of treating `e` as text, treat it as formatted lines. - Fix 4.08 `Pervasives` deprecation. - Fix 4.03 String deprecations. - Fix boostrap build in absence of dynlink. - Make the `Makefile` bootstrap build reproducible. Thanks to Thomas Leonard for the patch. @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.2 2018/11/27 15:56:11 jaapb Exp $ d5 2 a6 1 --- Makefile.orig 2019-06-14 09:55:03.000000000 +0000 d21 1 a21 1 @@@@ -40,8 +40,8 @@@@ all: $(BUILD-TARGETS) d25 1 a25 1 - $(INSTALL) -d $(DOCDIR) d27 2 a28 1 + $(BSD_INSTALL_DATA_DIR) $(DOCDIR) d30 2 d34 1 a34 2 ocaml build.ml clean @@@@ -59,18 +59,18 @@@@ create-libdir: @ 1.2 log @Updated devel/ocaml-cmdliner to version 1.0.3. This version mostly incorporates changes to the build system (using dune, dropping support for older methods and versions of ocaml). @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- Makefile.orig 2018-11-26 09:20:41.000000000 +0000 d7 1 a7 1 @@@@ -10,9 +10,9 @@@@ d9 1 a9 1 # Adjust the following on the cli invocation for configuring d18 3 a20 3 EXT_LIB=.a @@@@ -34,8 +34,8 @@@@ all: $(BUILD-TARGETS) d31 1 a31 1 @@@@ -53,18 +53,18 @@@@ create-libdir: @ 1.1 log @Added Makefile patch to devel/ocaml-cmdliner This is to make the package install in the right directories. @ text @d3 3 a5 2 These variables are set by the package Makefile --- Makefile.orig 2017-08-07 15:10:49.000000000 +0000 d18 1 d20 35 a54 1 INSTALL=install @