[pkgsrc/trunk]: pkgsrc/devel/ocaml-result Updated package devel/ocaml-result ...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f8695f5818a
branches:  trunk
changeset: 378490:9f8695f5818a
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Apr 09 09:36:08 2018 +0000

description:
Updated package devel/ocaml-result to version 1.3.

This switches the build system to jbuilder.

diffstat:

 devel/ocaml-result/Makefile               |  14 ++++----------
 devel/ocaml-result/PLIST                  |  11 +++++++----
 devel/ocaml-result/buildlink3.mk          |   4 ++--
 devel/ocaml-result/distinfo               |  11 +++++------
 devel/ocaml-result/patches/patch-Makefile |  14 --------------
 5 files changed, 18 insertions(+), 36 deletions(-)

diffs (106 lines):

diff -r bd8a8bb8a441 -r 9f8695f5818a devel/ocaml-result/Makefile
--- a/devel/ocaml-result/Makefile       Mon Apr 09 09:08:51 2018 +0000
+++ b/devel/ocaml-result/Makefile       Mon Apr 09 09:36:08 2018 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/01/10 16:53:10 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2018/04/09 09:36:08 jaapb Exp $
 
 GITHUB_PROJECT=        result
-DISTNAME=      ${GITHUB_PROJECT}-1.2
+DISTNAME=      ${GITHUB_PROJECT}-1.3
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -13,13 +12,8 @@
 LICENSE=       modified-bsd
 
 USE_LANGUAGES= # none
-OCAML_USE_FINDLIB=     yes
+OCAML_USE_JBUILDER=    yes
+INSTALLATION_DIRS+=    ${OCAML_SITELIBDIR}/result share/doc/result
 
 .include "../../mk/ocaml.mk"
-BUILD_TARGET=  byte
-.if (${OCAML_USE_OPT_COMPILER} == "yes")
-BUILD_TARGET+= native
-.endif
-BUILD_TARGET+= result.install
-
 .include "../../mk/bsd.pkg.mk"
diff -r bd8a8bb8a441 -r 9f8695f5818a devel/ocaml-result/PLIST
--- a/devel/ocaml-result/PLIST  Mon Apr 09 09:08:51 2018 +0000
+++ b/devel/ocaml-result/PLIST  Mon Apr 09 09:36:08 2018 +0000
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2016/08/17 15:55:53 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/04/09 09:36:08 jaapb Exp $
 ${OCAML_SITELIB}/result/META
+${OCAML_SITELIB}/result/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.a
 ${OCAML_SITELIB}/result/result.cma
 ${OCAML_SITELIB}/result/result.cmi
-${OCAML_SITELIB}/result/result.cmo
+${OCAML_SITELIB}/result/result.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxs
-${OCAML_SITELIB}/result/result.install
+${OCAML_SITELIB}/result/result.dune
 ${OCAML_SITELIB}/result/result.ml
-${OCAML_SITELIB}/result/result.o
+share/doc/result/CHANGES.md
+share/doc/result/LICENSE.md
+share/doc/result/README.md
diff -r bd8a8bb8a441 -r 9f8695f5818a devel/ocaml-result/buildlink3.mk
--- a/devel/ocaml-result/buildlink3.mk  Mon Apr 09 09:08:51 2018 +0000
+++ b/devel/ocaml-result/buildlink3.mk  Mon Apr 09 09:36:08 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/10 16:53:10 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/04/09 09:36:08 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-result
 
@@ -6,7 +6,7 @@
 OCAML_RESULT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-result+=   ocaml-result>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-result+=   ocaml-result>=1.2nb4
+BUILDLINK_ABI_DEPENDS.ocaml-result+=   ocaml-result>=1.3
 BUILDLINK_PKGSRCDIR.ocaml-result?=     ../../devel/ocaml-result
 .endif # OCAML_RESULT_BUILDLINK3_MK
 
diff -r bd8a8bb8a441 -r 9f8695f5818a devel/ocaml-result/distinfo
--- a/devel/ocaml-result/distinfo       Mon Apr 09 09:08:51 2018 +0000
+++ b/devel/ocaml-result/distinfo       Mon Apr 09 09:36:08 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2016/08/17 15:55:53 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2018/04/09 09:36:08 jaapb Exp $
 
-SHA1 (result-1.2.tar.gz) = f9c51e5f92035ddc2600aa69fa3325634086535d
-RMD160 (result-1.2.tar.gz) = 203c1cc5400f40d207a1b2aedc57d99f62a6ee09
-SHA512 (result-1.2.tar.gz) = b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
-Size (result-1.2.tar.gz) = 2100 bytes
-SHA1 (patch-Makefile) = 6a950a5f1fe92bcb63ab922bdda8317fa41338c7
+SHA1 (result-1.3.tar.gz) = fdcdc4e9da0a981d90e095c3656e5e6740768b4e
+RMD160 (result-1.3.tar.gz) = 83f87ad4a5440aa3bfb7f30b6c15eab132380c29
+SHA512 (result-1.3.tar.gz) = eb65e5c3e122db1bb477169d83efc7e02b0c72d3ffdb0cdadf7fc92e28c4e3843d8a0ed28133641cbcb239236fa5c83144610c5de713db5c8f63d9f433d37ba9
+Size (result-1.3.tar.gz) = 2336 bytes
diff -r bd8a8bb8a441 -r 9f8695f5818a devel/ocaml-result/patches/patch-Makefile
--- a/devel/ocaml-result/patches/patch-Makefile Mon Apr 09 09:08:51 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2016/08/17 15:55:53 jaapb Exp $
-
-Fix Makefile dependency problems.
---- Makefile.orig      2016-03-03 15:24:37.000000000 +0000
-+++ Makefile
-@@ -5,7 +5,7 @@ result.ml: which_result.ml
-       cp `ocaml which_result.ml` result.ml
- 
- .PHONY: byte
--byte: result.ml
-+byte result.cma: result.ml
-       ocamlc -c result.ml
-       ocamlc -a -o result.cma result.cmo
-