pkglint corrections to ocaml

diff --git a/ocaml/distinfo b/ocaml/distinfo
index e4f9919e93878cf8fa361e70d03ca26168665cc0..480de839c9e5acd6fc2a8cf2ccab3f953370972f 100644 (file)
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -4,18 +4,18 @@ SHA1 (ocaml-4.09.0.tar.gz) = 981f15617d90ed990919c031c8c1f39b45f62002
 RMD160 (ocaml-4.09.0.tar.gz) = a6c7b137ada913531092e111dabccd8c4248313d
 SHA512 (ocaml-4.09.0.tar.gz) = c1b666839960c157868fc32a96fe4137280a4b99464ba2c6616700b962d802ed86467ec21c341abbefdf684b8314b90fd6a5018c6de58dc29152af851eebea88
 Size (ocaml-4.09.0.tar.gz) = 4829882 bytes
-SHA1 (patch-Makefile) = 5540fa654349931a9796d97ad71ecdff90a60e91
-SHA1 (patch-Makefile.common.in) = 419b838a31898fffdbe5dc785ee7c602b48343ca
-SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
-SHA1 (patch-asmrun_amd64.S) = c7cd60d9b02ddc3b9a09c696f697d5f78c25a13f
-SHA1 (patch-configure) = 3111a942827cd54695fefe2ce4c0925a62cf5c04
-SHA1 (patch-lex_Makefile) = 213c15b1d79fcf75caa8ae221565c9428d8ff9e0
+SHA1 (patch-Makefile) = 132a1cf1187dc05ec5338b496757d89047e91130
+SHA1 (patch-Makefile.common.in) = fbf3dc0614073ed5ac9b220211a837f69a4ffcaf
+SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
+SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
+SHA1 (patch-configure) = 311b18383bcc88f2a67d83d4b0c6e35344bd2d0d
+SHA1 (patch-lex_Makefile) = 18d1b8272ffb3e3a58c26d8a2494aaae6942426a
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
-SHA1 (patch-ocamldoc_Makefile) = 5605f29b3076c822dc8850542d00511111c29f22
+SHA1 (patch-ocamldoc_Makefile) = ca4997636f7a6a382bbcb7be365526e94be4534a
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 9933ed1b10c79885920020c444750f7487829d6b
-SHA1 (patch-otherlibs_systhreads_Makefile) = 477f965a6d8854dcf33caecb91d6655896333950
-SHA1 (patch-runtime_Makefile) = 45c05f2276c67fb77ef19738e7be5ecc4ceb7558
-SHA1 (patch-tools_Makefile) = e42e5009051d86ed514b08c016b83a865a5ec773
-SHA1 (patch-tools_ocamlmklib) = 409e9fab682d9c0533725b872fd233becf234133
-SHA1 (patch-yacc_Makefile) = 938c492aaaeb970d6c3b7ebf61b8241808ecf7a5
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 98211e0a220d360560c2b3f8d7e1fad4c83f2726
+SHA1 (patch-otherlibs_systhreads_Makefile) = a713371cf16e79ee3e5d0f9f8d128476d4c9bee9
+SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
+SHA1 (patch-tools_Makefile) = 871d40893d0300d80b9322631321803348a154cf
+SHA1 (patch-tools_ocamlmklib) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
+SHA1 (patch-yacc_Makefile) = c416081421f5e09273ea8b04062402cbfeba7497

diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 83a6708f767483acd251ffba5763a1bcf0d623e9..32ad7272c8c3bee02c7ec42a3a26bdcf2b61e929 100644 (file)
--- 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      2019-04-18 10:10:54.000000000 +0000
 +++ Makefile
 @@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing -

diff --git a/ocaml/patches/patch-Makefile.common.in b/ocaml/patches/patch-Makefile.common.in
index c943f0fa6e5029ba0144ac0419ddac91e668410a..36419736a0d2bfaa21b94f4b63d13d52bae97f36 100644 (file)
--- a/ocaml/patches/patch-Makefile.common.in
+++ b/ocaml/patches/patch-Makefile.common.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Use BSD_INSTALL_*
+
 --- Makefile.common.in.orig    2019-03-01 15:13:45.000000000 +0000
 +++ Makefile.common.in
 @@ -16,9 +16,9 @@

diff --git a/ocaml/patches/patch-asmcomp_amd64_emit.mlp b/ocaml/patches/patch-asmcomp_amd64_emit.mlp
index 7bab5615038ecd7a81cf2427edd84ad49fa89955..29658b51577f28a8131a945bcc6307e0ce66068e 100644 (file)
--- a/ocaml/patches/patch-asmcomp_amd64_emit.mlp
+++ b/ocaml/patches/patch-asmcomp_amd64_emit.mlp
@@ -1,5 +1,7 @@
 $NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.3 2018/07/18 00:09:12 joerg Exp $
 
