[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Patch to devel/ocaml-findlib to no...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3156be2192f6
branches:  trunk
changeset: 374396:3156be2192f6
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Jan 22 11:14:43 2018 +0000

description:
Patch to devel/ocaml-findlib to not install num library

The num library was split off from ocaml. ocamlfind installs META files
for it if it is detected, but this is not the correct behaviour. This
patch disables detection, which is needed if package updates are to work.

diffstat:

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

diffs (86 lines):

diff -r 210009909fac -r 3156be2192f6 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Mon Jan 22 11:05:29 2018 +0000
+++ b/devel/ocaml-findlib/Makefile      Mon Jan 22 11:14:43 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2018/01/10 14:59:29 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/22 11:14:43 jaapb Exp $
 
 DISTNAME=              findlib-1.7.3
 PKGNAME=               ocaml-${DISTNAME}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 
diff -r 210009909fac -r 3156be2192f6 devel/ocaml-findlib/buildlink3.mk
--- a/devel/ocaml-findlib/buildlink3.mk Mon Jan 22 11:05:29 2018 +0000
+++ b/devel/ocaml-findlib/buildlink3.mk Mon Jan 22 11:14:43 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/10 14:59:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/01/22 11:14:43 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.3nb2
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=  ocaml-findlib>=1.7.3nb3
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=    ../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=    ocaml-findlib-wrappers ocaml-findlib-ldconf
diff -r 210009909fac -r 3156be2192f6 devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Mon Jan 22 11:05:29 2018 +0000
+++ b/devel/ocaml-findlib/distinfo      Mon Jan 22 11:14:43 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2017/07/11 09:57:11 jaapb Exp $
+$NetBSD: distinfo,v 1.17 2018/01/22 11:14:43 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 (patch-Makefile) = 72afa3c32f78183f745a63d2817fcf05154d27d3
-SHA1 (patch-configure) = 457b435a85b2575a3994cc99a5e913b02e458955
+SHA1 (patch-configure) = f69ecc30bfde887baa21706936184fca589b2713
 SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0
diff -r 210009909fac -r 3156be2192f6 devel/ocaml-findlib/patches/patch-configure
--- a/devel/ocaml-findlib/patches/patch-configure       Mon Jan 22 11:05:29 2018 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Mon Jan 22 11:14:43 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.3 2017/07/11 09:57:11 jaapb Exp $
+$NetBSD: patch-configure,v 1.4 2018/01/22 11:14:43 jaapb Exp $
 
-Do not install dbm META file even if dbm is present
---- configure.orig     2017-05-21 14:26:16.000000000 +0000
+Do not install META files for libraries that were split off
+--- configure.orig     2017-06-05 14:32:28.000000000 +0000
 +++ configure
-@@ -514,13 +514,13 @@ fi
+@@ -514,25 +514,25 @@ fi
  
  # dbm?
  
@@ -23,3 +23,21 @@
  
  # num?
  
+-if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
+-    echo "num: found"
+-    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"
++#else
+     echo "num: not present (normal since OCaml-4.06)"
+     lnum=""
+     numtop=""
+-fi
++#fi
+ 
+ # bytes?
+