[pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools Bump PKGREVISION. Fix NetBSD/i3...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da5664f5734b
branches:  trunk
changeset: 353929:da5664f5734b
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Oct 17 20:55:49 2016 +0000

description:
Bump PKGREVISION. Fix NetBSD/i386 6 build and add missing NetBSD powerops support

diffstat:

 sysutils/open-vm-tools/Makefile                              |  12 ++++-
 sysutils/open-vm-tools/distinfo                              |   7 ++-
 sysutils/open-vm-tools/patches/patch-bh                      |  11 ++++-
 sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c |  15 ++++++
 sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c     |  24 +++++++++
 sysutils/open-vm-tools/patches/patch-lib_lock_ulSema.c       |  30 ++++++++++++
 6 files changed, 94 insertions(+), 5 deletions(-)

diffs (179 lines):

diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/Makefile
--- a/sysutils/open-vm-tools/Makefile   Mon Oct 17 19:59:25 2016 +0000
+++ b/sysutils/open-vm-tools/Makefile   Mon Oct 17 20:55:49 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2016/10/13 21:48:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2016/10/17 20:55:49 ryoon Exp $
 
 DISTNAME=      open-vm-tools-10.0.7-3227872
 PKGNAME=       open-vm-tools-10.0.7
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  https://github.com/vmware/open-vm-tools/files/133266/
 
@@ -13,6 +13,7 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 NetBSD-*-x86_64
 
+GCC_REQD+=     4.8
 CXXFLAGS+=     -std=gnu++11
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-Werror
 
@@ -39,6 +40,12 @@
 CONF_FILES_PERMS+=             ${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 RCD_SCRIPTS=                   vmtools
 
+SUBST_CLASSES+=                        fix-etc-path
+SUBST_STAGE.fix-etc-path=      pre-configure
+SUBST_MESSAGE.fix-etc-path=    Fixing /etc to ${PREFIX}/etc
+SUBST_FILES.fix-etc-path+=     lib/guestApp/guestApp.c
+SUBST_VARS.fix-etc-path+=      PREFIX
+
 pre-configure:
        cd ${WRKSRC} && autoreconf -f
 
@@ -57,6 +64,7 @@
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 
 .include "options.mk"
 
diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/distinfo
--- a/sysutils/open-vm-tools/distinfo   Mon Oct 17 19:59:25 2016 +0000
+++ b/sysutils/open-vm-tools/distinfo   Mon Oct 17 20:55:49 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2016/10/13 21:48:26 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2016/10/17 20:55:49 ryoon Exp $
 
 SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d
 RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625
@@ -23,7 +23,7 @@
 SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
 SHA1 (patch-bf) = e902ad24ed7e9616aa57d07cd3485ba3870ba51b
-SHA1 (patch-bh) = 86793b6411a64d3189f47d5236f2a6f4c9fff05c
+SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
 SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
 SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
@@ -32,11 +32,14 @@
 SHA1 (patch-libDeployPkg_processPosix.c) = 9f62110eb903eec85e51d8e579abc3d36e54fe7e
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
 SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab
+SHA1 (patch-lib_guestApp_guestApp.c) = 2348c1b4b8c103fa29ac5962deaa0a3dcfe199a2
 SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
 SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
+SHA1 (patch-lib_hgfs_hgfsUtil.c) = 473bc65ceccad16d3d2ce726dd5544d581cb30a8
 SHA1 (patch-lib_include_sigPosixRegs.h) = 634e12414f004671c1b2855764970e5d16ef4ef8
 SHA1 (patch-lib_include_vmblock__user.h) = 05ed8a0cdd481b759643ea47e27ef6e223a835d8
 SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
+SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
 SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad
diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/patches/patch-bh
--- a/sysutils/open-vm-tools/patches/patch-bh   Mon Oct 17 19:59:25 2016 +0000
+++ b/sysutils/open-vm-tools/patches/patch-bh   Mon Oct 17 20:55:49 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.2 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bh,v 1.3 2016/10/17 20:55:49 ryoon Exp $
 
 --- lib/system/systemLinux.c.orig      2016-02-16 20:06:46.000000000 +0000
 +++ lib/system/systemLinux.c
@@ -11,3 +11,12 @@
  #   error This file should not be compiled
  #endif
  
+@@ -366,7 +366,7 @@ System_Shutdown(Bool reboot)  // IN: "re
+       cmd = "/sbin/shutdown -r now";
+ #endif
+    } else {
+-#if __FreeBSD__
++#if __FreeBSD__ || __NetBSD__
+       cmd = "/sbin/shutdown -p now";
+ #elif defined(sun)
+       cmd = "/usr/sbin/shutdown -g 0 -i 5 -y";
diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c      Mon Oct 17 20:55:49 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_guestApp_guestApp.c,v 1.1 2016/10/17 20:55:49 ryoon Exp $
+
+* Fix pkgsrc powerops scripts location
+
+--- lib/guestApp/guestApp.c.orig       2016-02-16 20:06:45.000000000 +0000
++++ lib/guestApp/guestApp.c
+@@ -63,7 +63,7 @@
+ #elif defined __APPLE__
+ #   define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
+ #else
+-#   define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
++#   define GUESTAPP_TOOLS_INSTALL_PATH "@PREFIX@/etc/vmware-tools"
+ #endif
+ 
+ #if defined _WIN32
diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c  Mon Oct 17 20:55:49 2016 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_hgfs_hgfsUtil.c,v 1.1 2016/10/17 20:55:49 ryoon Exp $
+
+* Fix NetBSD/i386 build
+
+--- lib/hgfs/hgfsUtil.c.orig   2016-02-16 20:06:45.000000000 +0000
++++ lib/hgfs/hgfsUtil.c
+@@ -109,7 +109,7 @@ int
+ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
+                         uint64 ntTime) // IN: Time in Windows NT format
+ {
+-#if !defined(VM_X86_64) && !defined(__arm__)
++#if !defined(VM_X86_64) && !defined(__arm__) && !defined(__NetBSD__)
+    uint32 sec;
+    uint32 nsec;
+ 
+@@ -134,7 +134,7 @@ HgfsConvertFromNtTimeNsec(struct timespe
+       return -1;
+    }
+ 
+-#if !defined(VM_X86_64) && !defined(__arm__)
++#if !defined(VM_X86_64) && !defined(__arm__) && !defined(__NetBSD__)
+    Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec);
+    unixTime->tv_sec = sec;
+    unixTime->tv_nsec = nsec * 100;
diff -r 6dd18a0c729d -r da5664f5734b sysutils/open-vm-tools/patches/patch-lib_lock_ulSema.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/open-vm-tools/patches/patch-lib_lock_ulSema.c    Mon Oct 17 20:55:49 2016 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-lib_lock_ulSema.c,v 1.1 2016/10/17 20:55:49 ryoon Exp $
+
+* I am not sure...
+
+--- lib/lock/ulSema.c.orig     2016-02-16 20:06:46.000000000 +0000
++++ lib/lock/ulSema.c
+@@ -31,6 +31,10 @@
+ #endif
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "vmware.h"
+ #include "str.h"
+ #include "util.h"
+@@ -283,7 +287,12 @@ MXUserTimedDown(NativeSemaphore *sema,  
+    endTime.tv_nsec = (long int) (endNS % MXUSER_A_BILLION);
+ 
+    do {
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 700000000)
++      /* NetBSD 6.x has no sem_timedwait(3). */
++      err = (sem_wait(sema) == -1) ? errno : 0;
++#else
+       err = (sem_timedwait(sema, &endTime) == -1) ? errno : 0;
++#endif
+ 
+       if (err == 0) {
+          *downOccurred = TRUE;