CVS commit: pkgsrc/devel/ocaml-cmdliner

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Nov 27 15:56:12 UTC 2018

Modified Files:
        pkgsrc/devel/ocaml-cmdliner: Makefile buildlink3.mk distinfo
        pkgsrc/devel/ocaml-cmdliner/patches: patch-Makefile

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/ocaml-cmdliner/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-cmdliner/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-cmdliner/Makefile
diff -u pkgsrc/devel/ocaml-cmdliner/Makefile:1.18 pkgsrc/devel/ocaml-cmdliner/Makefile:1.19
--- pkgsrc/devel/ocaml-cmdliner/Makefile:1.18   Mon Nov 12 16:10:16 2018
+++ pkgsrc/devel/ocaml-cmdliner/Makefile        Tue Nov 27 15:56:11 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2018/11/12 16:10:16 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2018/11/27 15:56:11 jaapb Exp $
 
+DISTNAME=      cmdliner-1.0.3
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   4
-DISTNAME=      cmdliner-1.0.2
 CATEGORIES=    devel
 MASTER_SITES=  http://erratique.ch/software/cmdliner/releases/
 EXTRACT_SUFX=  .tbz

Index: pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
diff -u pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.13 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.14
--- pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.13      Mon Nov 12 16:10:16 2018
+++ pkgsrc/devel/ocaml-cmdliner/buildlink3.mk   Tue Nov 27 15:56:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2018/11/12 16:10:16 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/11/27 15:56:11 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-cmdliner
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-cmdliner
 OCAML_CMDLINER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cmdliner+= ocaml-cmdliner>=0.9.8
-BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.0.2nb4
+BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.0.3
 BUILDLINK_PKGSRCDIR.ocaml-cmdliner?=   ../../devel/ocaml-cmdliner
 
 .include "../../devel/ocaml-findlib/buildlink3.mk"

Index: pkgsrc/devel/ocaml-cmdliner/distinfo
diff -u pkgsrc/devel/ocaml-cmdliner/distinfo:1.7 pkgsrc/devel/ocaml-cmdliner/distinfo:1.8
--- pkgsrc/devel/ocaml-cmdliner/distinfo:1.7    Mon Apr  9 08:54:36 2018
+++ pkgsrc/devel/ocaml-cmdliner/distinfo        Tue Nov 27 15:56:11 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2018/04/09 08:54:36 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2018/11/27 15:56:11 jaapb Exp $
 
-SHA1 (cmdliner-1.0.2.tbz) = 4e54424f95ce4f805b855647d9d531dd8b5e9cae
-RMD160 (cmdliner-1.0.2.tbz) = a59d1a98f475c0bf2c51723e920c387a26921bd3
-SHA512 (cmdliner-1.0.2.tbz) = d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
-Size (cmdliner-1.0.2.tbz) = 47350 bytes
-SHA1 (patch-Makefile) = baa0c12094a435e0957cfe2dcdf2f2c8bd5eebd3
+SHA1 (cmdliner-1.0.3.tbz) = b93c3b66401e80925280515f06ffc37ceda3853d
+RMD160 (cmdliner-1.0.3.tbz) = 570fc0507b968498b56650488534ec3706bba9a1
+SHA512 (cmdliner-1.0.3.tbz) = aeef78ade9acd0e084190a4ae04dab9589aef94be14e3b737592f0a5822ca747ecde7de030b70cc68316c50a1ee70eabc6eaa3b97cd572fbce85b9f019e37c3e
+Size (cmdliner-1.0.3.tbz) = 49261 bytes
+SHA1 (patch-Makefile) = b662d72eff1693e6e782a8c81bb40801ff90247a

Index: pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.1 pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.2
--- pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.1      Mon Apr  9 08:54:36 2018
+++ pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile  Tue Nov 27 15:56:11 2018
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile,v 1.1 2018/04/09 08:54:36 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.2 2018/11/27 15:56:11 jaapb Exp $
 
-These variables are set by the package Makefile
---- Makefile.orig      2017-08-07 15:10:49.000000000 +0000
+PREFIX, LIBDIR and DOCDIR set by the package Makefile
+Use BSD_INSTALL_*
+--- Makefile.orig      2018-11-26 09:20:41.000000000 +0000
 +++ Makefile
 @@ -10,9 +10,9 @@
  
@@ -14,5 +15,40 @@ These variables are set by the package M
 +#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
  
- INSTALL=install
+@@ -34,8 +34,8 @@ all: $(BUILD-TARGETS)
+ install: $(INSTALL-TARGETS)
+ 
+ install-doc:
+-      $(INSTALL) -d $(DOCDIR)
+-      $(INSTALL) CHANGES.md LICENSE.md README.md $(DOCDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
++      $(BSD_INSTALL_DATA) CHANGES.md LICENSE.md README.md $(DOCDIR)
+ 
+ clean:
+       ocaml build.ml clean
+@@ -53,18 +53,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 \