pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Updated ocaml to 4.14.0 release and started fixing pkglint errors

Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Tue Mar 29 12:23:34 2022 +0200
Changeset:	4ee4e46ce364448c7007408fbbb72d88a571463d

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/native.mk
	ocaml/ocaml.mk
	ocaml/options.mk
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-Makefile.build_config.in
	ocaml/patches/patch-api__docgen_ocamldoc_Makefile
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-man_Makefile
	ocaml/patches/patch-ocamldoc_Makefile
	ocaml/patches/patch-otherlibs_systhreads_Makefile
	ocaml/patches/patch-otherlibs_unix_Makefile
	ocaml/patches/patch-runtime_Makefile
	ocaml/patches/patch-runtime_sak.c
	ocaml/patches/patch-tools_Makefile
	ocaml/patches/patch-tools_ocamlmklib.ml
	ocaml/patches/patch-yacc_Makefile

Log Message:
Updated ocaml to 4.14.0 release and started fixing pkglint errors

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

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

diffstat:
 ocaml/Makefile                                    |  9 +++---
 ocaml/Makefile.common                             |  2 +-
 ocaml/buildlink3.mk                               |  4 +--
 ocaml/distinfo                                    | 34 +++++++++++------------
 ocaml/native.mk                                   |  3 +-
 ocaml/ocaml.mk                                    |  2 +-
 ocaml/options.mk                                  |  1 -
 ocaml/patches/patch-Makefile                      |  3 ++
 ocaml/patches/patch-Makefile.build_config.in      |  2 ++
 ocaml/patches/patch-api__docgen_ocamldoc_Makefile |  2 ++
 ocaml/patches/patch-configure                     |  7 +++++
 ocaml/patches/patch-lex_Makefile                  |  2 ++
 ocaml/patches/patch-man_Makefile                  |  2 ++
 ocaml/patches/patch-ocamldoc_Makefile             |  2 ++
 ocaml/patches/patch-otherlibs_systhreads_Makefile |  3 ++
 ocaml/patches/patch-otherlibs_unix_Makefile       |  2 ++
 ocaml/patches/patch-runtime_Makefile              |  2 ++
 ocaml/patches/patch-runtime_sak.c                 |  2 ++
 ocaml/patches/patch-tools_Makefile                |  2 ++
 ocaml/patches/patch-tools_ocamlmklib.ml           |  2 ++
 ocaml/patches/patch-yacc_Makefile                 |  2 ++
 21 files changed, 61 insertions(+), 29 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index d61dc8d044..56343d9e27 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -21,12 +21,11 @@ USE_GNU_CONFIGURE_HOST=	no
 # Options
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-CONFIGURE_ARGS+=       --enable-native-compiler
-BUILD_TARGET=          world.opt
-PLIST.native=          yes     
+CONFIGURE_ARGS+=	--enable-native-compiler
+BUILD_TARGET=		world.opt
 .else
-CONFIGURE_ARGS+=       --disable-native-compiler
-BUILD_TARGET=          world
+CONFIGURE_ARGS+=	--disable-native-compiler
+BUILD_TARGET=		world
 .endif
 
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index f0d0bd4e40..b43cc76b99 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.62 2021/03/08 08:08:43 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.14.0~rc2
+DISTNAME=	ocaml-4.14.0
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.14/
 #EXTRACT_SUFX=	.tar.bz2
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 0ca80273ef..91f67f9857 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	ocaml
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.12.0
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.12.0
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.14.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.14.0
 BUILDLINK_PKGSRCDIR.ocaml?=	../../wip/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 928fd1fc77..43f436fb9b 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,25 +1,25 @@
 $NetBSD: distinfo,v 1.139 2020/12/10 21:37:07 wiz Exp $
 
