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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b5d773d8736
branches:  trunk
changeset: 323669:1b5d773d8736
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue May 14 15:55:44 2019 +0000

description:
Updated devel/ocaml-findlib for new x11/ocaml-graphics package.

diffstat:

 devel/ocaml-findlib/Makefile                |   4 ++--
 devel/ocaml-findlib/PLIST                   |   5 ++---
 devel/ocaml-findlib/buildlink3.mk           |   4 ++--
 devel/ocaml-findlib/distinfo                |   4 ++--
 devel/ocaml-findlib/patches/patch-configure |  22 +++++++++++++++++++++-
 5 files changed, 29 insertions(+), 10 deletions(-)

diffs (100 lines):

diff -r 201547c80b4a -r 1b5d773d8736 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Tue May 14 15:49:28 2019 +0000
+++ b/devel/ocaml-findlib/Makefile      Tue May 14 15:55:44 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2018/11/27 13:53:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/14 15:55:44 jaapb Exp $
 
 DISTNAME=              findlib-1.8.0
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 
diff -r 201547c80b4a -r 1b5d773d8736 devel/ocaml-findlib/PLIST
--- a/devel/ocaml-findlib/PLIST Tue May 14 15:49:28 2019 +0000
+++ b/devel/ocaml-findlib/PLIST Tue May 14 15:55:44 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/11/27 13:53:46 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/05/14 15:55:44 jaapb Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -29,9 +29,8 @@
 ${OCAML_SITELIB}/findlib/fl_package_base.mli
 ${OCAML_SITELIB}/findlib/topfind.cmi
 ${OCAML_SITELIB}/findlib/topfind.mli
-@optional ${OCAML_SITELIB}/graphics/META
 ${OCAML_SITELIB}/ocamldoc/META
-${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
+${PLIST.ocaml-opt}${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
 ${OCAML_SITELIB}/stdlib/META
 ${OCAML_SITELIB}/str/META
 ${OCAML_SITELIB}/threads/META
diff -r 201547c80b4a -r 1b5d773d8736 devel/ocaml-findlib/buildlink3.mk
--- a/devel/ocaml-findlib/buildlink3.mk Tue May 14 15:49:28 2019 +0000
+++ b/devel/ocaml-findlib/buildlink3.mk Tue May 14 15:55:44 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2018/11/27 13:53:46 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2019/05/14 15:55:44 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.8.0nb4
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.8.0nb5
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=    ../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=    ocaml-findlib-wrappers ocaml-findlib-ldconf
diff -r 201547c80b4a -r 1b5d773d8736 devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Tue May 14 15:49:28 2019 +0000
+++ b/devel/ocaml-findlib/distinfo      Tue May 14 15:55:44 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2018/05/08 19:06:15 jaapb Exp $
+$NetBSD: distinfo,v 1.19 2019/05/14 15:55:44 jaapb Exp $
 
 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) = 400ad416a22519e6c882df8ef2d5df8645d0d60d
+SHA1 (patch-configure) = ca920a5fa1596070d6e1ab26c69cbffa5678906a
 SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0
diff -r 201547c80b4a -r 1b5d773d8736 devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure       Tue May 14 15:49:28 2019 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Tue May 14 15:55:44 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2018/05/08 19:06:15 jaapb Exp $
+$NetBSD: patch-configure,v 1.6 2019/05/14 15:55:44 jaapb Exp $
 
 Do not install META files for libraries that were split off
 --- configure.orig     2018-04-16 08:13:23.000000000 +0000
@@ -57,3 +57,23 @@
  
  # bytes?
  
+@@ -570,13 +570,13 @@ fi
+ 
+ # graphics?
+ 
+-if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
+-    echo "graphics: found"
+-    lgraphics="graphics"
+-else
+-    echo "graphics: not found"
++#if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
++#    echo "graphics: found"
++#    lgraphics="graphics"
++#else
++#    echo "graphics: not found"
+     lgraphics=""
+-fi
++#fi
+ 
+ 
+ # Generate the META files now.