[pkgsrc/trunk]: pkgsrc/x11/ocaml-lablgtk Updated x11/ocaml-lablgtk to version...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/252ce470a5ed
branches:  trunk
changeset: 318341:252ce470a5ed
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Jan 24 09:58:18 2019 +0000

description:
Updated x11/ocaml-lablgtk to version 2.18.7

Minor changes, for example to build with ocaml 4.05.

diffstat:

 x11/ocaml-lablgtk/Makefile                   |   7 +++----
 x11/ocaml-lablgtk/buildlink3.mk              |   4 ++--
 x11/ocaml-lablgtk/distinfo                   |  13 ++++++-------
 x11/ocaml-lablgtk/patches/patch-src_Makefile |   7 ++++---
 x11/ocaml-lablgtk/patches/patch-src_gutf8.ml |  22 ----------------------
 5 files changed, 15 insertions(+), 38 deletions(-)

diffs (101 lines):

diff -r 30c320eddd68 -r 252ce470a5ed x11/ocaml-lablgtk/Makefile
--- a/x11/ocaml-lablgtk/Makefile        Thu Jan 24 09:35:07 2019 +0000
+++ b/x11/ocaml-lablgtk/Makefile        Thu Jan 24 09:58:18 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2018/12/09 18:52:12 adam Exp $
+# $NetBSD: Makefile,v 1.49 2019/01/24 09:58:18 jaapb Exp $
 
-DISTNAME=      lablgtk-2.18.6
+DISTNAME=      lablgtk-2.18.7
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   18
 CATEGORIES=    x11
-MASTER_SITES=  https://forge.ocamlcore.org/frs/download.php/1726/
+MASTER_SITES=  https://forge.ocamlcore.org/frs/download.php/1773/
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      http://lablgtk.forge.ocamlcore.org/
diff -r 30c320eddd68 -r 252ce470a5ed x11/ocaml-lablgtk/buildlink3.mk
--- a/x11/ocaml-lablgtk/buildlink3.mk   Thu Jan 24 09:35:07 2019 +0000
+++ b/x11/ocaml-lablgtk/buildlink3.mk   Thu Jan 24 09:58:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2018/12/09 18:52:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2019/01/24 09:58:18 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-lablgtk
 
@@ -6,7 +6,7 @@
 OCAML_LABLGTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lablgtk+=  ocaml-lablgtk>=2.6.0nb3
-BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+=  ocaml-lablgtk>=2.18.6nb18
+BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+=  ocaml-lablgtk>=2.18.7
 BUILDLINK_PKGSRCDIR.ocaml-lablgtk?=    ../../x11/ocaml-lablgtk
 
 # options must be exposed if and only if we built with them
diff -r 30c320eddd68 -r 252ce470a5ed x11/ocaml-lablgtk/distinfo
--- a/x11/ocaml-lablgtk/distinfo        Thu Jan 24 09:35:07 2019 +0000
+++ b/x11/ocaml-lablgtk/distinfo        Thu Jan 24 09:58:18 2019 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2017/11/09 10:57:57 jaapb Exp $
+$NetBSD: distinfo,v 1.12 2019/01/24 09:58:18 jaapb Exp $
 
-SHA1 (lablgtk-2.18.6.tar.gz) = 2dd099ecca246274df8f6f363c8d418ff3a67568
-RMD160 (lablgtk-2.18.6.tar.gz) = 6fef28c6ec2757da3e0773d33c77c13abaf61895
-SHA512 (lablgtk-2.18.6.tar.gz) = 0d30da0e4a93b1693ac6d63161d40c8cd6d9337e105a65f3cc01b013ce7ca04aa5e1a013527cb0728a9b7b7af20d0f4c8b0cc7f9102e553dff3cf8bc83a14e5e
-Size (lablgtk-2.18.6.tar.gz) = 804837 bytes
+SHA1 (lablgtk-2.18.7.tar.gz) = d8bca21927f0e3d9d1e352c4a8295585ef18c4fe
+RMD160 (lablgtk-2.18.7.tar.gz) = 5cf1d7c89302a54233f7e43e04748e1ed92da2f1
+SHA512 (lablgtk-2.18.7.tar.gz) = b5be516dc9deb89e5d097ddd700f1623df4949735ceff9e543559b4d997d1eaab4d9bc55f75d457db103dbcd122502eb60a96c96b7a08f28d002f9311459dff8
+Size (lablgtk-2.18.7.tar.gz) = 855211 bytes
 SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99
-SHA1 (patch-src_Makefile) = 5cdcc55b1b2be61bf7303c1f5fb28bb02d931aae
-SHA1 (patch-src_gutf8.ml) = a813e6b7dc3944a23b4b069c9484417a592c42e8
+SHA1 (patch-src_Makefile) = 0150bef9c20e3475f4fb79d75a9a8d62314a78f0
diff -r 30c320eddd68 -r 252ce470a5ed x11/ocaml-lablgtk/patches/patch-src_Makefile
--- a/x11/ocaml-lablgtk/patches/patch-src_Makefile      Thu Jan 24 09:35:07 2019 +0000
+++ b/x11/ocaml-lablgtk/patches/patch-src_Makefile      Thu Jan 24 09:58:18 2019 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/07/13 11:53:16 jaapb Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2019/01/24 09:58:18 jaapb Exp $
 
 Do not create an ld.conf, this is done afterwards through the PLIST
---- src/Makefile.orig  2016-08-10 03:33:56.000000000 +0000
+--- src/Makefile.orig  2018-12-14 07:43:18.000000000 +0000
 +++ src/Makefile
-@@ -402,10 +402,7 @@ findlib-install:
+@@ -402,11 +402,7 @@ findlib-install:
          exit 2; fi
        mkdir -p "$(BINDIR)"
        mkdir -p "$(DESTDIR)$(FINDLIBDIR)"
 -      @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \
+-        mkdir -p "`dirname $(DESTDIR)$(OCAMLLDCONF)`"; \
 -        touch "$(DESTDIR)$(OCAMLLDCONF)"; fi
 -      $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \
 -        -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \
diff -r 30c320eddd68 -r 252ce470a5ed x11/ocaml-lablgtk/patches/patch-src_gutf8.ml
--- a/x11/ocaml-lablgtk/patches/patch-src_gutf8.ml      Thu Jan 24 09:35:07 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_gutf8.ml,v 1.1 2017/11/09 10:57:57 jaapb Exp $
-
-Patch to compile with OCaml 4.05 (remove for 4.06!)
---- src/gutf8.ml.orig  2017-10-30 08:37:29.000000000 +0000
-+++ src/gutf8.ml
-@@ -68,14 +68,14 @@ let write_unichar s ~pos (c : unichar) =
- let from_unichar (n : unichar) =
-   let s = Bytes.create 6 and pos = ref 0 in
-   write_unichar s ~pos n;
--  Bytes.sub_string s ~pos:0 ~len:!pos
-+  Bytes.sub_string s 0 !pos
- 
- let from_unistring (s : unistring) =
-   let len = Array.length s in
-   let r = Bytes.create (len*6) in
-   let pos = ref 0 in
-   for i = 0 to len-1 do write_unichar r ~pos s.(i) done;
--  Bytes.sub_string r ~pos:0 ~len:!pos
-+  Bytes.sub_string r 0 !pos
- 
- let rec hi_bits n =
-   if n land 0x80 = 0 then 0 else