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.

3 files changed, 16 insertions, 17 deletions

diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index 12be2bc8e5c..03d25855798 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2021/11/01 19:50:50 wiz Exp $
 
-DISTNAME=	cmdliner-1.0.3
+DISTNAME=	cmdliner-1.0.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/cmdliner/releases/
 EXTRACT_SUFX=	.tbz
@@ -15,7 +14,7 @@ LICENSE=	isc
 USE_LANGUAGES=	c
 USE_TOOLS+=	gmake
 MAKE_JOBS_SAFE=	no
-MAKE_ENV+=	PREFIX=${PREFIX} LIBDIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner DOCDIR=${DESTDIR}${PREFIX}/share/doc/cmdliner
+MAKE_FLAGS+=	PREFIX=${PREFIX} LIBDIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner DOCDIR=${DESTDIR}${PREFIX}/share/doc/cmdliner
 
 INSTALL_TARGET=	install install-doc
 
diff --git a/devel/ocaml-cmdliner/distinfo b/devel/ocaml-cmdliner/distinfo
index 55a00ffbf73..fbe4aafcad2 100644
--- a/devel/ocaml-cmdliner/distinfo
+++ b/devel/ocaml-cmdliner/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:15:47 nia Exp $
+$NetBSD: distinfo,v 1.11 2021/11/01 19:50:50 wiz Exp $
 
-BLAKE2s (cmdliner-1.0.3.tbz) = 394692156c0bac9ba3ff9a62f0f44fe8f027ce1fdd0398f4e90aa45f59090a69
-SHA512 (cmdliner-1.0.3.tbz) = aeef78ade9acd0e084190a4ae04dab9589aef94be14e3b737592f0a5822ca747ecde7de030b70cc68316c50a1ee70eabc6eaa3b97cd572fbce85b9f019e37c3e
-Size (cmdliner-1.0.3.tbz) = 49261 bytes
-SHA1 (patch-Makefile) = b662d72eff1693e6e782a8c81bb40801ff90247a
+BLAKE2s (cmdliner-1.0.4.tbz) = 9a9462195d5ca56c1c7919111f6bf7afa6ca38d849420157aa5c29208cba7ef1
+SHA512 (cmdliner-1.0.4.tbz) = 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
+Size (cmdliner-1.0.4.tbz) = 49558 bytes
+SHA1 (patch-Makefile) = f04f85db0f29e011ae6a3d2e2a77d7e2c1b883ae
diff --git a/devel/ocaml-cmdliner/patches/patch-Makefile b/devel/ocaml-cmdliner/patches/patch-Makefile
index f107f6eebbb..4a7c907fb06 100644
--- a/devel/ocaml-cmdliner/patches/patch-Makefile
+++ b/devel/ocaml-cmdliner/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile,v 1.2 2018/11/27 15:56:11 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.3 2021/11/01 19:50:50 wiz Exp $
 
 PREFIX, LIBDIR and DOCDIR set by the package Makefile
 Use BSD_INSTALL_*
---- Makefile.orig	2018-11-26 09:20:41.000000000 +0000
+--- Makefile.orig	2019-06-14 09:55:03.000000000 +0000
 +++ Makefile
-@@ -10,9 +10,9 @@
+@@ -12,9 +12,9 @@
  
- # Adjust the following on the cli invocation for configuring
+ -include $(shell ocamlc -where)/Makefile.config
  
 -PREFIX=/usr
 -LIBDIR=$(DESTDIR)$(PREFIX)/lib/ocaml/cmdliner
@@ -15,9 +15,9 @@ Use BSD_INSTALL_*
 +#LIBDIR=$(DESTDIR)$(PREFIX)/lib/ocaml/cmdliner
 +#DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/cmdliner
  NATIVE=$(shell ocamlopt -version > /dev/null 2>&1 && echo true)
- EXT_LIB=.a
- 
-@@ -34,8 +34,8 @@ all: $(BUILD-TARGETS)
+ # EXT_LIB     by default value of OCaml's Makefile.config
+ # NATDYNLINK  by default value of OCaml's Makefile.config
+@@ -40,8 +40,8 @@ all: $(BUILD-TARGETS)
  install: $(INSTALL-TARGETS)
  
  install-doc:
@@ -28,7 +28,7 @@ Use BSD_INSTALL_*
  
  clean:
  	ocaml build.ml clean
-@@ -53,18 +53,18 @@ create-libdir:
+@@ -59,18 +59,18 @@ create-libdir:
  	$(INSTALL) -d $(LIBDIR)
  
  install-common: create-libdir