Update to 8.06.3; fixes build with current pkgsrc ocaml. (Except I had

to revert one line of one of the upstream changes which apparently
only works with newer ocaml than we have.)

Upstream changes: minor fixes, and updates to match newer ocaml versions.

5 files changed, 44 insertions, 24 deletions

diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile
index 30a83236d2b..e27cb0f90dc 100644
--- a/x11/labltk/Makefile
+++ b/x11/labltk/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.30 2017/09/08 09:51:27 jaapb Exp $
+# $NetBSD: Makefile,v 1.31 2017/09/10 02:36:08 dholland Exp $
 
-DISTNAME=	labltk-8.06.0
-PKGREVISION=	7
+DISTNAME=	labltk-8.06.3
 CATEGORIES=	x11
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1455/
-LICENSE=	gnu-lgpl-v2.1
+# caution: it's the 1701, not the filename, that identifies the download
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1701/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://forge.ocamlcore.org/projects/labltk/
 COMMENT=	Tk bindings for ocaml
+LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
 MAKE_JOBS_SAFE=	no
diff --git a/x11/labltk/distinfo b/x11/labltk/distinfo
index 7f080627cdd..8d36bb74912 100644
--- a/x11/labltk/distinfo
+++ b/x11/labltk/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:28:44 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/09/10 02:36:08 dholland Exp $
 
-SHA1 (labltk-8.06.0.tar.gz) = c7f36b0a88428f707c3cf326bd8b72220149ad13
-RMD160 (labltk-8.06.0.tar.gz) = 383bbe6ed070ac0229f09b400d47ec25f7cc2fad
-SHA512 (labltk-8.06.0.tar.gz) = c005f8c177bca982a39bfcfd9d77640bedf7e4cc3a6690fc01fa2a8ebedcfb30ad3677501400ae2e0e276eb13fdd565319e23bb02dce84d78257ae7fbe545f47
-Size (labltk-8.06.0.tar.gz) = 368790 bytes
-SHA1 (patch-browser-Makefile.shared) = d0fc57beb5a46848d6d21f9afabb3048fe175bc6
-SHA1 (patch-compiler-Makefile) = f896ff03d2aeb1ad974bb3842b4a1dfb09d7f660
+SHA1 (labltk-8.06.3.tar.gz) = eb4818c2f5af48f1bbeb85c49bc25b7f7aa9369f
+RMD160 (labltk-8.06.3.tar.gz) = c77826d6fc658756a25a52d9930e5edc0fa19b65
+SHA512 (labltk-8.06.3.tar.gz) = c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979
+Size (labltk-8.06.3.tar.gz) = 369924 bytes
+SHA1 (patch-browser-Makefile.shared) = c974757b4c05207bc0ad0ad70dc668e10bfa8396
+SHA1 (patch-browser-searchpos.ml) = 50ebf36b244416e704794930ad2db6d5bffdb052
+SHA1 (patch-compiler-Makefile) = 779820cb01ff728c27ce7a803d5631d2686f8568
 SHA1 (patch-configure) = ff33df4575e3722bc7bb3e5108886fdf5aacbb43
 SHA1 (patch-lib-Makefile) = 0bab4c0ce4a5961a52a6091375bc7e06776a4521
 SHA1 (patch-suppert-Makefile) = f622059399c32488892b006b55828d0b5ab0fd84
diff --git a/x11/labltk/patches/patch-browser-Makefile.shared b/x11/labltk/patches/patch-browser-Makefile.shared
index 6794c7ea862..b3abafa8e25 100644
--- a/x11/labltk/patches/patch-browser-Makefile.shared
+++ b/x11/labltk/patches/patch-browser-Makefile.shared
@@ -1,9 +1,10 @@
-$NetBSD: patch-browser-Makefile.shared,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $
+$NetBSD: patch-browser-Makefile.shared,v 1.2 2017/09/10 02:36:08 dholland Exp $
 
 Install into DESTDIR.
