Updated ocaml to version 4.11.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Updated ocaml to version 4.11.1
From: Jaap Boender <jaapb%NetBSD.org@localhost>
Date: Thu, 01 Oct 2020 11:14:33 +0000
Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Thu Oct 1 13:14:33 2020 +0200
Changeset:	582c46f15c1b017d86362401a6033fb4e7e1c612

Modified Files:
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/distinfo
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-configure

Log Message:
Updated ocaml to version 4.11.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=582c46f15c1b017d86362401a6033fb4e7e1c612

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

diffstat:
 ocaml/Makefile.common         |  5 ++---
 ocaml/PLIST                   | 24 +++++++++++++++++-------
 ocaml/distinfo                | 12 ++++++------
 ocaml/patches/patch-Makefile  | 17 +++++++----------
 ocaml/patches/patch-configure | 29 +++++++++++------------------
 5 files changed, 43 insertions(+), 44 deletions(-)

diffs:
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index 9859f4e027..8189d0ea73 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.10.0
-#PKGNAME=	ocaml-4.10.0
+DISTNAME=	ocaml-4.11.1
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.10/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.11/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb%NetBSD.org@localhost
diff --git a/ocaml/PLIST b/ocaml/PLIST
index c43830065b..ce7c8f1b4e 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.49 2018/10/16 00:19:40 gdt Exp $
 bin/ocaml
-${PLIST.instrumented_runtime}bin/ocaml-instr-graph
-${PLIST.instrumented_runtime}bin/ocaml-instr-report
+@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
+@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-report
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
@@ -30,9 +30,9 @@ ${PLIST.ocaml-opt}bin/ocamlobjinfo.opt
 ${PLIST.ocaml-opt}bin/ocamlopt
 ${PLIST.ocaml-opt}bin/ocamlopt.byte
 ${PLIST.ocaml-opt}bin/ocamlopt.opt
