Updated lang/ocaml to version 4.06.1.

This is a bugfix release that contains no breaking changes.

5 files changed, 14 insertions, 26 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 58202d00727..74f2936da1e 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2018/01/10 16:14:20 jaapb Exp $
+# $NetBSD: Makefile,v 1.119 2018/04/04 09:34:46 jaapb Exp $
 
 .include "Makefile.common"
 
@@ -76,18 +76,6 @@ OPSYSVARS+=		EXTRA_RT_LIBS
 EXTRA_RT_LIBS.NetBSD=	-lcurses
 EXTRA_RT_LIBS.*=
 
-SUBST_CLASSES+=		extra-rt-libs
-SUBST_FILES.extra-rt-libs=	bytecomp/bytelink.ml
-SUBST_SED.extra-rt-libs+=	-e 's,@EXTRA_RT_LIBS@,${EXTRA_RT_LIBS},g'
-SUBST_STAGE.extra-rt-libs=	pre-configure
-
-SUBST_CLASSES+=		linkopts
-SUBST_FILES.linkopts=	configure
-SUBST_SED.linkopts+=	-e '\|bytecclinkopts=|s|""|"${LDFLAGS}"|'
-SUBST_SED.linkopts+=	-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|"
-SUBST_STAGE.linkopts=	pre-configure
-SUBST_MESSAGE.linkopts=	Honor LDFLAGS.
-
 PRINT_PLIST_AWK+=	{ gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
 
 do-test:
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 264bb9cd36f..32cb3494a54 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.52 2018/01/10 14:30:34 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.53 2018/04/04 09:34:46 jaapb Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
-DISTNAME=	ocaml-4.06.0
+DISTNAME=	ocaml-4.06.1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.06/
 #EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index be6a9c24aab..f342df4f2a0 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.44 2018/01/10 16:14:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2018/04/04 09:34:46 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml
 OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.06.0
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.06.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.06.1
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 67f99af71fb..ad94fe25aca 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.118 2018/01/29 14:15:57 jperkin Exp $
+$NetBSD: distinfo,v 1.119 2018/04/04 09:34:46 jaapb Exp $
 
-SHA1 (ocaml-4.06.0.tar.gz) = bcfe5895acc88d63635d77bf0bdb8817a947a134
-RMD160 (ocaml-4.06.0.tar.gz) = fc284c392b1dd072f2c5bc7c73d0149e858ec405
-SHA512 (ocaml-4.06.0.tar.gz) = d6dc6f0fd5b0a0e6523f2b7a83efb67801bd41740a1b6c037038bcdb07c1eb2b4ac69205c17ec42524b911ea53136da82ee5bae79db6b40facd12f8f7880865d
-Size (ocaml-4.06.0.tar.gz) = 4041107 bytes
+SHA1 (ocaml-4.06.1.tar.gz) = 63dc362344f1a7b448336c94c33207c2940be475
+RMD160 (ocaml-4.06.1.tar.gz) = ad7a6038544a0d59b72b6fe9e81a4e69c158d397
+SHA512 (ocaml-4.06.1.tar.gz) = 42560874ce363212fa4e862138d7260113bc8dff8b39c040332bbd9b039ba938788344ba8ce63ffc0a251bf21a6e493f3c1e505b6f51db6fec4d21578921060e
+Size (ocaml-4.06.1.tar.gz) = 4049457 bytes
 SHA1 (patch-Makefile) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
-SHA1 (patch-configure) = ef9b53c652af594b6a38c20b66f63515b0ee1b56
+SHA1 (patch-configure) = 980494a5788b930d3f673a4d43b2b5ce6c6d7d46
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 274e9585f46..1128d809a1a 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.31 2018/01/29 14:15:58 jperkin Exp $
+$NetBSD: patch-configure,v 1.32 2018/04/04 09:34:46 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
@@ -83,8 +83,8 @@ Honor LDFLAGS.
    armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
    armv6*-*-linux-gnueabi)       arch=arm; model=armv6; system=linux_eabi;;
    armv6*-*-freebsd*)            arch=arm; model=armv6; system=freebsd;;
-+  armv6-*-netbsdelf*)		arch=arm; model=armv6; system=netbsd;;
-+  armv7-*-netbsdelf*)		arch=arm; model=armv7; system=netbsd;;
++  armv6-*-netbsdelf*)         arch=arm; model=armv6; system=netbsd;;
++  armv7-*-netbsdelf*)         arch=arm; model=armv7; system=netbsd;;
    earmv6*-*-netbsd*)            arch=arm; model=armv6; system=netbsd;;
    earmv7*-*-netbsd*)            arch=arm; model=armv7; system=netbsd;;
    armv5te*-*-linux-gnueabi)     arch=arm; model=armv5te; system=linux_eabi;;