From f11e1af22c34dcc85eefb8818b9def6a45d74d38 Mon Sep 17 00:00:00 2001
From: jaapb <jaapb@pkgsrc.org>
Date: Wed, 29 Jan 2020 07:58:36 +0000
Subject: [PATCH] Updated x11/ocaml-lablgtk to version 2.18.10.

This mostly adds support for OCaml 4.10, and fixes compiler warnings.
---
 x11/ocaml-lablgtk/Makefile                   | 10 +++++-----
 x11/ocaml-lablgtk/buildlink3.mk              |  4 ++--
 x11/ocaml-lablgtk/distinfo                   | 14 +++++++-------
 x11/ocaml-lablgtk/patches/patch-configure    |  3 ++-
 x11/ocaml-lablgtk/patches/patch-src_Makefile |  3 ++-
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile
index 183c707efa96..866ec8981baf 100644
--- a/x11/ocaml-lablgtk/Makefile
+++ b/x11/ocaml-lablgtk/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.56 2020/01/18 21:48:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.57 2020/01/29 07:58:36 jaapb Exp $
 
-DISTNAME=	lablgtk-2.18.8
+GITHUB_PROJECT=	lablgtk
+DISTNAME=	${GITHUB_PROJECT}-2.18.10
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	5
 CATEGORIES=	x11
-MASTER_SITES=	https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=garrigue/}
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://lablgtk.forge.ocamlcore.org/
+HOMEPAGE=	https://lablgtk.forge.ocamlcore.org/
 COMMENT=	GTK+ 2.x bindings for Objective Caml
 # for installed files; more restrictions on applications/
 LICENSE=	gnu-lgpl-v2
diff --git a/x11/ocaml-lablgtk/buildlink3.mk b/x11/ocaml-lablgtk/buildlink3.mk
index a1e17b5fb82f..6e1d921b9553 100644
--- a/x11/ocaml-lablgtk/buildlink3.mk
+++ b/x11/ocaml-lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2020/01/18 21:48:34 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2020/01/29 07:58:36 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-lablgtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-lablgtk
 OCAML_LABLGTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lablgtk+=	ocaml-lablgtk>=2.6.0nb3
-BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+=	ocaml-lablgtk>=2.18.8nb5
+BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+=	ocaml-lablgtk>=2.18.10
 BUILDLINK_PKGSRCDIR.ocaml-lablgtk?=	../../x11/ocaml-lablgtk
 
 # options must be exposed if and only if we built with them
diff --git a/x11/ocaml-lablgtk/distinfo b/x11/ocaml-lablgtk/distinfo
index 602f5164b688..35123cbaa86f 100644
--- a/x11/ocaml-lablgtk/distinfo
+++ b/x11/ocaml-lablgtk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2019/05/01 06:41:41 wiz Exp $
+$NetBSD: distinfo,v 1.14 2020/01/29 07:58:36 jaapb Exp $
 
-SHA1 (lablgtk-2.18.8.tar.gz) = c453cabecaad1c063c8e7305dd4bf56db451afb4
-RMD160 (lablgtk-2.18.8.tar.gz) = 82d73a490a71b9978b0df275fd3ce818a2639b0e
-SHA512 (lablgtk-2.18.8.tar.gz) = 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-Size (lablgtk-2.18.8.tar.gz) = 855263 bytes
-SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99
-SHA1 (patch-src_Makefile) = 0150bef9c20e3475f4fb79d75a9a8d62314a78f0
+SHA1 (lablgtk-2.18.10.tar.gz) = 2e07b48da54c7daf7a1a0573569f97e5a293eab0
+RMD160 (lablgtk-2.18.10.tar.gz) = 9aaa162c9f6bb6b85d32c0660c26b38154b6c126
+SHA512 (lablgtk-2.18.10.tar.gz) = 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
+Size (lablgtk-2.18.10.tar.gz) = 1068504 bytes
+SHA1 (patch-configure) = ddf2a69ae3379ae656f905f573f748b3f6d66195
+SHA1 (patch-src_Makefile) = 43fc5f0cf747e588da8c39a0a55dfd09f710913a
diff --git a/x11/ocaml-lablgtk/patches/patch-configure b/x11/ocaml-lablgtk/patches/patch-configure
index 61a5766a266c..062b546462c4 100644
--- a/x11/ocaml-lablgtk/patches/patch-configure
+++ b/x11/ocaml-lablgtk/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.1 2017/07/13 11:53:16 jaapb Exp $
+$NetBSD: patch-configure,v 1.2 2020/01/29 07:58:36 jaapb Exp $
 
 The ocamlfind wrapper now includes DESTDIR, so do not use it
+
 --- configure.orig	2016-08-10 03:33:56.000000000 +0000
 +++ configure
 @@ -2679,7 +2679,7 @@ if test "$OCAMLFIND" = no; then
diff --git a/x11/ocaml-lablgtk/patches/patch-src_Makefile b/x11/ocaml-lablgtk/patches/patch-src_Makefile
index 32c096305ab9..319a4f08c001 100644
--- a/x11/ocaml-lablgtk/patches/patch-src_Makefile
+++ b/x11/ocaml-lablgtk/patches/patch-src_Makefile
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_Makefile,v 1.3 2019/01/24 09:58:18 jaapb Exp $
+$NetBSD: patch-src_Makefile,v 1.4 2020/01/29 07:58:36 jaapb Exp $
 
 Do not create an ld.conf, this is done afterwards through the PLIST
+
 --- src/Makefile.orig	2018-12-14 07:43:18.000000000 +0000
 +++ src/Makefile
 @@ -402,11 +402,7 @@ findlib-install: