- Update to 9.4.0

- Commit open-vm-tools-nox11 part of conversion to optionsNG missed in last
  commit [1]
- Fix plist issue with open-vm-tools-nox11 with optionsNG enabled

PR:		ports/183893 [1]
Submitted by:	mat

7 files changed, 58 insertions, 32 deletions

diff --git a/emulators/open-vm-tools-nox11/Makefile b/emulators/open-vm-tools-nox11/Makefile
index 8928d0c4a902..9db931d9654b 100644
--- a/emulators/open-vm-tools-nox11/Makefile
+++ b/emulators/open-vm-tools-nox11/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 MASTERDIR=      ${.CURDIR}/../open-vm-tools
-WITHOUT_X11=    yes
 PKGNAMESUFFIX=	-nox11
+OPTIONS_UNSET=	X11
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index aee478e37139..c82e3f1d4503 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		4
+PORTREVISION=		0
 PORTEPOCH=		1
 CATEGORIES=		emulators
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.4.x
 DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
 MAINTAINER=		swills@FreeBSD.org
@@ -15,16 +15,16 @@ COMMENT?=		Open VMware tools for FreeBSD VMware guests
 LICENSE=		LGPL21
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-RELEASE_VER=		9.2.3
-BUILD_VER=		1031360
+RELEASE_VER=		9.4.0
+BUILD_VER=		1280544
 
-OPTIONS_DEFINE=	X11 LIBNOTIFY UNITY FUSE DNET ICU
+OPTIONS_DEFINE=		X11 LIBNOTIFY UNITY FUSE DNET ICU
 OPTIONS_DEFAULT=	X11 LIBNOTIFY FUSE DNET ICU
 OPTIONS_SUB=
 
-DNET_DESC=	libdnet support
-LIBNOTIFY_DESC=	Desktop notification support
-UNITY_DESC=	liburiparser support
+DNET_DESC=		libdnet support
+LIBNOTIFY_DESC=		Desktop notification support
+UNITY_DESC=		liburiparser support
 
 X11_CONFIGURE_WITH=	x gtk2 gtkmm
 X11_LDFLAGS=		-L${LOCALBASE}/lib
@@ -36,9 +36,9 @@ UNITY_CONFIGURE_ENV=	CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser
 UNITY_LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
 UNITY_CONFIGURE_ENABLE=	unity
 DNET_CONFIGURE_WITH=	dnet
-DNET_LIB_DEPENDS=		libdnet.so:${PORTSDIR}/net/libdnet
+DNET_LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
 ICU_CONFIGURE_WITH=	icu
-ICU_LIB_DEPENDS=		libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 2100e576ec68..d4ec4ab80ec7 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
-SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935
+SHA256 (open-vm-tools-9.4.0-1280544.tar.gz) = 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399
+SIZE (open-vm-tools-9.4.0-1280544.tar.gz) = 3659504
diff --git a/emulators/open-vm-tools/files/patch-hostinfoPosix.c b/emulators/open-vm-tools/files/patch-hostinfoPosix.c
deleted file mode 100644
index 342a0c0fabd6..000000000000
--- a/emulators/open-vm-tools/files/patch-hostinfoPosix.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/misc/hostinfoPosix.c.orig	2010-04-28 03:17:27.000000000 +0900
-+++ ./lib/misc/hostinfoPosix.c	2010-11-11 22:37:23.000000000 +0900
-@@ -31,7 +31,6 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/timeb.h>
- #include <pwd.h>
- #include <pthread.h>
- #include <sys/resource.h>
diff --git a/emulators/open-vm-tools/files/patch-vm_basic_asm.h b/emulators/open-vm-tools/files/patch-vm_basic_asm.h
new file mode 100644
index 000000000000..cd66d07f0fc9
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vm_basic_asm.h
@@ -0,0 +1,11 @@
+--- lib/include/vm_basic_asm.h.orig	2013-11-13 03:22:29.000000000 +0000
++++ lib/include/vm_basic_asm.h	2013-11-13 03:24:26.000000000 +0000
+@@ -208,7 +208,7 @@
+ GetCallerEFlags(void)
+ {
+    unsigned long flags;
+-   asm volatile("pushf; pop %0" : "=r"(flags));
++   __asm__ volatile("pushf; pop %0" : "=r"(flags));
+    return flags;
+ }
+ 
diff --git a/emulators/open-vm-tools/files/patch-vmmemctl-os.c b/emulators/open-vm-tools/files/patch-vmmemctl-os.c
index af18715f6fc6..201906c49850 100644
--- a/emulators/open-vm-tools/files/patch-vmmemctl-os.c
+++ b/emulators/open-vm-tools/files/patch-vmmemctl-os.c
@@ -1,5 +1,5 @@
---- modules/freebsd/vmmemctl/os.c.orig	2011-09-21 20:25:15.000000000 +0200
-+++ modules/freebsd/vmmemctl/os.c	2013-10-19 11:01:27.000000000 +0200
+--- modules/freebsd/vmmemctl/os.c.orig	2013-09-23 15:51:10.000000000 +0000
++++ modules/freebsd/vmmemctl/os.c	2013-11-16 19:55:06.152925027 +0000
 @@ -37,9 +37,11 @@
  #include <sys/param.h>
  #include <sys/systm.h>
