CVS commit: pkgsrc/sysutils/open-vm-tools

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/open-vm-tools
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Mon, 1 Jan 2018 06:56:01 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jan  1 06:56:01 UTC 2018

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile PLIST distinfo options.mk
        pkgsrc/sysutils/open-vm-tools/patches: patch-ah patch-bb patch-bc
            patch-bf patch-bm patch-bt patch-configure.ac
            patch-lib_include_sigPosixRegs.h
            patch-lib_include_vm__basic__types.h
            patch-lib_include_vmblock__user.h
            patch-services_plugins_dndcp_dnd_dndLinux.c
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-lib_misc_vthreadBase.c
Removed Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-av patch-bd

Log Message:
Update to 10.2.0

* Use x11/gtkmm3

Changelog:
Compatibility
  * open-vm-tools 10.2.0 is compatible with all supported versions
    of VMware vSphere ESXi 5.5 and later, VMware Workstation 14.0 and
    VMware Fusion 10.0. See VMware Compatibility Guide for more information.

  * Starting with VMware Tools version 10.2.0, Perl script based VMware
    Tools installation for FreeBSD has been discontinued. Going forward,
    FreeBSD systems are supported only through the open-vm-tools packages
    directly available from FreeBSD package repositories. FreeBSD packages
    for open-vm-tools 10.1.0 and later are available from FreeBSD package
    repositories.

Resolved Issues
  * Summary page of the VM does not list the IP address of the VMs in
    the right order

  * Guest authentication fails with a SystemError fault when the requested
    password is expired

  * The free space reported in vim.vm.GuestInfo.DiskInfo for a Linux guest
    does not match with df command in the guest

  * VMware user process might not restart after upgrades of open-vm-tools


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/open-vm-tools/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ah \
    pkgsrc/sysutils/open-vm-tools/patches/patch-bb \
    pkgsrc/sysutils/open-vm-tools/patches/patch-bc \
    pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/open-vm-tools/patches/patch-av
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/open-vm-tools/patches/patch-bd
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/open-vm-tools/patches/patch-bf
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bm
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-bt \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h \
    pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.78 pkgsrc/sysutils/open-vm-tools/Makefile:1.79
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.78 Thu Nov 30 16:45:38 2017
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Mon Jan  1 06:56:01 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2017/11/30 16:45:38 adam Exp $
+# $NetBSD: Makefile,v 1.79 2018/01/01 06:56:01 ryoon Exp $
 
-DISTNAME=      open-vm-tools-10.1.15
-PKGREVISION=   1
+OVTVER=                10.2.0
+DISTNAME=      open-vm-tools-${OVTVER}-7253323
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 
@@ -10,8 +10,9 @@ HOMEPAGE=     https://github.com/vmware/open
 COMMENT=       Open source VMware tools
 LICENSE=       gnu-lgpl-v2.1
 
-GITHUB_TAG=    stable-${PKGVERSION_NOREV}
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
+GITHUB_PROJECT=        open-vm-tools
+GITHUB_RELEASE=        stable-${OVTVER}
+#WRKSRC=       ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 NetBSD-*-x86_64
 

Index: pkgsrc/sysutils/open-vm-tools/PLIST
diff -u pkgsrc/sysutils/open-vm-tools/PLIST:1.3 pkgsrc/sysutils/open-vm-tools/PLIST:1.4
--- pkgsrc/sysutils/open-vm-tools/PLIST:1.3     Sun Oct  8 16:01:30 2017
+++ pkgsrc/sysutils/open-vm-tools/PLIST Mon Jan  1 06:56:01 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/10/08 16:01:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 bin/vmhgfs-fuse
 bin/vmtoolsd
 bin/vmware-checkvm
@@ -6,29 +6,20 @@ bin/vmware-hgfsclient
 bin/vmware-namespace-cmd
 bin/vmware-rpctool
 bin/vmware-toolbox-cmd