-BLAKE2s (ocaml-4.14.0~rc2.tar.gz) = fd4a92f1a3e0a44947ce1e48d093fed68ede35f9e28a149c468611cea83a8537
-SHA512 (ocaml-4.14.0~rc2.tar.gz) = f8628bbee2f921c67f3af48ed2c0d1c5fb081c946fb51c4701aa95f5952f41c365d83ddd2039ec6cdac797a5b21681a2d6a917c13356874edf4cc29b4814e75f
-Size (ocaml-4.14.0~rc2.tar.gz) = 5489107 bytes
-SHA1 (patch-Makefile) = 090510112ab849a56a9a2b4722d5d87a01dc29e2
-SHA1 (patch-Makefile.build_config.in) = 38ed679eb5931ecd11274092793a94e1e16d633a
-SHA1 (patch-api__docgen_ocamldoc_Makefile) = d1d5aaa159f865ddcccfff334399f0ed908fee7f
+BLAKE2s (ocaml-4.14.0.tar.gz) = 07f8e81765693d73c5b9326da424df67c9281a5e04fc6ca0f2539935fdc96d2c
+SHA512 (ocaml-4.14.0.tar.gz) = 84cd7fd96a4cde5f1063caae112629f37812add4ca2a888c56b3992b8d5528769c2ebc6b1b8f4a0b54e620f8450a7dbe11225f716e0f47cef0d3707457911ac0
+Size (ocaml-4.14.0.tar.gz) = 5492464 bytes
+SHA1 (patch-Makefile) = 978156d1e5795615adda840521bf5911a801f6a5
+SHA1 (patch-Makefile.build_config.in) = 9702fc3b8fa8f4e963f3e4a193439a12836af816
+SHA1 (patch-api__docgen_ocamldoc_Makefile) = cc677bed9d2da3d7eedd2c696ac89085bf2002d2
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 8dbab287166924fc39d858d4aa890b6767432666
-SHA1 (patch-lex_Makefile) = 4f06085be65c5cc17093035de0e18bdb512585a0
-SHA1 (patch-man_Makefile) = c02cfd5b18773bf2156d672705c948bb2eb0d2dc
-SHA1 (patch-ocamldoc_Makefile) = 589f2f8b03ea4ae2ed090a35fd1a303ffe9d1d92
+SHA1 (patch-configure) = 36ddb6f19ce7564889dc48ee290904dce00b04ec
+SHA1 (patch-lex_Makefile) = ba5df45c608fa292732e1acd0d955870e60c972d
+SHA1 (patch-man_Makefile) = 3d55fe5127758566f81a1b4e55e66c6ae3a848f1
+SHA1 (patch-ocamldoc_Makefile) = 5431d357ecbe719efffeb14826a8d79f0590784e
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 5518c6b4d8772d995252b6f640323e2602097c4d
-SHA1 (patch-otherlibs_systhreads_Makefile) = 17e4ff8b8eb7b4fff4570e0c0ded5986c9bd1467
+SHA1 (patch-otherlibs_systhreads_Makefile) = 76b6619f43562d30be9a87fd450b75033f4aff0b
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
-SHA1 (patch-otherlibs_unix_Makefile) = 15425e037b287706b35e3beda72ddea0e2a5886c
-SHA1 (patch-runtime_Makefile) = e97f198f7eefbeeabc481104f71edad68167c956
+SHA1 (patch-otherlibs_unix_Makefile) = 9eaf8d561670a765a647b36486ec533c674ee609
+SHA1 (patch-runtime_Makefile) = 4daf1ddb9ce70d99719bcb0aacbaadfc393574b0
 SHA1 (patch-runtime_floats.c) = 584a30d31c7b7da4f8387dc58b90fa1a8078f723
-SHA1 (patch-runtime_sak.c) = a2c2104c733a107e9129405aa146e1aaef52353f
+SHA1 (patch-runtime_sak.c) = 62a0946419b96033497a4a12105bbd9b4ef3aba6
 SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
