CVS commit: pkgsrc/x11/ocaml-lablgtk

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Jan 24 09:58:18 UTC 2019

Modified Files:
        pkgsrc/x11/ocaml-lablgtk: Makefile buildlink3.mk distinfo
        pkgsrc/x11/ocaml-lablgtk/patches: patch-src_Makefile
Removed Files:
        pkgsrc/x11/ocaml-lablgtk/patches: patch-src_gutf8.ml

Log Message:
Updated x11/ocaml-lablgtk to version 2.18.7

Minor changes, for example to build with ocaml 4.05.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/ocaml-lablgtk/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/ocaml-lablgtk/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_gutf8.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/ocaml-lablgtk/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/Makefile:1.48 pkgsrc/x11/ocaml-lablgtk/Makefile:1.49
--- pkgsrc/x11/ocaml-lablgtk/Makefile:1.48      Sun Dec  9 18:52:12 2018
+++ pkgsrc/x11/ocaml-lablgtk/Makefile   Thu Jan 24 09:58:18 2019
@@ -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/

Index: pkgsrc/x11/ocaml-lablgtk/buildlink3.mk
diff -u pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.34 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.35
--- pkgsrc/x11/ocaml-lablgtk/buildlink3.mk:1.34 Sun Dec  9 18:52:12 2018
+++ pkgsrc/x11/ocaml-lablgtk/buildlink3.mk      Thu Jan 24 09:58:18 2019
@@ -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 @@ 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.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

Index: pkgsrc/x11/ocaml-lablgtk/distinfo
diff -u pkgsrc/x11/ocaml-lablgtk/distinfo:1.11 pkgsrc/x11/ocaml-lablgtk/distinfo:1.12
--- pkgsrc/x11/ocaml-lablgtk/distinfo:1.11      Thu Nov  9 10:57:57 2017
+++ pkgsrc/x11/ocaml-lablgtk/distinfo   Thu Jan 24 09:58:18 2019
@@ -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

Index: pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.2 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.3
--- pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.2     Thu Jul 13 11:53:16 2017
+++ pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile Thu Jan 24 09:58:18 2019
@@ -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)" \