+${PLIST.x11}bin/vmware-user
 ${PLIST.x11}bin/vmware-user-suid-wrapper
 bin/vmware-vmblock-fuse
 bin/vmware-xferlogs
 ${PLIST.x11}etc/vmware-tools/xdg/autostart/vmware-user.desktop
-include/libDeployPkg/guestcust-events.h
-include/libDeployPkg/imgcust-api.h
-include/libDeployPkg/includeCheck.h
-include/libDeployPkg/linuxDeployment.h
-include/libDeployPkg/log.h
-include/libDeployPkg/process.h
-include/libDeployPkg/rpcout.h
-include/libDeployPkg/vm_basic_types.h
 include/vmGuestLib/includeCheck.h
 include/vmGuestLib/vmGuestLib.h
 include/vmGuestLib/vmSessionId.h
 include/vmGuestLib/vm_basic_types.h
-lib/libDeployPkg.la
 lib/libguestlib.la
 lib/libhgfs.la
 lib/libvmtools.la
 lib/open-vm-tools/plugins/common/libhgfsServer.la
 lib/open-vm-tools/plugins/common/libvix.la
-lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so
 lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
 lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
@@ -36,7 +27,6 @@ lib/open-vm-tools/plugins/vmsvc/libvmbac
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdndcp.so
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
-lib/pkgconfig/libDeployPkg.pc
 lib/pkgconfig/vmguestlib.pc
 sbin/mount.vmblock
 share/examples/vmware-tools/pam.d/vmtoolsd

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.26 pkgsrc/sysutils/open-vm-tools/distinfo:1.27
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.26 Sun Oct  8 16:01:30 2017
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Mon Jan  1 06:56:01 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2017/10/08 16:01:30 adam Exp $
+$NetBSD: distinfo,v 1.27 2018/01/01 06:56:01 ryoon Exp $
 
-SHA1 (open-vm-tools-10.1.15.tar.gz) = 1b9a68b8acedeb720c91ac20ddf17e5187320cc6
-RMD160 (open-vm-tools-10.1.15.tar.gz) = 27de01103f7d7ac16258acaf64545f5f47a796bc
-SHA512 (open-vm-tools-10.1.15.tar.gz) = 4c75ee3424c1cb0e4b949a8d52863337ca754eeae90e078fd63790fcc67ea11b9136f9f1cb0f32e31d3f934e514a269706db08c698b6fe0b3beb1fe9437cd103
-Size (open-vm-tools-10.1.15.tar.gz) = 3551568 bytes
+SHA1 (open-vm-tools-10.2.0-7253323.tar.gz) = 7426f42b58e8449e55ac8448e32d80973170c483
+RMD160 (open-vm-tools-10.2.0-7253323.tar.gz) = fdc185cf0b860d87a0b679fbf26ca7450750ca15
+SHA512 (open-vm-tools-10.2.0-7253323.tar.gz) = b54a54685e6863f275966bda26317e181b121b7682980ee4fa376df50156fff4d7b577f025b46ab51669a17b1c1b269474e75374229d5041cca355a908f9565b
+Size (open-vm-tools-10.2.0-7253323.tar.gz) = 4926473 bytes
 SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3
-SHA1 (patch-ah) = bdee6d92cdfe64f1ab513876ccd9d01f6fda6882
+SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
 SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df
 SHA1 (patch-ak) = c74a8185508d34cb35fbf14b638fab59661e191f
@@ -14,20 +14,18 @@ SHA1 (patch-ar) = b06873f37ac826912e647f
 SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
 SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136
 SHA1 (patch-au) = 518ca50f944fad718a5e8deb66e83a405ce88159
-SHA1 (patch-av) = 9a1a7daf9fdd2c60119e0a59063aff4e74ad10f1
 SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
 SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
 SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732
-SHA1 (patch-bb) = e22d082689016d81add208e1d3b31d9d897d36e8
-SHA1 (patch-bc) = c2f316cd9035648676fd9d0d7e40fc7f6bf5c8d4
-SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
+SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
+SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
-SHA1 (patch-bf) = dc72e905601521cc703a72aea7f1b31ac03a8802
+SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd
 SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
-SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
-SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
+SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
+SHA1 (patch-bt) = f0b696a582d69d325c44f6200f2e367ada6d7674
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
-SHA1 (patch-configure.ac) = 1a8422cdca984b32c0d9e4fa926a92fa3b9178ba
+SHA1 (patch-configure.ac) = 8a3d6c8548eceead8dc5cdb8baf051861cacb7ae
 SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
 SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
@@ -35,12 +33,13 @@ SHA1 (patch-lib_file_file.c) = e9ee13e3f
 SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753
 SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
 SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
-SHA1 (patch-lib_include_sigPosixRegs.h) = 634e12414f004671c1b2855764970e5d16ef4ef8
-SHA1 (patch-lib_include_vm__basic__types.h) = 4dfefc05e2bba336593c74ddac7a4583afa3053a
-SHA1 (patch-lib_include_vmblock__user.h) = 05ed8a0cdd481b759643ea47e27ef6e223a835d8
+SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9
+SHA1 (patch-lib_include_vm__basic__types.h) = 35816f81ef480d884f8a538df92af57cd3403b4c
+SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
 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_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
 SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad
 SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 34602bb8a34a930e487ae594137eacda804c3fe0
@@ -48,7 +47,7 @@ SHA1 (patch-lib_user_utilBacktrace.c) = 
 SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
 SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
 SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
-SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = 61acce40961ac82b48e055c159efd0c3b7a8899c
+SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
 SHA1 (patch-services_plugins_timeSync_Makefile.am) = c92d64573e7c5718e955d32991c8951ea2408d43
 SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d
 SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5

Index: pkgsrc/sysutils/open-vm-tools/options.mk
diff -u pkgsrc/sysutils/open-vm-tools/options.mk:1.6 pkgsrc/sysutils/open-vm-tools/options.mk:1.7
--- pkgsrc/sysutils/open-vm-tools/options.mk:1.6        Sun Oct  8 16:01:30 2017
+++ pkgsrc/sysutils/open-vm-tools/options.mk    Mon Jan  1 06:56:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2017/10/08 16:01:30 adam Exp $
+# $NetBSD: options.mk,v 1.7 2018/01/01 06:56:01 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.open-vm-tools
 PKG_SUPPORTED_OPTIONS= icu x11
@@ -19,7 +19,7 @@ PLIST.x11=    yes
 MESSAGE_SRC+=  MESSAGE.x11
 .  include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .  include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.  include "../../x11/gtkmm/buildlink3.mk"
