Pullup ticket #5121 - requested by joerg

sysutils/xentools41: build fix
sysutils/xentools42: build fix

Revisions pulled up:
- sysutils/xentools41/distinfo                                  1.42
- sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c 1.1
- sysutils/xentools42/distinfo                                  1.28
- sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c 1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat Oct  1 13:07:23 UTC 2016

   Modified Files:
   	pkgsrc/sysutils/xentools41: distinfo
   	pkgsrc/sysutils/xentools42: distinfo
   Added Files:
   	pkgsrc/sysutils/xentools41/patches:
   	    patch-ocaml_libs_xb_xs__ring__stubs.c
   	pkgsrc/sysutils/xentools42/patches:
   	    patch-ocaml_libs_xb_xs__ring__stubs.c

   Log Message:
   OCAML has switched to using normal uint32_t, so follow here.

4 files changed, 56 insertions, 2 deletions

diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 2ac3ab8dd61..ee60a8e12c9 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2016/01/07 17:55:55 bouyer Exp $
+$NetBSD: distinfo,v 1.41.6.1 2016/10/06 18:39:27 bsiegert Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -62,6 +62,7 @@ SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9
 SHA1 (patch-libxl_xl__cmdimpl.c) = 0e038b9702e131ec527d49cb2c21e4acf581cbfe
 SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc
 SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199
+SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04
 SHA1 (patch-ocaml_xenstored_define.ml) = f44841625554ceba6e83dbb41f688993c2a8d9a2
 SHA1 (patch-ocaml_xenstored_utils.ml) = cc792a696743fa348b274b1c23783ea1a0d7da47
 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
diff --git a/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c b/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c
new file mode 100644
index 00000000000..b5901076f6c
--- /dev/null
+++ b/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-ocaml_libs_xb_xs__ring__stubs.c,v 1.1.2.2 2016/10/06 18:39:28 bsiegert Exp $
+
+--- ocaml/libs/xb/xs_ring_stubs.c.orig	2016-09-30 12:57:34.000000000 +0000
++++ ocaml/libs/xb/xs_ring_stubs.c
+@@ -46,8 +46,8 @@ static int xs_ring_read(struct mmap_inte
+ 	XENSTORE_RING_IDX cons, prod; /* offsets only */
+ 	int to_read;
+ 
+-	cons = *(volatile uint32*)&intf->req_cons;
+-	prod = *(volatile uint32*)&intf->req_prod;
++	cons = *(volatile uint32_t*)&intf->req_cons;
++	prod = *(volatile uint32_t*)&intf->req_prod;
+ 	xen_mb();
+ 
+ 	if ((prod - cons) > XENSTORE_RING_SIZE)
+@@ -76,8 +76,8 @@ static int xs_ring_write(struct mmap_int
+ 	XENSTORE_RING_IDX cons, prod;
+ 	int can_write;
+ 
+-	cons = *(volatile uint32*)&intf->rsp_cons;
+-	prod = *(volatile uint32*)&intf->rsp_prod;
++	cons = *(volatile uint32_t*)&intf->rsp_cons;
++	prod = *(volatile uint32_t*)&intf->rsp_prod;
+ 	xen_mb();
+ 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
+ 		return 0;
diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo
index 12eb11f67da..22ff1fb9495 100644
--- a/sysutils/xentools42/distinfo
+++ b/sysutils/xentools42/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2016/05/21 20:12:18 bad Exp $
+$NetBSD: distinfo,v 1.27.4.1 2016/10/06 18:39:28 bsiegert Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -62,6 +62,7 @@ SHA1 (patch-libxl_libxl__internal.h) = bc2865f5c14b1fb9df1f9ad77d3be4a1494068c6
 SHA1 (patch-libxl_libxl__save__helper.c) = 1592f07e30db119905ae1efa9bd272fa75f60651
 SHA1 (patch-libxl_xl.c) = f7ca33eac8ce6c2383d985c82bf8cb406588e2c9
 SHA1 (patch-ocaml_common.make) = a809e3bed475cdffea3cb7ae480c8fe7af6aa798
+SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04
 SHA1 (patch-ocaml_xenstored_Makefile) = a0e91b946307a610490a492d4d56dfe426bddb63
 SHA1 (patch-ocaml_xenstored_define.ml) = c0772dff8e59f495a0ebe17a905aed04a29f2469
 SHA1 (patch-ocaml_xenstored_utils.ml) = b446e9428c676b70d6b9001c578f6de2048c88c2
diff --git a/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c b/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c
new file mode 100644
index 00000000000..b5901076f6c
--- /dev/null
+++ b/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-ocaml_libs_xb_xs__ring__stubs.c,v 1.1.2.2 2016/10/06 18:39:28 bsiegert Exp $
+
+--- ocaml/libs/xb/xs_ring_stubs.c.orig	2016-09-30 12:57:34.000000000 +0000
++++ ocaml/libs/xb/xs_ring_stubs.c
+@@ -46,8 +46,8 @@ static int xs_ring_read(struct mmap_inte
+ 	XENSTORE_RING_IDX cons, prod; /* offsets only */
+ 	int to_read;
+ 
+-	cons = *(volatile uint32*)&intf->req_cons;
+-	prod = *(volatile uint32*)&intf->req_prod;
++	cons = *(volatile uint32_t*)&intf->req_cons;
++	prod = *(volatile uint32_t*)&intf->req_prod;
+ 	xen_mb();
+ 
+ 	if ((prod - cons) > XENSTORE_RING_SIZE)
+@@ -76,8 +76,8 @@ static int xs_ring_write(struct mmap_int
+ 	XENSTORE_RING_IDX cons, prod;
+ 	int can_write;
+ 
+-	cons = *(volatile uint32*)&intf->rsp_cons;
+-	prod = *(volatile uint32*)&intf->rsp_prod;
++	cons = *(volatile uint32_t*)&intf->rsp_cons;
++	prod = *(volatile uint32_t*)&intf->rsp_prod;
+ 	xen_mb();
+ 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
+ 		return 0;