Pullup ticket #6395 - requested by bouyer

sysutils/xentools413: build fix

Revisions pulled up:
- sysutils/xentools413/distinfo                                 1.7
- sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules 1.1
- sysutils/xentools413/patches/patch-tools_ocaml_common.make    1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Fri Jan  8 22:08:46 UTC 2021

   Modified Files:
   	pkgsrc/sysutils/xentools413: distinfo
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_common.make
   Added Files:
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_Makefile.rules

   Log Message:
   Fix build with newer ocaml, from Chavdar Ivanov


   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xentools413/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make

3 files changed, 21 insertions, 15 deletions

diff --git a/sysutils/xentools413/distinfo b/sysutils/xentools413/distinfo
index bc4679c5f0b..ee258f11544 100644
--- a/sysutils/xentools413/distinfo
+++ b/sysutils/xentools413/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2020/12/16 17:17:08 bouyer Exp $
+$NetBSD: distinfo,v 1.6.2.1 2021/01/16 16:35:04 spz Exp $
 
 SHA1 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = b78d21457bc07b4c4d3e770109c169ddafdacdf5
 RMD160 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 846dbcc0f56e87fca8c87b00ca2ed031471d4246
@@ -70,7 +70,8 @@ SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d628604
 SHA1 (patch-tools_libxl_libxl_internal.h) = 31da26f2121fe2a1928d75f719554ed9389c187b
 SHA1 (patch-tools_libxl_libxl_netbsd.c) = e2289fabc37bbb0fa078ce9a7256229f998c5982
 SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
-SHA1 (patch-tools_ocaml_common.make) = 4b845bdf3a013852109749ee18dfe28e3440d951
+SHA1 (patch-tools_ocaml_Makefile.rules) = 2198396f896999adb8ea05f100a0a5ec36733b1a
+SHA1 (patch-tools_ocaml_common.make) = 0e243aff97d8e8c6349f548dbbab878f3ca1acb6
 SHA1 (patch-tools_ocaml_libs_eventchn_xeneventchn_stubs.c) = 371e45af87b4432aedeaba1871aa94a4f492e011
 SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
 SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 5e85a0039d668c9b533e8deaa65fcdab9a5ad4c7
diff --git a/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules b/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
new file mode 100644
index 00000000000..a72bbf87d0f
--- /dev/null
+++ b/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_ocaml_Makefile.rules,v 1.1.2.2 2021/01/16 16:35:04 spz Exp $
+
+--- tools/ocaml/Makefile.rules.orig	2021-01-08 22:48:10.638776688 +0100
++++ tools/ocaml/Makefile.rules	2021-01-08 22:49:05.627085243 +0100
+@@ -34,7 +34,7 @@
+ 	$(call quiet-command, $(OCAMLYACC) -q $<,MLYACC,$@)
+ 
+ %.o: %.c
+-	$(call quiet-command, $(CC) $(CFLAGS) -c -o $@ $<,CC,$@)
++	$(call quiet-command, $(CC) $(CFLAGS) -Wno-error=discarded-qualifiers -c -o $@ $<,CC,$@)
+ 
+ META: META.in
+ 	sed 's/@VERSION@/$(VERSION)/g' < $< $o
diff --git a/sysutils/xentools413/patches/patch-tools_ocaml_common.make b/sysutils/xentools413/patches/patch-tools_ocaml_common.make
index 5f3631f3c7c..2e6e9404474 100644
--- a/sysutils/xentools413/patches/patch-tools_ocaml_common.make
+++ b/sysutils/xentools413/patches/patch-tools_ocaml_common.make
@@ -1,11 +1,10 @@
-$NetBSD: patch-tools_ocaml_common.make,v 1.1 2020/05/26 11:12:11 bouyer Exp $
+$NetBSD: patch-tools_ocaml_common.make,v 1.1.6.1 2021/01/16 16:35:04 spz Exp $
 
 Handle ocaml-findlib 1.7.3 already appending destdir
-Add -unsafe-string to fix build with ocaml-4.06.0 and later
 
---- tools/ocaml/common.make.orig	2018-01-23 13:49:58.000000000 +0000
-+++ tools/ocaml/common.make
-@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+--- tools/ocaml/common.make.orig	2020-10-30 12:24:39.000000000 +0100
++++ tools/ocaml/common.make	2021-01-08 22:09:56.936759911 +0100
+@@ -3,7 +3,7 @@
  CC ?= gcc
  OCAMLOPT ?= ocamlopt
  OCAMLC ?= ocamlc
@@ -14,14 +13,7 @@ Add -unsafe-string to fix build with ocaml-4.06.0 and later
  OCAMLDEP ?= ocamldep
  OCAMLLEX ?= ocamllex
  OCAMLYACC ?= ocamlyacc
-@@ -12,11 +12,11 @@ OCAMLFIND ?= ocamlfind
- CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
- 
- OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')
--OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
--OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
-+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -unsafe-string -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
-+OCAMLCFLAGS += -unsafe-string -g $(OCAMLINCLUDE) -w F -warn-error F
+@@ -17,6 +17,6 @@
  
  VERSION := 4.1