+Fix attributes and entry size or the .rodata mergable constant section
+
 --- asmcomp/amd64/emit.mlp.orig        2018-07-17 21:17:05.536787953 +0000
 +++ asmcomp/amd64/emit.mlp
 @@ -986,7 +986,7 @@ let begin_assembly() =

diff --git a/ocaml/patches/patch-asmrun_amd64.S b/ocaml/patches/patch-asmrun_amd64.S
index 7af93f5a105e4afd3687d0387232418f62c14c39..fae198405d6e39f36c08474bc171cd7eaa797f14 100644 (file)
--- a/ocaml/patches/patch-asmrun_amd64.S
+++ b/ocaml/patches/patch-asmrun_amd64.S
@@ -1,5 +1,7 @@
 $NetBSD: patch-asmrun_amd64.S,v 1.1 2018/07/18 00:09:12 joerg Exp $
 
+Fix attributes and entry size for the .rodata mergable constant section
+
 --- runtime/amd64.S.orig       2018-07-17 21:24:20.027817665 +0000
 +++ runtime/amd64.S
 @@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes):

diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 8a667e5ab77c2d5986995c18d612a76ada6ad24d..d585ca83bd353d3d29ce8e25cd75af8c47f923da 100644 (file)
--- 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     2019-09-11 14:40:30.000000000 +0000
 +++ configure
 @@ -13281,7 +13281,7 @@ sharedlib_cflags=''

diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index 8f5073bb4d7a635078b033e2c3cac97432b717d7..f5e740a80debfd7eaf540ba99b0950f5610bee8e 100644 (file)
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- lex/Makefile.orig  2019-09-11 14:40:30.000000000 +0000
 +++ lex/Makefile
 @@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 

diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile
index 8b853dc17520554b3d7161d292c189e543875dd6..93ab4d9efb67b97c3cd7df00ac8e9a2c0d48e9e7 100644 (file)
--- a/ocaml/patches/patch-ocamldoc_Makefile
+++ b/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- ocamldoc/Makefile.orig     2019-03-01 15:13:46.000000000 +0000
 +++ ocamldoc/Makefile
 @@ -104,7 +104,7 @@ DEPINCLUDES=$(INCLUDES_DEP)

diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
index d8a0e591cd1c4b75d2b45b305257421002128981..174d142b440dde2d931dc49b264517a4292a863c 100644 (file)
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- otherlibs/Makefile.otherlibs.common.orig   2019-02-08 14:34:10.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
 @@ -48,6 +48,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm

diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile
index 2cb8248ccd0331594f0f599557e9d216c5577673..f58bbc865ada6fb8cc34d98096fb1fa2b169800a 100644 (file)
--- a/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LFLAGS.
+
 --- otherlibs/systhreads/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
 +++ otherlibs/systhreads/Makefile
 @@ -21,6 +21,7 @@ include $(ROOTDIR)/Makefile.common

diff --git a/ocaml/patches/patch-runtime_Makefile b/ocaml/patches/patch-runtime_Makefile
index 373707e8ca301fb5a9daf7703fb96054a2f26bf6..fb06549afa8f5f12ffa21d5abdc5c19b945da082 100644 (file)
--- a/ocaml/patches/patch-runtime_Makefile
+++ b/ocaml/patches/patch-runtime_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- runtime/Makefile.orig      2019-04-18 10:10:54.000000000 +0000
 +++ runtime/Makefile
 @@ -182,11 +182,11 @@ LIBS = $(BYTECCLIBS) $(EXTRALIBS)

diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
index d56fda81b3d3adfabcf94d3697e4e87c86752453..1a4f6c381fa6afcf6c1be9f96dbdd49d80de8938 100644 (file)
--- a/ocaml/patches/patch-tools_Makefile
+++ b/ocaml/patches/patch-tools_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- tools/Makefile.orig        2019-09-11 14:40:30.000000000 +0000
 +++ tools/Makefile
 @@ -82,7 +82,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut

diff --git a/ocaml/patches/patch-tools_ocamlmklib b/ocaml/patches/patch-tools_ocamlmklib
index 8df58a7ddbb1b2b00051bfd21e84819c1f7f3872..fd964421968e60eb2ca06207985e716e1e03935d 100644 (file)
--- a/ocaml/patches/patch-tools_ocamlmklib
+++ b/ocaml/patches/patch-tools_ocamlmklib
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add ELF mode support to ocamlmklib
+
 --- tools/ocamlmklib.ml.orig   2019-02-08 14:34:11.000000000 +0000
 +++ tools/ocamlmklib.ml
 @@ -43,6 +43,7 @@ and c_objs = ref []         (* .o, .a, .

diff --git a/ocaml/patches/patch-yacc_Makefile b/ocaml/patches/patch-yacc_Makefile
index f8dc6f5dae9ec9a0df6b63b1541917d032ccb2e3..b8d8da5f010a02a492ca598d195485bd60c21272 100644 (file)
--- 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 2019-03-01 15:13:46.000000000 +0000
 +++ yacc/Makefile
 @@ -36,7 +36,7 @@ MKEXE_ANSI=$(MKEXE)