-SHA1 (patch-tools_Makefile) = 95db9b6151f89ea900ae7805f3456a19a02f70c0
-SHA1 (patch-tools_ocamlmklib.ml) = 6d468c187608e367e23f418dc68aa4977288a94f
-SHA1 (patch-yacc_Makefile) = 32d1875f109fdaf79b88bd964ad030709615ac37
+SHA1 (patch-tools_Makefile) = f71ac6fa7f2ee79c6d531f95eb90d28360c04434
+SHA1 (patch-tools_ocamlmklib.ml) = 66ddab3ae0f6890326a51d315a2516fe4975107d
+SHA1 (patch-yacc_Makefile) = ee27db9ca0149ee9e1dc93988458bbb7446ecb89
diff --git a/ocaml/native.mk b/ocaml/native.mk
index e0619e3650..af53237710 100644
--- a/ocaml/native.mk
+++ b/ocaml/native.mk
@@ -4,14 +4,13 @@
 # It is used by ocaml.mk and the lang/ocaml package.
 #
 # Build def variables:
-# OCAML_USE_OPT_COMPILER 
+# OCAML_USE_OPT_COMPILER
 # if set to yes, will enable optimised (native code) compilation
 # default value: depends on architecture
 #
 # PLIST variable:
 # PLIST.ocaml-opt for files only installed when using the optimised compiler
 # Set based on OCAML_USE_OPT_COMPILER
-# 
 
 .if !defined(OCAML_NATIVE_MK)
 OCAML_NATIVE_MK= # defined
diff --git a/ocaml/ocaml.mk b/ocaml/ocaml.mk
index 369e1b754c..a4ab90f20f 100644
--- a/ocaml/ocaml.mk
+++ b/ocaml/ocaml.mk
@@ -208,7 +208,7 @@ do-build:
 #
 # opam targets
 #
-.if ${OCAML_USE_OPAM} == "yes" 
+.if ${OCAML_USE_OPAM} == "yes"
 
 do-install:
 	${RUN} for i in ${OPAM_INSTALL_FILES}; do \
diff --git a/ocaml/options.mk b/ocaml/options.mk
index 58632b2d37..e043f6b721 100644
--- a/ocaml/options.mk
+++ b/ocaml/options.mk
@@ -3,7 +3,6 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml
 PKG_SUPPORTED_OPTIONS=	pic flambda
 PKG_SUGGESTED_OPTIONS=	pic
-PLIST_VARS+=	pic flambda ocaml-native
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 3424d85e31..a0b060e342 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Use BSD_INSTALL_* instead of mkdir
+Honor LDFLAGS
+
 --- Makefile.orig	2022-02-08 16:50:12.000000000 +0000
 +++ Makefile
 @@ -50,7 +50,7 @@ COMPFLAGS=-strict-sequence -principal -a
diff --git a/ocaml/patches/patch-Makefile.build_config.in b/ocaml/patches/patch-Makefile.build_config.in
index 8f6b0ba72b..ab71590331 100644
--- a/ocaml/patches/patch-Makefile.build_config.in
+++ b/ocaml/patches/patch-Makefile.build_config.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+USE BSD_INSTALL_*
+
 --- Makefile.build_config.in.orig	2022-02-08 16:50:12.000000000 +0000
 +++ Makefile.build_config.in
 @@ -20,9 +20,9 @@
diff --git a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
index 6fbabe258e..9a98d0517d 100644
--- a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
+++ b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Install manpages with correct suffix
+
 --- api_docgen/ocamldoc/Makefile.orig	2022-02-21 15:57:25.000000000 +0000
 +++ api_docgen/ocamldoc/Makefile
 @@ -19,7 +19,7 @@ include ../../ocamldoc/Makefile.best_oca
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 1c569d3317..a4ec4ed7b5 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,5 +1,12 @@
 $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	2022-02-21 15:57:25.000000000 +0000
 +++ configure
 @@ -14081,7 +14081,7 @@ sharedlib_cflags=''
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index a6969e8ce1..f9e5c4edd0 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- lex/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
 +++ lex/Makefile
 @@ -31,7 +31,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
