[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Updated devel/ocaml-f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cb204b4af1e
branches:  trunk
changeset: 307545:9cb204b4af1e
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue May 08 19:06:15 2018 +0000
description:
Updated devel/ocaml-findlib to version 1.8.0.

Changes include: compilation fixes for OCaml 4.06 and the upcoming
OCaml 4.07, and some other minor fixes and enhancements.

See doc/README.xml for more details.

diffstat:

 devel/ocaml-findlib/Makefile                |   5 +-
 devel/ocaml-findlib/PLIST                   |   3 +-
 devel/ocaml-findlib/buildlink3.mk           |   4 +-
 devel/ocaml-findlib/distinfo                |  12 +++---
 devel/ocaml-findlib/patches/patch-configure |  52 ++++++++++++++++++----------
 5 files changed, 45 insertions(+), 31 deletions(-)

diffs (145 lines):

diff -r af1025b31f7f -r 9cb204b4af1e devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Tue May 08 17:54:42 2018 +0000
+++ b/devel/ocaml-findlib/Makefile      Tue May 08 19:06:15 2018 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2018/04/13 13:55:31 jaapb Exp $
+# $NetBSD: Makefile,v 1.38 2018/05/08 19:06:15 jaapb Exp $
 
-DISTNAME=              findlib-1.7.3
+DISTNAME=              findlib-1.8.0
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           4
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 
diff -r af1025b31f7f -r 9cb204b4af1e devel/ocaml-findlib/PLIST
--- a/devel/ocaml-findlib/PLIST Tue May 08 17:54:42 2018 +0000
+++ b/devel/ocaml-findlib/PLIST Tue May 08 19:06:15 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2018/01/10 14:59:29 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/05/08 19:06:15 jaapb Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -29,7 +29,6 @@
 ${OCAML_SITELIB}/findlib/fl_package_base.mli
 ${OCAML_SITELIB}/findlib/topfind.cmi
 ${OCAML_SITELIB}/findlib/topfind.mli
-${OCAML_SITELIB}/graphics/META
 ${OCAML_SITELIB}/ocamldoc/META
 ${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
 ${OCAML_SITELIB}/stdlib/META
diff -r af1025b31f7f -r 9cb204b4af1e devel/ocaml-findlib/buildlink3.mk
--- a/devel/ocaml-findlib/buildlink3.mk Tue May 08 17:54:42 2018 +0000
+++ b/devel/ocaml-findlib/buildlink3.mk Tue May 08 19:06:15 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/01/22 11:14:43 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/05/08 19:06:15 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-findlib
 
@@ -6,7 +6,7 @@
 OCAML_FINDLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.7.3nb3
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.8.0
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=    ../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=    ocaml-findlib-wrappers ocaml-findlib-ldconf
diff -r af1025b31f7f -r 9cb204b4af1e devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Tue May 08 17:54:42 2018 +0000
+++ b/devel/ocaml-findlib/distinfo      Tue May 08 19:06:15 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2018/01/22 11:14:43 jaapb Exp $
+$NetBSD: distinfo,v 1.18 2018/05/08 19:06:15 jaapb Exp $
 
-SHA1 (findlib-1.7.3.tar.gz) = 8a79a305ae76be1d2939ad7ffd3e59ddd93559ef
-RMD160 (findlib-1.7.3.tar.gz) = 2b6d492fa4416b597f639c7a8a40e6f1af094d6f
-SHA512 (findlib-1.7.3.tar.gz) = 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
-Size (findlib-1.7.3.tar.gz) = 257703 bytes
+SHA1 (findlib-1.8.0.tar.gz) = 91fa957208a10c53420c30eb55d0a0c324070026
+RMD160 (findlib-1.8.0.tar.gz) = ad543ea9c62bfe4ca20389a7764ba0b03a0b3a3a
+SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48
+Size (findlib-1.8.0.tar.gz) = 260719 bytes
 SHA1 (patch-Makefile) = 72afa3c32f78183f745a63d2817fcf05154d27d3
-SHA1 (patch-configure) = f69ecc30bfde887baa21706936184fca589b2713
+SHA1 (patch-configure) = 400ad416a22519e6c882df8ef2d5df8645d0d60d
 SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0
diff -r af1025b31f7f -r 9cb204b4af1e devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure       Tue May 08 17:54:42 2018 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Tue May 08 19:06:15 2018 +0000
@@ -1,39 +1,55 @@
-$NetBSD: patch-configure,v 1.4 2018/01/22 11:14:43 jaapb Exp $
+$NetBSD: patch-configure,v 1.5 2018/05/08 19:06:15 jaapb Exp $
 
 Do not install META files for libraries that were split off
---- configure.orig     2017-06-05 14:32:28.000000000 +0000
+--- configure.orig     2018-04-16 08:13:23.000000000 +0000
 +++ configure
-@@ -514,25 +514,25 @@ fi
+@@ -518,32 +518,32 @@ fi
  
  # dbm?
  
--if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
+-if [ -f "${ocaml_sitelib}/dbm/META" ]; then
+-    echo "dbm: package already present"
+-    ldbm=""
+-elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
 -    echo "dbm: found"
 -    ldbm="dbm"
 -else
 -    echo "dbm: not present (normal since OCaml-4.00)"
-+#if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
-+#    echo "dbm: found"
-+#    ldbm="dbm"
-+#else
-+#    echo "dbm: not present (normal since OCaml-4.00)"
-     ldbm=""
+-    ldbm=""
 -fi
-+#fi
++#if [ -f "${ocaml_sitelib}/dbm/META" ]; then
++#   echo "dbm: package already present"
++#   ldbm=""
++#lif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
++#   echo "dbm: found"
++#   ldbm="dbm"
++#lse
++#   echo "dbm: not present (normal since OCaml-4.00)"
++   ldbm=""
++#i
  
  # num?
  
--if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
--    echo "num: found"
+-if [ -f "${ocaml_sitelib}/num/META" ]; then
+-    echo "num: package already present"
+-    lnum=""
+-    numtop=""
+-elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
+-    echo "num: found but not as package"
 -    lnum="num num-top"
 -    numtop="num-top"
 -else
-+#if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
-+#   echo "num: found"
-+#   lnum="num num-top"
-+#   numtop="num-top"
+-    echo "num: not present (normal since OCaml-4.06)"
++#if [ -f "${ocaml_sitelib}/num/META" ]; then
++#    echo "num: package already present"
++#    lnum=""
++#    numtop=""
++#elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
++#    echo "num: found but not as package"
++#    lnum="num num-top"
++#    numtop="num-top"
 +#else
-     echo "num: not present (normal since OCaml-4.06)"
++#    echo "num: not present (normal since OCaml-4.06)"
      lnum=""
      numtop=""
 -fi