- Update to 9.2.3-1031360 [1]

- Fix build on CURRENT

PR:		ports/180471 [1] (partially)
Submitted by:	Douglas Carmichael <dcarmich@dcarmichael.net> [1] (partially)

13 files changed, 33 insertions, 221 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index bd9d02d3357b..bd94bbfc9e6b 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=		${BUILD_VER}
 PORTREVISION=		4
 PORTEPOCH=		1
 CATEGORIES=		emulators
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
 DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
 MAINTAINER=		swills@FreeBSD.org
@@ -15,8 +15,8 @@ COMMENT?=		Open VMware tools for FreeBSD VMware guests
 LICENSE=		LGPL21
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-RELEASE_VER=		8.6.0
-BUILD_VER=		425873
+RELEASE_VER=		9.2.3
+BUILD_VER=		1031360
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
@@ -37,12 +37,6 @@ CONFLICTS=		open-vm-tools-[0-9]*
 .if !defined(WITHOUT_LIBNOTIFY)
 LIB_DEPENDS+=		libnotify.so:${PORTSDIR}/devel/libnotify
 .endif
-.if defined(WITH_UNITY)
-CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
-LIB_DEPENDS+=		liburiparser.so:${PORTSDIR}/net/uriparser
-.else
-CONFIGURE_ARGS+=	--disable-unity
-.endif
 CONFIGURE_ARGS+=	--with-x
 LDFLAGS+=		-L${LOCALBASE}/lib
 USE_XORG=		x11 ice sm xext xineramaproto xinerama xrandr xrender \
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 0fa47bdb2244..2100e576ec68 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
-SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
+SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
+SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935
diff --git a/emulators/open-vm-tools/files/patch-appUtilX11.c b/emulators/open-vm-tools/files/patch-appUtilX11.c
deleted file mode 100644
index 2757fb6bd712..000000000000
--- a/emulators/open-vm-tools/files/patch-appUtilX11.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./lib/appUtil/appUtilX11.c.orig	2009-02-18 17:02:41.000000000 +0900
-+++ ./lib/appUtil/appUtilX11.c	2009-03-24 18:54:18.000000000 +0900
-@@ -26,6 +26,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#if defined(__FreeBSD__)
-+#include <libgen.h>
-+#endif
- 
- #include "vmware.h"
- #include "str.h"
diff --git a/emulators/open-vm-tools/files/patch-checkvm.c b/emulators/open-vm-tools/files/patch-checkvm.c
deleted file mode 100644
index 81cbec9239e9..000000000000
--- a/emulators/open-vm-tools/files/patch-checkvm.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- checkvm/checkvm.c.orig
-+++ checkvm/checkvm.c
-@@ -56,7 +56,7 @@
-     uint32       val
- )
- {
--  __asm__ volatile("out%L0 (%%dx)" : :"a" (val), "d" (port));
-+  __asm__ volatile("outl %%eax, %%dx" : :"a" (val), "d" (port));
- }
- 
- static __inline__ uint32
-@@ -66,7 +66,7 @@
- {
-   uint32 ret;
- 
--  __asm__ volatile("in%L0 (%%dx)" : "=a" (ret) : "d" (port));
-+  __asm__ volatile("inl %%dx, %%eax" : "=a" (ret) : "d" (port));
-   return ret;
- }
- 
-@@ -79,7 +79,7 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
-+   __asm__ volatile("inl %%dx, %%eax" :
-    	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION),
- 		    "2"(BDOOR_PORT) : "memory");
-@@ -96,7 +96,7 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
-+   __asm__ volatile("inl %%dx, %%eax" :
-    	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION),
- 		    "2"(BDOOR_PORT) : "memory");
-@@ -112,7 +112,7 @@
- {
-    uint32 eax, ebx, ecx, edx;
-    
--   __asm__ volatile("inl (%%dx)" :
-+   __asm__ volatile("inl %%dx, %%eax" :
-    		    "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
- 		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETSCREENSIZE),
- 		    "2"(BDOOR_PORT) : "memory");
diff --git a/emulators/open-vm-tools/files/patch-dndLinux.c b/emulators/open-vm-tools/files/patch-dndLinux.c
deleted file mode 100644
index 1f525f5a44e0..000000000000
--- a/emulators/open-vm-tools/files/patch-dndLinux.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/plugins/dndcp/dnd/dndLinux.c.orig
-+++ services/plugins/dndcp/dnd/dndLinux.c
-@@ -455,7 +455,7 @@
- DnD_CheckBlockFuse(int blockFd)                    // IN
- {
-    char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
--   size_t size;
-+   ssize_t size;
- 
-    size = read(blockFd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
-    if (size < 0) {
diff --git a/emulators/open-vm-tools/files/patch-freebsd-9 b/emulators/open-vm-tools/files/patch-freebsd-9
deleted file mode 100644
index e432bb7e2314..000000000000
--- a/emulators/open-vm-tools/files/patch-freebsd-9
+++ /dev/null
@@ -1,38 +0,0 @@
---- modules/freebsd/vmxnet/if_vxn.c.orig	2009-12-31 09:34:42.000000000 +0100
-+++ modules/freebsd/vmxnet/if_vxn.c	2009-12-31 09:36:56.000000000 +0100
-@@ -134,7 +134,9 @@
- static void vxn_init(void *);
- static void vxn_start(struct ifnet *);
- static int vxn_ioctl(struct ifnet *, u_long, caddr_t);
-+#if __FreeBSD_version <= 900000
- static void vxn_watchdog(struct ifnet *);
-+#endif
- static void vxn_intr (void *);
- 
- static void vxn_rx(vxn_softc_t *sc);
-@@ -383,7 +385,9 @@
-    ifp->if_ioctl = vxn_ioctl;
-    ifp->if_output = ether_output;
-    ifp->if_start = vxn_start;
-+#if __FreeBSD_version <= 900000
-    ifp->if_watchdog = vxn_watchdog;
-+#endif
-    ifp->if_init = vxn_init;
-    ifp->if_baudrate = 1000000000;
-    ifp->if_snd.ifq_maxlen = sc->vxn_num_tx_bufs;
-@@ -1018,6 +1022,7 @@
-    return error;
- }
- 
-+#if __FreeBSD_version <= 900000
- /*
-  *-----------------------------------------------------------------------------
-  * vxn_watchdog --
-@@ -1035,6 +1040,7 @@
- {
-    printf("vxn%d: watchdog\n", VXN_IF_UNIT(ifp));
- }
-+#endif
- 
- /*
-  *-----------------------------------------------------------------------------
diff --git a/emulators/open-vm-tools/files/patch-hgfsserver.c b/emulators/open-vm-tools/files/patch-hgfsserver.c
deleted file mode 100644
index 1a544b4c6e52..000000000000
--- a/emulators/open-vm-tools/files/patch-hgfsserver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/hgfsServer/hgfsServer.c.orig
-+++ lib/hgfsServer/hgfsServer.c
-@@ -3557,7 +3557,7 @@
-     * delimiter on copy. Allow 0 length drives so that hidden feature "" can
-     * work.
-     */
--   if (pathLength < 0 || pathLength >= sizeof p.mountPoint) {
-+   if (pathLength >= sizeof p.mountPoint) {
-       LOG(4, ("%s: could not get the volume name\n", __FUNCTION__));
- 
-       return FALSE;
diff --git a/emulators/open-vm-tools/files/patch-hgfsserverlinux.c b/emulators/open-vm-tools/files/patch-hgfsserverlinux.c
deleted file mode 100644
index 8e3393dc8be1..000000000000
--- a/emulators/open-vm-tools/files/patch-hgfsserverlinux.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/hgfsServer/hgfsServerLinux.c.orig
-+++ lib/hgfsServer/hgfsServerLinux.c
-@@ -551,7 +551,7 @@
- 
-    arraySize = ARRAYSIZE(HgfsServerOpenFlags);
- 
--   if (flagsIn < 0 || flagsIn >= arraySize) {
-+   if (flagsIn >= arraySize) {
-       Log("%s: Invalid HgfsOpenFlags %d\n", __FUNCTION__, flagsIn);
- 
-       return FALSE;
diff --git a/emulators/open-vm-tools/files/patch-if_vxn.c b/emulators/open-vm-tools/files/patch-if_vxn.c
new file mode 100644
index 000000000000..4ecf23373968
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-if_vxn.c
@@ -0,0 +1,13 @@
+--- modules/freebsd/vmxnet/if_vxn.c.orig	2013-11-16 03:47:08.000000000 +0000
++++ modules/freebsd/vmxnet/if_vxn.c	2013-11-16 03:51:10.000000000 +0000
+@@ -76,6 +76,10 @@
+ #include <pci/pcivar.h>
+ #endif
+ 
++#if __FreeBSD_version >= 1100001
++#include <net/if_var.h>
++#endif
++
+ /* define INLINE the way gcc likes it */
+ #define INLINE __inline__
+ 
diff --git a/emulators/open-vm-tools/files/patch-services-Makefile b/emulators/open-vm-tools/files/patch-services-Makefile
deleted file mode 100644
index 8010d3b1a214..000000000000
--- a/emulators/open-vm-tools/files/patch-services-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- services/Makefile.am.orig	2009-02-28 20:48:46.000000000 +0100
-+++ services/Makefile.am	2009-02-28 20:49:28.000000000 +0100
-@@ -20,6 +20,5 @@
- SUBDIRS += plugins
- 
- install-exec-local:
--	mkdir -p $(DESTDIR)/etc/vmware-tools
--	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
- 
---- services/Makefile.in.orig	2009-02-28 20:48:52.000000000 +0100
-+++ services/Makefile.in	2009-02-28 20:49:46.000000000 +0100
-@@ -642,8 +642,7 @@
- 
- 
- install-exec-local:
--	mkdir -p $(DESTDIR)/etc/vmware-tools
--	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/emulators/open-vm-tools/files/patch-vmhgfs-Makefile b/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
index e5c592f4c518..19cbdbe7dc5f 100644
--- a/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
+++ b/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
@@ -1,27 +1,21 @@
---- ./modules/freebsd/vmhgfs/Makefile.orig	2010-10-20 05:19:54.000000000 +0900
-+++ ./modules/freebsd/vmhgfs/Makefile	2010-11-11 23:06:07.000000000 +0900
-@@ -90,22 +90,7 @@
-    CFLAGS += -Ishared
+--- modules/freebsd/vmhgfs/Makefile.orig	2013-04-17 22:12:22.000000000 +0000
++++ modules/freebsd/vmhgfs/Makefile	2013-11-16 03:21:39.890032940 +0000
+@@ -47,7 +47,7 @@
  .endif
  
--#
--# FreeBSD's kernel module build system defines a bunch of additional warning
--# flags for the compiler in addition to -Wall -Werror.  However, some of these,
--# like -Wredundant-decls, are overkill.  To get around this, I copied their list
--# of warning flags, but explicitly disabled a few.
--#
--CWARNFLAGS := -Wall
--CWARNFLAGS += -Werror
--CWARNFLAGS += -Wno-redundant-decls
--CWARNFLAGS += -Wnested-externs
--CWARNFLAGS += -Wstrict-prototypes
--CWARNFLAGS += -Wno-missing-prototypes
--CWARNFLAGS += -Wpointer-arith
--CWARNFLAGS += -Winline
--CWARNFLAGS += -Wcast-qual
--
+ COMMON_HGFS_SRCS := debug.c
+-COMMON_HGFS_SRCS := bdhandler.c
++COMMON_HGFS_SRCS += bdhandler.c
+ COMMON_HGFS_SRCS += request.c
+ COMMON_HGFS_SRCS += worker.c
+ COMMON_HGFS_SRCS += fsutil.c
+@@ -108,7 +108,9 @@
+ CWARNFLAGS += -Wpointer-arith
+ CWARNFLAGS += -Winline
+ CWARNFLAGS += -Wcast-qual
++CWARNFLAGS += ${NO_WUNNEEDED_INTERNAL_DECL}
+ 
  EXPORT_SYMS = NO
  
 +.include <bsd.own.mk>
  .include <bsd.kmod.mk>
-
diff --git a/emulators/open-vm-tools/files/patch-vmhgfs-state.c b/emulators/open-vm-tools/files/patch-vmhgfs-state.c
deleted file mode 100644
index b718e2b93b75..000000000000
--- a/emulators/open-vm-tools/files/patch-vmhgfs-state.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- modules/freebsd/vmhgfs/state.c.orig	2010-10-20 05:19:54.000000000 +0900
-+++ modules/freebsd/vmhgfs/state.c	2010-11-16 13:27:57.000000000 +0900
-@@ -770,6 +770,12 @@
-       goto destroyVnode;
-    }
- 
-+#if __FreeBSD_version >= 700034
-+   if ((ret = insmntque(vp, vfsp)) != 0) {
-+      return ret;
-+   }
-+#endif
-+
-    /*
-     * Now we'll initialize the vnode.  We need to set the file type, vnode
-     * operations, flags, filesystem pointer, reference count, and device.
-@@ -1277,6 +1283,7 @@
-  *----------------------------------------------------------------------------
-  */
- 
-+#if 0 /* never used */
- void
- HgfsMarkFileMmapped(struct vnode *vp,    // vnode which state is being changed
-                     Bool mmapped)        // New mapping state
-@@ -1286,6 +1293,7 @@
-    fp = HGFS_VP_TO_FP(vp);
-    fp->mmapped = mmapped;
- }
-+#endif
- 
- /* Adding/finding/removing file state from hash table */
- 
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index c579d30dc89c..47c6c57cf68e 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -14,7 +14,6 @@ lib/open-vm-tools/plugins/common/libhgfsServer.la
 lib/open-vm-tools/plugins/common/libvix.so
 lib/open-vm-tools/plugins/common/libvix.la
 %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
-%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
 lib/libhgfs.a
@@ -40,16 +39,12 @@ include/vmGuestLib/vmSessionId.h
 include/vmGuestLib/vm_basic_types.h
 @exec mkdir -p %D/lib/vmware-tools/modules/input
 sbin/mount_vmhgfs
-%%X11%%bin/vmware-toolbox
 %%X11%%bin/vmware-user-suid-wrapper
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-share/open-vm-tools/messages/de/toolbox.vmsg
-share/open-vm-tools/messages/ja/toolbox.vmsg
-share/open-vm-tools/messages/zh_CN/toolbox.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
@@ -57,7 +52,6 @@ share/vmware-tools/scripts/vmware/network
 @dirrmtry lib/vmware-tools/modules/input
 @dirrmtry lib/vmware-tools/modules
 @dirrmtry lib/vmware-tools
-@dirrmtry etc/vmware-tools
 @dirrmtry share/open-vm-tools/messages/de
 @dirrmtry share/open-vm-tools/messages/ja
 @dirrmtry share/open-vm-tools/messages/zh_CN