+.  include "../../x11/gtkmm3/buildlink3.mk"
 .  include "../../x11/libXtst/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=               --without-x

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-ah
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-ah:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-ah:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-ah:1.3  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-ah      Mon Jan  1 06:56:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-ah,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/file/fileIO.c.orig     2016-02-16 20:06:45.000000000 +0000
+--- lib/file/fileIO.c.orig     2017-12-15 19:09:51.000000000 +0000
 +++ lib/file/fileIO.c
 @@ -325,7 +325,7 @@ FileIO_Lock(FileIODescriptor *file,  // 
     FileIOResolveLockBits(&access);
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.3 2016/10/09 03:41
        ret = FILEIO_LOCK_FAILED;
 @@ -394,7 +394,7 @@ FileIO_Unlock(FileIODescriptor *file)  /
  
-    ASSERT(file);
+    ASSERT(file != NULL);
  
 -#if !defined(__FreeBSD__) && !defined(sun)
 +#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bb
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bb:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bb:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bb:1.3  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bb      Mon Jan  1 06:56:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-bb,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bb,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/misc/idLinux.c.orig    2016-02-16 20:06:46.000000000 +0000
+--- lib/misc/idLinux.c.orig    2017-12-15 19:09:51.000000000 +0000
 +++ lib/misc/idLinux.c
 @@ -119,7 +119,7 @@ static AuthorizationRef IdAuthCreateWith
  int
@@ -9,7 +9,7 @@ $NetBSD: patch-bb,v 1.3 2016/10/09 03:41
 -#if defined(__FreeBSD__) || defined(sun)
 +#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
     return setuid(euid);
- #elif defined(linux) || defined __ANDROID__
+ #elif defined(__linux__) || defined __ANDROID__
     if (uid32) {
 @@ -162,7 +162,7 @@ Id_SetGid(gid_t egid)              // IN: new egid
     Warning("XXXMACOS: implement %s\n", __func__);
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bc
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bc:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bc:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bc:1.3  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bc      Mon Jan  1 06:56:01 2018
@@ -1,17 +1,17 @@
-$NetBSD: patch-bc,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bc,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/misc/posixPosix.c.orig 2016-02-16 20:06:46.000000000 +0000
+--- lib/misc/posixPosix.c.orig 2017-12-15 19:09:51.000000000 +0000
 +++ lib/misc/posixPosix.c
-@@ -47,7 +47,7 @@
- #include <sys/param.h>
- #include <sys/mount.h>
- #include <CoreFoundation/CoreFoundation.h>
+@@ -52,7 +52,7 @@
+ #include <spawn.h>
+ extern char **environ;
+ #endif
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
  #include <sys/param.h>
  #include <sys/mount.h>
  #elif defined(sun)
-@@ -65,7 +65,7 @@
+@@ -70,7 +70,7 @@ extern char **environ;
  #define VM_SYSTEM_HAS_GETGRNAM_R 1
  #endif
  
@@ -20,7 +20,7 @@ $NetBSD: patch-bc,v 1.3 2016/10/09 03:41
  #  include <sys/syslimits.h>  // PATH_MAX
  # else
  #  include <limits.h>  // PATH_MAX
-@@ -1585,7 +1585,7 @@ Posix_Putenv(char *name)  // IN:
+@@ -1635,7 +1635,7 @@ Posix_Putenv(char *name)  // IN:
  }
  
  
@@ -29,7 +29,7 @@ $NetBSD: patch-bc,v 1.3 2016/10/09 03:41
  
  /*
   *----------------------------------------------------------------------
-@@ -1746,7 +1746,7 @@ Posix_Unsetenv(const char *name)  // IN:
+@@ -1806,7 +1806,7 @@ Posix_Unsetenv(const char *name)  // IN:
  
  #if !defined(sun) // {
  
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.3        Mon Nov 21 00:14:16 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac    Mon Jan  1 06:56:01 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.3 2016/11/21 00:14:16 pho Exp $
+$NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- configure.ac.orig  2016-02-16 20:06:45.000000000 +0000
+--- configure.ac.orig  2017-12-15 19:09:51.000000000 +0000
 +++ configure.ac
-@@ -136,6 +136,9 @@ case "$host_os" in
+@@ -126,6 +126,9 @@ case "$host_os" in
     [solaris*])
        os="solaris"
        ;;
@@ -12,7 +12,7 @@ $NetBSD: patch-configure.ac,v 1.3 2016/1
     [*])
        AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.])
        ;;
-@@ -374,7 +377,7 @@ AC_VMW_CHECK_LIB([fuse],
+@@ -470,7 +473,7 @@ AC_VMW_CHECK_LIB([fuse],
                   [],
                   [],
                   [fuse.h],
@@ -21,8 +21,8 @@ $NetBSD: patch-configure.ac,v 1.3 2016/1
                   [have_fuse=yes],
                   [have_fuse=no;
                    AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])])
-@@ -1064,6 +1067,15 @@ if test "$os" = "linux"; then
-    buildHgfsmounter=yes
+@@ -1263,6 +1266,15 @@ if test "$os" = "linux"; then
+    fi
  fi
  
 +if test "$os" = "netbsd"; then
@@ -37,7 +37,7 @@ $NetBSD: patch-configure.ac,v 1.3 2016/1
  if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then
     LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
     MODULES_DIR="/boot/modules"
-@@ -1132,6 +1144,7 @@ fi
+@@ -1360,6 +1372,7 @@ fi
  AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes")
  AM_CONDITIONAL(LINUX, test "$os" = "linux")
  AM_CONDITIONAL(SOLARIS, test "$os" = "solaris")

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bf
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.6 pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.7
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.6  Fri Jun 23 18:25:12 2017
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bf      Mon Jan  1 06:56:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.6 2017/06/23 18:25:12 kamil Exp $
+$NetBSD: patch-bf,v 1.7 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/procMgr/procMgrPosix.c.orig    2017-02-11 10:06:31.000000000 +0000
+--- lib/procMgr/procMgrPosix.c.orig    2017-12-15 19:09:51.000000000 +0000
 +++ lib/procMgr/procMgrPosix.c
 @@ -27,7 +27,7 @@
  // pull in setresuid()/setresgid() if possible
@@ -11,25 +11,16 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
  #include <asm/param.h>
  #endif
  #if !defined(sun) && !defined(__APPLE__)
-@@ -47,13 +47,15 @@
- #include <time.h>
- #include <grp.h>
- #include <sys/syscall.h>
--#if defined(linux) || defined(__FreeBSD__) || defined(HAVE_SYS_USER_H)
-+#if defined(linux) || defined(__FreeBSD__) || defined(HAVE_SYS_USER_H) || defined(__NetBSD__)
- // sys/param.h is required on FreeBSD before sys/user.h
- #   include <sys/param.h>
+@@ -53,7 +53,7 @@
  // Pull in PAGE_SIZE/PAGE_SHIFT defines ahead of vm_basic_defs.h
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
  #   include <sys/user.h>
  #endif
 -#if defined (__FreeBSD__)
-+#endif
 +#if defined (__FreeBSD__) || defined(__NetBSD__)
  #include <kvm.h>
  #include <limits.h>
  #include <paths.h>
-@@ -136,7 +138,7 @@ Bool ProcMgr_PromoteEffectiveToReal(void
+@@ -136,7 +136,7 @@ Bool ProcMgr_PromoteEffectiveToReal(void
  #ifdef sun
  #define  BASH_PATH "/usr/bin/bash"
  #else
@@ -38,7 +29,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
  #endif
  
  
-@@ -607,7 +609,7 @@ abort:
+@@ -614,7 +614,7 @@ abort:
   *----------------------------------------------------------------------
   */
  
@@ -47,7 +38,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
  ProcMgrProcInfoArray *
  ProcMgr_ListProcesses(void)
  {
-@@ -615,7 +617,11 @@ ProcMgr_ListProcesses(void)
+@@ -622,7 +622,11 @@ ProcMgr_ListProcesses(void)
     ProcMgrProcInfo procInfo;
     Bool failed = TRUE;
     static kvm_t *kd;
@@ -59,7 +50,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
     char errbuf[_POSIX2_LINE_MAX];
     int i;
     int nentries=-1;
-@@ -638,7 +644,12 @@ ProcMgr_ListProcesses(void)
+@@ -645,7 +649,12 @@ ProcMgr_ListProcesses(void)
     /*
      * Get the list of process info structs
      */
@@ -72,7 +63,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
     if (kp == NULL || nentries <= 0) {
        Warning("%s: failed to get proc infos with error: %s\n",
                __FUNCTION__, kvm_geterr(kd));
-@@ -666,14 +677,26 @@ ProcMgr_ListProcesses(void)
+@@ -673,14 +682,26 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the pid of the process.
         */
@@ -99,7 +90,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
                             : Unicode_Alloc(pwd->pw_name, STRING_ENCODING_DEFAULT);
  
        /*
-@@ -681,15 +704,24 @@ ProcMgr_ListProcesses(void)
+@@ -688,15 +709,24 @@ ProcMgr_ListProcesses(void)
         * maximum allowed size, then we can save it right now. Else we shall
         * need to try and parse it from the entire command line.
         */
@@ -124,7 +115,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
        if (cmdLineTemp != NULL) {
           /*
            * Flatten the argument list to get cmd & all params.
-@@ -745,9 +777,15 @@ ProcMgr_ListProcesses(void)
+@@ -752,9 +782,15 @@ ProcMgr_ListProcesses(void)
           procInfo.procCmdLine = DynBuf_Detach(&dbuf);
           DynBuf_Destroy(&dbuf);
        } else {
@@ -140,7 +131,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
              cmdNameLookup = FALSE;
           }
        }
-@@ -755,7 +793,11 @@ ProcMgr_ListProcesses(void)
+@@ -762,7 +798,11 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the start time of the process
         */
@@ -152,7 +143,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
  
        /*
         * Store the process info pointer into a list buffer.
-@@ -785,7 +827,7 @@ abort:
+@@ -792,7 +832,7 @@ abort:
  
     return procList;
  }
@@ -161,16 +152,16 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
  
  
  #if defined(__APPLE__)
-@@ -2022,7 +2064,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
+@@ -2152,7 +2192,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
     free(asyncProc);
  }
  
--#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
  
  /*
   *----------------------------------------------------------------------
-@@ -2104,7 +2146,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2234,7 +2274,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // first change group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);
@@ -179,7 +170,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
     ret = setegid(ppw->pw_gid);
  #else
     ret = setresgid(ppw->pw_gid, ppw->pw_gid, root_gid);
-@@ -2123,7 +2165,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2253,7 +2293,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // now user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
@@ -188,7 +179,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
     ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2185,7 +2227,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2315,7 +2355,7 @@ ProcMgr_ImpersonateUserStop(void)
     // first change back user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
@@ -197,7 +188,7 @@ $NetBSD: patch-bf,v 1.6 2017/06/23 18:25
     ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2198,7 +2240,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2328,7 +2368,7 @@ ProcMgr_ImpersonateUserStop(void)
     // now group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bm
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bm:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-bm:1.3
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bm:1.2  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bm      Mon Jan  1 06:56:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-bm,v 1.2 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bm,v 1.3 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/wiper/wiperPosix.c.orig        2016-02-16 20:06:46.000000000 +0000
+--- lib/wiper/wiperPosix.c.orig        2017-12-15 19:09:51.000000000 +0000
 +++ lib/wiper/wiperPosix.c
 @@ -23,7 +23,7 @@
   *
@@ -11,7 +11,7 @@ $NetBSD: patch-bm,v 1.2 2016/10/09 03:41
  #error This file should not be compiled on this platform.
  #endif
  
-@@ -70,7 +70,7 @@
+@@ -72,7 +72,7 @@
  /* Number of device numbers to store for device-mapper */
  #define WIPER_MAX_DM_NUMBERS 8
  
@@ -20,7 +20,7 @@ $NetBSD: patch-bm,v 1.2 2016/10/09 03:41
  # define PROCFS "proc"
  #elif defined(__FreeBSD__) || defined(__APPLE__)
  # define PROCFS "procfs"
-@@ -158,6 +158,16 @@ static unsigned char *WiperGetSpace(Wipe
+@@ -159,6 +159,16 @@ static unsigned char *WiperGetSpace(Wipe
  static void WiperClean(WiperState *state);
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-bm,v 1.2 2016/10/09 03:41
  #if defined(__linux__)
  
  #define MAX_DISK_MAJORS       256   /* should be enough for now */
-@@ -310,7 +320,7 @@ WiperIsDiskDevice(MNTINFO *mnt,         
+@@ -311,7 +321,7 @@ WiperIsDiskDevice(MNTINFO *mnt,         
     return FALSE;
  }
  
@@ -46,16 +46,16 @@ $NetBSD: patch-bm,v 1.2 2016/10/09 03:41
  
  static Bool
  WiperIsDiskDevice(MNTINFO *mnt,         // IN: file system being considered
-@@ -571,7 +581,7 @@ WiperSinglePartition_GetSpace(const Wipe
-                               uint64 *free,       // OUT
-                               uint64 *total)      // OUT
+@@ -573,7 +583,7 @@ WiperSinglePartition_GetSpace(const Wipe
+                               uint64 *free,            // OUT/OPT
+                               uint64 *total)           // OUT
  {
 -#ifdef sun
 +#if defined(sun) || defined(__NetBSD__)
     struct statvfs statfsbuf;
  #else
     struct statfs statfsbuf;
-@@ -580,7 +590,7 @@ WiperSinglePartition_GetSpace(const Wipe
+@@ -582,7 +592,7 @@ WiperSinglePartition_GetSpace(const Wipe
  
     ASSERT(p);
  
@@ -64,7 +64,7 @@ $NetBSD: patch-bm,v 1.2 2016/10/09 03:41
     if (statvfs(p->mountPoint, &statfsbuf) < 0) {
  #else
     if (Posix_Statfs(p->mountPoint, &statfsbuf) < 0) {
-@@ -588,7 +598,7 @@ WiperSinglePartition_GetSpace(const Wipe
+@@ -590,7 +600,7 @@ WiperSinglePartition_GetSpace(const Wipe
        return "Unable to statfs() the mount point";
     }
  

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bt
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bt:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-bt:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bt:1.1  Sun Aug 31 06:36:49 2008
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bt      Mon Jan  1 06:56:01 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-bt,v 1.1 2008/08/31 06:36:49 scottr Exp $
+$NetBSD: patch-bt,v 1.2 2018/01/01 06:56:01 ryoon Exp $
 
---- vmware-user-suid-wrapper/main.c.orig       2008-08-08 02:01:56.000000000 -0500
+--- vmware-user-suid-wrapper/main.c.orig       2017-12-15 19:09:51.000000000 +0000
 +++ vmware-user-suid-wrapper/main.c
 @@ -28,7 +28,7 @@
   *      remove blocks in the blocking file system.
   */
  
--#if !defined(sun) && !defined(__FreeBSD__) && !defined(linux)
-+#if !defined(sun) && !defined(__FreeBSD__) && !defined(linux) && !defined(__NetBSD__)
+-#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__)
++#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
  # error This program is not supported on your platform.
  #endif
  
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h:1.1  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h      Mon Jan  1 06:56:01 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_include_sigPosixRegs.h,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-lib_include_sigPosixRegs.h,v 1.2 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/include/sigPosixRegs.h.orig    2016-02-16 20:06:46.000000000 +0000
+--- lib/include/sigPosixRegs.h.orig    2017-12-15 19:09:51.000000000 +0000
 +++ lib/include/sigPosixRegs.h
-@@ -224,6 +224,36 @@
+@@ -230,6 +230,36 @@ extern "C" {
  #define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP])
  #define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP])
  #endif
@@ -37,5 +37,5 @@ $NetBSD: patch-lib_include_sigPosixRegs.
 +#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EIP])
 +#endif
  #elif defined(ANDROID_X86)
- #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.eax)
- #define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.ebx)
+ #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EAX])
+ #define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EBX])
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h:1.1      Sun Jul  2 09:17:56 2017
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h  Mon Jan  1 06:56:01 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-lib_include_vm__basic__types.h,v 1.1 2017/07/02 09:17:56 taca Exp $
+$NetBSD: patch-lib_include_vm__basic__types.h,v 1.2 2018/01/01 06:56:01 ryoon Exp $
 
 Fix build on NetBSD 6.
 
---- lib/include/vm_basic_types.h.orig  2017-02-11 10:06:44.000000000 +0000
+--- lib/include/vm_basic_types.h.orig  2017-12-15 19:09:51.000000000 +0000
 +++ lib/include/vm_basic_types.h
-@@ -79,7 +79,7 @@
- 
+@@ -80,7 +80,7 @@
  /* STRICT ANSI means the Xserver build and X defines Bool differently. */
  #if !defined(_XTYPEDEF_BOOL) && \
--    (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__))
-+    (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MINGW32__))
+     (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) || \
+-      defined(__MINGW32__) || defined(__APPLE__))
++      defined(__MINGW32__) || defined(__APPLE__) || defined(__NetBSD__))
  #define _XTYPEDEF_BOOL
  typedef char           Bool;
  #endif
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h:1.1 Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h     Mon Jan  1 06:56:01 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_include_vmblock__user.h,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-lib_include_vmblock__user.h,v 1.2 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/include/vmblock_user.h.orig    2016-02-16 20:06:46.000000000 +0000
+--- lib/include/vmblock_user.h.orig    2017-12-15 19:09:51.000000000 +0000
 +++ lib/include/vmblock_user.h
-@@ -68,6 +68,10 @@
- #include "vm_basic_types.h"
- #include "vmblock.h"
+@@ -72,6 +72,10 @@
+ extern "C" {
+ #endif
  
 +#if defined(__NetBSD__)
 +#include <sys/ioctl.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-lib_include_vmblock__user
  static INLINE int
  VMBLOCK_CONTROL_FUSE(int fd,            // IN
                       char op,           // IN
-@@ -125,7 +129,7 @@ VMBLOCK_CONTROL(int fd, int op, const ch
+@@ -129,7 +133,7 @@ VMBLOCK_CONTROL(int fd, int op, const ch
     return write(fd, path, op);
  }
  
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c:1.1       Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c   Mon Jan  1 06:56:01 2018
@@ -1,22 +1,22 @@
-$NetBSD: patch-services_plugins_dndcp_dnd_dndLinux.c,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-services_plugins_dndcp_dnd_dndLinux.c,v 1.2 2018/01/01 06:56:01 ryoon Exp $
 
---- services/plugins/dndcp/dnd/dndLinux.c.orig 2016-02-16 20:06:48.000000000 +0000
+--- services/plugins/dndcp/dnd/dndLinux.c.orig 2017-12-15 19:09:51.000000000 +0000
 +++ services/plugins/dndcp/dnd/dndLinux.c
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
  #include "util.h"
  #include "escape.h"
  #include "su.h"
--#if defined(linux) || defined(sun) || defined(__FreeBSD__)
-+#if defined(linux) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__linux__) || defined(sun) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
  #include "vmblock_user.h"
  #include "mntinfo.h"
  #endif
-@@ -276,7 +276,7 @@ DnD_UriIsNonFileSchemes(const char *uri)
+@@ -277,7 +277,7 @@ DnD_UriIsNonFileSchemes(const char *uri)
  
  
  /* We need to make this suck less. */
--#if defined(linux) || defined(sun) || defined(__FreeBSD__)
-+#if defined(linux) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__linux__) || defined(sun) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)
  
  /*
   *----------------------------------------------------------------------------

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c:1.1
--- /dev/null   Mon Jan  1 06:56:01 2018
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c  Mon Jan  1 06:56:01 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_misc_vthreadBase.c,v 1.1 2018/01/01 06:56:01 ryoon Exp $
+
+--- lib/misc/vthreadBase.c.orig        2017-12-15 19:09:51.000000000 +0000
++++ lib/misc/vthreadBase.c
+@@ -352,6 +352,8 @@ VThreadBase_GetKernelID(void)
+ #  endif
+    // Best effort until FreeBSD header update
+    return (uint64)(uintptr_t)(void *)pthread_self();
++#elif defined(__NetBSD__)
++   return (uint64)(uintptr_t)(void *)pthread_self();
+ #else
+ #  error "Unknown platform"
+ #endif

Prev by Date: CVS commit: pkgsrc/lang/squeak
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/squeak
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index