Thu Jan 24 09:58:18 2019 UTC ()
Updated x11/ocaml-lablgtk to version 2.18.7

Minor changes, for example to build with ocaml 4.05.


(jaapb)
diff -r1.48 -r1.49 pkgsrc/x11/ocaml-lablgtk/Makefile
diff -r1.34 -r1.35 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk
diff -r1.11 -r1.12 pkgsrc/x11/ocaml-lablgtk/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile
diff -r1.1 -r0 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_gutf8.ml
cvs diff -r1.48 -r1.49 pkgsrc/x11/ocaml-lablgtk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/Makefile 2018/12/09 18:52:12 1.48
+++ pkgsrc/x11/ocaml-lablgtk/Makefile 2019/01/24 09:58:18 1.49
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.48 2018/12/09 18:52:12 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2019/01/24 09:58:18 jaapb Exp $
2 2
3DISTNAME= lablgtk-2.18.6 3DISTNAME= lablgtk-2.18.7
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 18 
6CATEGORIES= x11 5CATEGORIES= x11
7MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/1726/ 6MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/1773/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://lablgtk.forge.ocamlcore.org/ 9HOMEPAGE= http://lablgtk.forge.ocamlcore.org/
11COMMENT= GTK+ 2.x bindings for Objective Caml 10COMMENT= GTK+ 2.x bindings for Objective Caml
12# for installed files; more restrictions on applications/ 11# for installed files; more restrictions on applications/
13LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --enable-debug 15CONFIGURE_ARGS+= --enable-debug
17USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
18OCAML_USE_FINDLIB= yes 17OCAML_USE_FINDLIB= yes
19OCAML_FINDLIB_DIRS= lablgtk2 18OCAML_FINDLIB_DIRS= lablgtk2
20 19
cvs diff -r1.34 -r1.35 pkgsrc/x11/ocaml-lablgtk/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/buildlink3.mk 2018/12/09 18:52:12 1.34
+++ pkgsrc/x11/ocaml-lablgtk/buildlink3.mk 2019/01/24 09:58:18 1.35
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.34 2018/12/09 18:52:12 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.35 2019/01/24 09:58:18 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-lablgtk 3BUILDLINK_TREE+= ocaml-lablgtk
4 4
5.if !defined(OCAML_LABLGTK_BUILDLINK3_MK) 5.if !defined(OCAML_LABLGTK_BUILDLINK3_MK)
6OCAML_LABLGTK_BUILDLINK3_MK:= 6OCAML_LABLGTK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.6.0nb3 8BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.6.0nb3
9BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.18.6nb18 9BUILDLINK_ABI_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.18.7
10BUILDLINK_PKGSRCDIR.ocaml-lablgtk?= ../../x11/ocaml-lablgtk 10BUILDLINK_PKGSRCDIR.ocaml-lablgtk?= ../../x11/ocaml-lablgtk
11 11
12# options must be exposed if and only if we built with them 12# options must be exposed if and only if we built with them
13pkgbase := ocaml-lablgtk 13pkgbase := ocaml-lablgtk
14.include "../../mk/pkg-build-options.mk" 14.include "../../mk/pkg-build-options.mk"
15 15
16.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgnomecanvas) 16.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgnomecanvas)
17. include "../../graphics/libgnomecanvas/buildlink3.mk" 17. include "../../graphics/libgnomecanvas/buildlink3.mk"
18.endif 18.endif
19 19
20.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgtksourceview) 20.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk:Mgtksourceview)
21. include "../../x11/gtksourceview/buildlink3.mk" 21. include "../../x11/gtksourceview/buildlink3.mk"
22.endif 22.endif
cvs diff -r1.11 -r1.12 pkgsrc/x11/ocaml-lablgtk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/distinfo 2017/11/09 10:57:57 1.11
+++ pkgsrc/x11/ocaml-lablgtk/distinfo 2019/01/24 09:58:18 1.12
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.11 2017/11/09 10:57:57 jaapb Exp $ 1$NetBSD: distinfo,v 1.12 2019/01/24 09:58:18 jaapb Exp $
2 2
3SHA1 (lablgtk-2.18.6.tar.gz) = 2dd099ecca246274df8f6f363c8d418ff3a67568 3SHA1 (lablgtk-2.18.7.tar.gz) = d8bca21927f0e3d9d1e352c4a8295585ef18c4fe
4RMD160 (lablgtk-2.18.6.tar.gz) = 6fef28c6ec2757da3e0773d33c77c13abaf61895 4RMD160 (lablgtk-2.18.7.tar.gz) = 5cf1d7c89302a54233f7e43e04748e1ed92da2f1
5SHA512 (lablgtk-2.18.6.tar.gz) = 0d30da0e4a93b1693ac6d63161d40c8cd6d9337e105a65f3cc01b013ce7ca04aa5e1a013527cb0728a9b7b7af20d0f4c8b0cc7f9102e553dff3cf8bc83a14e5e 5SHA512 (lablgtk-2.18.7.tar.gz) = b5be516dc9deb89e5d097ddd700f1623df4949735ceff9e543559b4d997d1eaab4d9bc55f75d457db103dbcd122502eb60a96c96b7a08f28d002f9311459dff8
6Size (lablgtk-2.18.6.tar.gz) = 804837 bytes 6Size (lablgtk-2.18.7.tar.gz) = 855211 bytes
7SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99 7SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99
8SHA1 (patch-src_Makefile) = 5cdcc55b1b2be61bf7303c1f5fb28bb02d931aae 8SHA1 (patch-src_Makefile) = 0150bef9c20e3475f4fb79d75a9a8d62314a78f0
9SHA1 (patch-src_gutf8.ml) = a813e6b7dc3944a23b4b069c9484417a592c42e8 
cvs diff -r1.2 -r1.3 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile 2017/07/13 11:53:16 1.2
+++ pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile 2019/01/24 09:58:18 1.3
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-src_Makefile,v 1.2 2017/07/13 11:53:16 jaapb Exp $ 1$NetBSD: patch-src_Makefile,v 1.3 2019/01/24 09:58:18 jaapb Exp $
2 2
3Do not create an ld.conf, this is done afterwards through the PLIST 3Do not create an ld.conf, this is done afterwards through the PLIST
4--- src/Makefile.orig 2016-08-10 03:33:56.000000000 +0000 4--- src/Makefile.orig 2018-12-14 07:43:18.000000000 +0000
5+++ src/Makefile 5+++ src/Makefile
6@@ -402,10 +402,7 @@ findlib-install: 6@@ -402,11 +402,7 @@ findlib-install:
7 exit 2; fi 7 exit 2; fi
8 mkdir -p "$(BINDIR)" 8 mkdir -p "$(BINDIR)"
9 mkdir -p "$(DESTDIR)$(FINDLIBDIR)" 9 mkdir -p "$(DESTDIR)$(FINDLIBDIR)"
10- @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ 10- @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \
 11- mkdir -p "`dirname $(DESTDIR)$(OCAMLLDCONF)`"; \
11- touch "$(DESTDIR)$(OCAMLLDCONF)"; fi 12- touch "$(DESTDIR)$(OCAMLLDCONF)"; fi
12- $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ 13- $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \
13- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ 14- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \
14+ $(OCAMLFIND) install \ 15+ $(OCAMLFIND) install \
15 lablgtk2 ../META \ 16 lablgtk2 ../META \
16 build.ml \ 17 build.ml \
17 $(CLIBS) \ 18 $(CLIBS) \
File Deleted: pkgsrc/x11/ocaml-lablgtk/patches/Attic/patch-src_gutf8.ml