---- browser/Makefile.shared.orig	2014-09-18 13:08:33.000000000 +0900
-+++ browser/Makefile.shared	2014-11-03 20:47:56.000000000 +0900
-@@ -60,7 +60,8 @@
+
+--- browser/Makefile.shared.orig	2017-07-19 03:52:11.000000000 +0000
++++ browser/Makefile.shared
+@@ -60,7 +60,8 @@ help.ml:
  	echo '";;' >> $@
  
  install:
@@ -12,4 +13,4 @@ Install into DESTDIR.
 +	$(BSD_INSTALL_SCRIPT) ocamlbrowser$(EXE) $(DESTDIR)$(INSTALLBINDIR)
  
  clean:
- 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O) help.ml
+ 	rm -f *.cm? ocamlbrowser$(EXE) dummy.ml *~ *.orig *.$(O) help.ml
diff --git a/x11/labltk/patches/patch-browser-searchpos.ml b/x11/labltk/patches/patch-browser-searchpos.ml
new file mode 100644
index 00000000000..9e903a52e4b
--- /dev/null
+++ b/x11/labltk/patches/patch-browser-searchpos.ml
@@ -0,0 +1,16 @@
+$NetBSD: patch-browser-searchpos.ml,v 1.1 2017/09/10 02:36:08 dholland Exp $
+
+Revert part of the upstream changes since we don't have ocaml 4.06
+in pkgsrc yet and the new version doesn't compile.
+
+--- browser/searchpos.ml~	2017-07-19 03:52:12.000000000 +0000
++++ browser/searchpos.ml
+@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp =
+         search_pos_expr exp' ~pos
+       end;
+       search_pos_expr exp ~pos
+-  | Texp_function {cases=l; _} ->
++  | Texp_function (*{cases=l; _}*) (_, l, _) ->
+       List.iter l ~f:(search_case ~pos)
+   | Texp_apply (exp, l) ->
+       List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x);
diff --git a/x11/labltk/patches/patch-compiler-Makefile b/x11/labltk/patches/patch-compiler-Makefile
index ed86c2939c1..77f66d0224a 100644
--- a/x11/labltk/patches/patch-compiler-Makefile
+++ b/x11/labltk/patches/patch-compiler-Makefile
@@ -1,16 +1,18 @@
-$NetBSD: patch-compiler-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $
+$NetBSD: patch-compiler-Makefile,v 1.2 2017/09/10 02:36:08 dholland Exp $
 
-Install into DESTDIR.
---- compiler/Makefile.orig	2014-11-03 20:12:13.000000000 +0900
-+++ compiler/Makefile	2014-11-03 20:12:16.000000000 +0900
-@@ -61,8 +61,8 @@
+Install properly. As of 8.06.3 $(INSTALLDIR) seems to already contain
+$(DESTDIR) in it, so don't insert it again.
+
+--- compiler/Makefile.orig	2017-07-19 03:52:12.000000000 +0000
++++ compiler/Makefile
+@@ -61,8 +61,8 @@ scratch :
  	rm -f *.cm*  pplex.ml ppyac.ml ppyac.mli pp$(EXE)
  
  install:
 -	cp tkcompiler$(EXE) $(INSTALLDIR)
 -	cp pp$(EXE) $(INSTALLDIR)
-+	$(BSD_INSTALL_SCRIPT) tkcompiler$(EXE) $(DESTDIR)$(INSTALLDIR)
-+	$(BSD_INSTALL_SCRIPT) pp$(EXE) $(DESTDIR)$(INSTALLDIR)
++	$(BSD_INSTALL_SCRIPT) tkcompiler$(EXE) $(INSTALLDIR)
++	$(BSD_INSTALL_SCRIPT) pp$(EXE) $(INSTALLDIR)
  
  .SUFFIXES :
  .SUFFIXES : .mli .ml .cmi .cmo .mlp