-@comment 4.09 bin/ocamloptp
-@comment 4.09 bin/ocamloptp.byte
-@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
+${PLIST.ocaml-opt}bin/ocamloptp
+${PLIST.ocaml-opt}bin/ocamloptp.byte
+${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
 ${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -83,6 +83,7 @@ lib/ocaml/caml/domain.h
 lib/ocaml/caml/domain_state.h
 lib/ocaml/caml/domain_state.tbl
 lib/ocaml/caml/dynlink.h
+lib/ocaml/caml/eventlog.h
 lib/ocaml/caml/exec.h
 lib/ocaml/caml/fail.h
 lib/ocaml/caml/finalise.h
@@ -423,6 +424,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmo_format.mli
+lib/ocaml/compiler-libs/cmt2annot.cmi
+lib/ocaml/compiler-libs/cmt2annot.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt2annot.cmx
 lib/ocaml/compiler-libs/cmt_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmt
 lib/ocaml/compiler-libs/cmt_format.cmti
@@ -1359,6 +1363,11 @@ lib/ocaml/compiler-libs/typedecl_properties.cmt
 lib/ocaml/compiler-libs/typedecl_properties.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_properties.cmx
 lib/ocaml/compiler-libs/typedecl_properties.mli
+lib/ocaml/compiler-libs/typedecl_separability.cmi
+lib/ocaml/compiler-libs/typedecl_separability.cmt
+lib/ocaml/compiler-libs/typedecl_separability.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_separability.cmx
+lib/ocaml/compiler-libs/typedecl_separability.mli
 lib/ocaml/compiler-libs/typedecl_unboxed.cmi
 lib/ocaml/compiler-libs/typedecl_unboxed.cmt
 lib/ocaml/compiler-libs/typedecl_unboxed.cmti
@@ -1474,6 +1483,7 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
+lib/ocaml/eventlog_metadata
 lib/ocaml/expunge
 lib/ocaml/extract_crc
 lib/ocaml/filename.ml
@@ -2236,6 +2246,7 @@ man/man3/Float.ArrayLabels.3
 man/man3/Format.3
 man/man3/Fun.3
 man/man3/Gc.3
+man/man3/Gc.Memprof.3
 man/man3/Genlex.3
 man/man3/Hashtbl.3
 man/man3/Hashtbl.HashedType.3
@@ -2283,6 +2294,7 @@ man/man3/Misc.EnvLazy.3
 man/man3/Misc.Error_style.3
 man/man3/Misc.Int_literal_converter.3
 man/man3/Misc.LongString.3
+man/man3/Misc.Magic_number.3
 man/man3/Misc.Stdlib.3
 man/man3/Misc.Stdlib.Array.3
 man/man3/Misc.Stdlib.List.3
@@ -2326,8 +2338,6 @@ man/man3/Parser.Incremental.3
 man/man3/Parser.MenhirInterpreter.3
 man/man3/Parsetree.3
 man/man3/Parsing.3
-man/man3/Pervasives.3
-man/man3/Pervasives.LargeFile.3
 man/man3/Pparse.3
 man/man3/Pprintast.3
 man/man3/Printast.3
diff --git a/ocaml/distinfo b/ocaml/distinfo
index c07d64ddb9..668789752d 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,14 +1,14 @@
 $NetBSD: distinfo,v 1.125 2019/01/07 18:52:23 jaapb Exp $
 
-SHA1 (ocaml-4.10.0.tar.gz) = 619139f9120aed1c2bbacdb9a659c475fd7a4c70
-RMD160 (ocaml-4.10.0.tar.gz) = 4d0e72f6cf4e2f66132aa602fde77661898e9c37
-SHA512 (ocaml-4.10.0.tar.gz) = 12a8b58807be2410c3b4bd0df5a33e861edaea3de654214590296ba0cc52a5199664014e91cca9c79f7cc3c6dea6dc13dce6ae1c84009300b39dc838b100254a
-Size (ocaml-4.10.0.tar.gz) = 4922813 bytes
-SHA1 (patch-Makefile) = 50103df7b34f110a1d7f2b9c2d7f47c9885e8b52
+SHA1 (ocaml-4.11.1.tar.gz) = a3f3d74a43a3d0054f0d0162522499f7d8958560
+RMD160 (ocaml-4.11.1.tar.gz) = 6bdd83aeab8a074cfeffa475fe2db72cbca2d6cf
+SHA512 (ocaml-4.11.1.tar.gz) = 7adc40ab1c4086861619ce7280c75d0d200c398f8a7c2c89b0569a34b4deac8c6857b645340a525f656523cb92c4f73c1329e757b6ed41ea080e9cd540e6cb7b
+Size (ocaml-4.11.1.tar.gz) = 5062453 bytes
+SHA1 (patch-Makefile) = 151fa9e965093dce653e874288c739f8e9253157
 SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
 SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
 SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
-SHA1 (patch-configure) = 9cfa2a48d716f83429a24faf3d34273517ed88db
+SHA1 (patch-configure) = f86569cae9cc99f380073dfdf6797f2ae118bfc5
 SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 70c8d52d94..55274a31e2 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,20 +1,17 @@
 $NetBSD$
 
-Use BSD_INSTALL_* instead of mkdir
-Honor LDFLAGS
-
---- Makefile.orig	2020-01-10 16:10:46.000000000 +0000
+--- Makefile.orig	2020-09-01 12:47:58.000000000 +0000
 +++ Makefile
-@@ -53,7 +53,7 @@ OPTCOMPFLAGS= -function-sections
- else
- OPTCOMPFLAGS=
- endif
+@@ -61,7 +61,7 @@ INCLUDES=-I utils -I parsing -I typing -
+ COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
+ 	  -warn-error A \
+           -bin-annot -safe-string -strict-formats $(INCLUDES)
 -LINKFLAGS=
 +LINKFLAGS= -cclib "$(LDFLAGS)"
  
  ifeq "$(strip $(NATDYNLINKOPTS))" ""
  OCAML_NATDYNLINKOPTS=
-@@ -545,10 +545,10 @@ endif
+@@ -351,10 +351,10 @@ endif
  # Installation
  .PHONY: install
  install:
@@ -29,7 +26,7 @@ Honor LDFLAGS
  	$(INSTALL_DATA) \
  	  VERSION \
  	  "$(INSTALL_LIBDIR)"
-@@ -602,7 +602,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
+@@ -408,7 +408,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
  endif
  	$(MAKE) -C tools install
  ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 70049a8238..2071fdf225 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,15 +1,8 @@
 $NetBSD$
 
-All kinds of OS-specific changes to configure
-Honor LDFLAGS.
-
-Add SunOS -lnsl -lsocket
-Recognise SunOS/amd64 as amd64
-Recognise SunOS as having shared libraries
-
---- configure.orig	2020-02-21 14:22:37.000000000 +0000
+--- configure.orig	2020-09-01 12:47:58.000000000 +0000
 +++ configure
-@@ -13407,7 +13407,7 @@ sharedlib_cflags=''
+@@ -13476,7 +13476,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
@@ -18,7 +11,7 @@ Recognise SunOS as having shared libraries
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13503,12 +13503,16 @@ if test x"$enable_shared" != "xno"; then
+@@ -13572,12 +13572,16 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    arm*-*-freebsd*) :
      natdynlink=true ;; #(
@@ -32,10 +25,10 @@ Recognise SunOS as having shared libraries
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
 +    natdynlink=true ;; #(
+   riscv*-*-linux*) :
+     natdynlink=true ;; #(
    *) :
-      ;;
- esac
-@@ -13578,6 +13582,8 @@ case $host in #(
+@@ -13649,6 +13653,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -44,7 +37,7 @@ Recognise SunOS as having shared libraries
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -13612,6 +13618,10 @@ fi; system=elf ;; #(
+@@ -13683,6 +13689,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -55,16 +48,16 @@ Recognise SunOS as having shared libraries
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13648,6 +13658,8 @@ fi; system=elf ;; #(
+@@ -13719,6 +13729,8 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
    aarch64-*-freebsd*) :
      arch=arm64; system=freebsd ;; #(
 +  aarch64-*-netbsd*) :
 +    arch=arm64; system=netbsd ;; #(
    x86_64-*-cygwin*) :
-     arch=amd64; system=cygwin
-  ;; #(
-@@ -13932,7 +13944,7 @@ fi
+     arch=amd64; system=cygwin ;; #(
+   riscv64-*-linux*) :
+@@ -14028,7 +14040,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
Prev by Date: Updated buildlink file for ocaml 4.11.1
Next by Date: Various fixes for BIND 9.16.6: * Install *.rst instead of *.html doc files * Fix up change of test == to test =
Previous by Thread: Updated buildlink file for ocaml 4.11.1
Next by Thread: Various fixes for BIND 9.16.6: * Install *.rst instead of *.html doc files * Fix up change of test == to test =
Indexes:
Home | Main Index | Thread Index | Old Index