git: ecfed7ee5cb8 - main - emulators/open-vm-tools: Fix build after 1400043

From: Renato Botelho <garga_at_FreeBSD.org>
Date: Tue, 30 Nov 2021 19:42:33 UTC
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ecfed7ee5cb8f6cef90628a3df1ace1011b5dc17

commit ecfed7ee5cb8f6cef90628a3df1ace1011b5dc17
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2021-11-30 19:22:19 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2021-11-30 19:23:59 +0000

    emulators/open-vm-tools: Fix build after 1400043
    
    NDINIT() last parameter was removed after this osversion
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 emulators/open-vm-tools/Makefile                         |  1 +
 .../files/patch-modules_freebsd_vmblock_vfsops.c         | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index e23eb0d8a213..e243cf0085bf 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	open-vm-tools
 PORTVERSION=	11.3.5
+PORTREVISION=	1
 DISTVERSIONPREFIX=	stable-
 PORTEPOCH=	2
 CATEGORIES=	emulators
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
index 29639a7ac6bf..1b05ca6c1e9c 100644
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
@@ -1,4 +1,4 @@
---- modules/freebsd/vmblock/vfsops.c.orig	2018-03-30 18:44:35 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig	2021-09-24 04:19:18 UTC
 +++ modules/freebsd/vmblock/vfsops.c
 @@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
     char *pathname;
@@ -12,7 +12,19 @@
     VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
  
     /*
-@@ -276,6 +281,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
+@@ -171,7 +176,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
+     * Find lower node and lock if not already locked.
+     */
+ 
++#if __FreeBSD_version >= 1400043
++   NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target);
++#else
+    NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, compat_td);
++#endif
+    error = namei(ndp);
+    if (error) {
+       NDFREE(ndp, 0);
+@@ -276,6 +285,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
     void *mntdata;
     int error;
     int flags = 0, removed = 0;