@@ -12,7 +12,33 @@
  #include <sys/sysctl.h>
  
  #include <vm/vm.h>
-@@ -264,14 +266,23 @@
+@@ -295,7 +297,13 @@
+ Mapping
+ OS_MapPageHandle(PageHandle handle)     // IN
+ {
++
++#if __FreeBSD_version >= 1000042
++   vm_offset_t res = kva_alloc(PAGE_SIZE);
++#else
+    vm_offset_t res = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
++#endif
++
+    vm_page_t page = (vm_page_t)handle;
+ 
+    if (!res) {
+@@ -352,7 +360,11 @@
+ OS_UnmapPage(Mapping mapping)           // IN
+ {
+    pmap_qremove((vm_offset_t)mapping, 1);
++#if __FreeBSD_version >= 1000042
++   kva_free((vm_offset_t)mapping, PAGE_SIZE);
++#else
+    kmem_free(kernel_map, (vm_offset_t)mapping, PAGE_SIZE);
++#endif
+ }
+ 
+ 
+@@ -369,14 +381,23 @@
     p->size = (p->size + sizeof(unsigned long) - 1) & 
                           ~(sizeof(unsigned long) - 1);
  
@@ -29,14 +55,14 @@
  os_pmap_free(os_pmap *p) // IN
  {
 +#if __FreeBSD_version >= 1000042
-+   kmem_free(kernel_arena, (vm_offset_t)p->bitmap, p->size);
++   kva_free((vm_offset_t)p->bitmap, p->size);
 +#else
     kmem_free(kernel_map, (vm_offset_t)p->bitmap, p->size);
 +#endif
     p->size = 0;
     p->bitmap = NULL;
  }
-@@ -344,12 +355,31 @@
+@@ -449,12 +470,31 @@
     os_state *state = &global_state;
     os_pmap *pmap = &state->pmap;
  
@@ -73,7 +99,7 @@
  }
  
  
-@@ -361,8 +391,19 @@
+@@ -466,8 +506,19 @@
     os_state *state = &global_state;
     os_pmap *pmap = &state->pmap;
  
@@ -93,7 +119,7 @@
        return NULL;
     }
  
-@@ -383,6 +424,11 @@
+@@ -488,6 +539,11 @@
     if (!page) {
        os_pmap_putindex(pmap, pindex);
     }
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 3459da4717c1..3c4bd4cc0133 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -4,7 +4,7 @@ bin/vmware-rpctool
 bin/vmware-xferlogs
 bin/vmtoolsd
 bin/vmware-toolbox-cmd
-%%FUSE%%bin/vmware-vmblock-fuse
+%%X11%%%%FUSE%%bin/vmware-vmblock-fuse
 lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
 lib/open-vm-tools/plugins/vmsvc/libtimeSync.so