Pullup ticket #5006 - requested by joerg

sysutils/open-vm-tools: build fix

Revisions pulled up:
- sysutils/open-vm-tools/Makefile                               1.56
- sysutils/open-vm-tools/distinfo                               1.11
- sysutils/open-vm-tools/patches/patch-lib_user_util.c          1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 10:10:09 UTC 2016

   Modified Files:
   	pkgsrc/sysutils/open-vm-tools: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/open-vm-tools/patches: patch-lib_user_util.c

   Log Message:
   Disable noisy warnings. Add an explicit cast to deal with expected
   interface differences.

3 files changed, 19 insertions, 2 deletions

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index cb7a9207c6a..33c0fd20915 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2016/03/05 11:29:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.54.2.1 2016/05/23 05:09:17 bsiegert Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
@@ -39,6 +39,9 @@ pre-configure:
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=unused-local-typedef
 CWRAPPERS_APPEND.cc+=	-Wno-error=unused-local-typedef
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+_WRAP_EXTRA_ARGS.CC+=	-Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable
+CWRAPPERS_APPEND.cc+=	-Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable
 .endif
 
 .include "../../net/libdnet/buildlink3.mk"
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index c393cfcdefa..dd8ff3354c8 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:32:23 agc Exp $
+$NetBSD: distinfo,v 1.10.4.1 2016/05/23 05:09:17 bsiegert Exp $
 
 SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
 RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
@@ -60,6 +60,7 @@ SHA1 (patch-lib_guestApp_Makefile.am) = b6fb86b15fa58ff87285ab591be1870cf79a5d18
 SHA1 (patch-lib_hgfsServer_hgfsServer.c) = 68a3102d4f53626717f64284eb5e51bfb584e783
 SHA1 (patch-lib_hgfsServer_hgfsServerLinux.c) = ef5a3135a8e4dc9f16d93d6eb7d88b8194aa0907
 SHA1 (patch-lib_panic_panic.c) = f784479ef9000e67389c04ca80ad22da5e3a2165
+SHA1 (patch-lib_user_util.c) = 7048484864fb5f7a66a61dc2234b1ea8359328ae
 SHA1 (patch-lib_vmCheck_Makefile.am) = 5956c6e81d6ea5679d949083fcf60066d8374672
 SHA1 (patch-lib_vmSignal_Makefile.am) = 6c562e558f846666ed9da3298f15a9cd489bd75f
 SHA1 (patch-libguestlib_Makefile.am) = d46ae6b600831b3f7ecd39f675fbf480a7882e60
diff --git a/sysutils/open-vm-tools/patches/patch-lib_user_util.c b/sysutils/open-vm-tools/patches/patch-lib_user_util.c
new file mode 100644
index 00000000000..ebc8002dd77
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-lib_user_util.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_user_util.c,v 1.1.2.2 2016/05/23 05:09:17 bsiegert Exp $
+
+--- lib/user/util.c.orig	2016-05-06 15:59:45.000000000 +0000
++++ lib/user/util.c
+@@ -319,7 +319,7 @@ UtilBacktraceToBufferCallback(struct _Un
+     */
+    if (cfa >= data->basePtr) {
+       if (data->len) {
+-         *data->buffer++ = _Unwind_GetIP(ctx);
++         *data->buffer++ = (uintptr_t)_Unwind_GetIP(ctx);
+          data->len--;
+       } else {
+          return _URC_END_OF_STACK;