diff --git a/ocaml/patches/patch-man_Makefile b/ocaml/patches/patch-man_Makefile
index 8ab3fdd3f9..95c6313ac9 100644
--- a/ocaml/patches/patch-man_Makefile
+++ b/ocaml/patches/patch-man_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Use BSD_INSTALL_* instead of mkdir and cp
+
 --- man/Makefile.orig	2022-02-08 16:50:12.000000000 +0000
 +++ man/Makefile
 @@ -22,5 +22,5 @@ MANPAGES = $(addsuffix .1,\
diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile
index ba41cadfb6..a57c880ea1 100644
--- a/ocaml/patches/patch-ocamldoc_Makefile
+++ b/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- ocamldoc/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
 +++ ocamldoc/Makefile
 @@ -77,7 +77,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE
diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile
index c54a7ad744..edf081852d 100644
--- a/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Use BSD_INSTALL_* instead of mkdir
+Honor LDFLAGS.
+
 --- otherlibs/systhreads/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
 +++ otherlibs/systhreads/Makefile
 @@ -30,6 +30,7 @@ NATIVE_CPPFLAGS = \
diff --git a/ocaml/patches/patch-otherlibs_unix_Makefile b/ocaml/patches/patch-otherlibs_unix_Makefile
index ad589754d8..c5525a26b7 100644
--- a/ocaml/patches/patch-otherlibs_unix_Makefile
+++ b/ocaml/patches/patch-otherlibs_unix_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- otherlibs/unix/Makefile.orig	2021-02-24 13:49:29.000000000 +0000
 +++ otherlibs/unix/Makefile
 @@ -23,7 +23,7 @@ unixLabels.cmi: \
diff --git a/ocaml/patches/patch-runtime_Makefile b/ocaml/patches/patch-runtime_Makefile
index 14652bd919..919dadbabb 100644
--- a/ocaml/patches/patch-runtime_Makefile
+++ b/ocaml/patches/patch-runtime_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- runtime/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
 +++ runtime/Makefile
 @@ -265,7 +265,7 @@ build_config.h: $(ROOTDIR)/Makefile.conf
diff --git a/ocaml/patches/patch-runtime_sak.c b/ocaml/patches/patch-runtime_sak.c
index 9112d184c7..d57abf976b 100644
--- a/ocaml/patches/patch-runtime_sak.c
+++ b/ocaml/patches/patch-runtime_sak.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Explicit cast to int to eliminate warning
+
 --- runtime/sak.c.orig	2022-02-21 15:57:25.000000000 +0000
 +++ runtime/sak.c
 @@ -123,7 +123,7 @@ void add_stdlib_prefix(int count, char_o
diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
index 95086c2203..f599375b7e 100644
--- a/ocaml/patches/patch-tools_Makefile
+++ b/ocaml/patches/patch-tools_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- tools/Makefile.orig	2021-09-30 15:40:11.000000000 +0000
 +++ tools/Makefile
 @@ -41,7 +41,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
diff --git a/ocaml/patches/patch-tools_ocamlmklib.ml b/ocaml/patches/patch-tools_ocamlmklib.ml
index f415070517..8ee5c093be 100644
--- a/ocaml/patches/patch-tools_ocamlmklib.ml
+++ b/ocaml/patches/patch-tools_ocamlmklib.ml
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add ELF mode support to ocamlmklib
+
 --- tools/ocamlmklib.ml.orig	2021-09-30 15:40:11.000000000 +0000
 +++ tools/ocamlmklib.ml
 @@ -42,6 +42,7 @@ and c_objs = ref []         (* .o, .a, .
diff --git a/ocaml/patches/patch-yacc_Makefile b/ocaml/patches/patch-yacc_Makefile
index 59c68b1e22..d9e895858c 100644
--- a/ocaml/patches/patch-yacc_Makefile
+++ b/ocaml/patches/patch-yacc_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS when building ocamlyacc.
+
 --- yacc/Makefile.orig	2022-02-08 16:50:13.000000000 +0000
 +++ yacc/Makefile
 @@ -38,7 +38,7 @@ generated_files := ocamlyacc$(EXE) $(oca
Home | Main Index | Thread Index | Old Index