- Update to 425873

- Unmark broken
- Pet portlint

PR:		ports/161001
Submitted by:	swills (me)
Approved by:	maintainer timeout (>2 weeks)

6 files changed, 26 insertions, 51 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 6e97d61c0aa..e4ba096d510 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		4
 CATEGORIES=		emulators kld
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
-DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
+DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
 MAINTAINER=		mbr@FreeBSD.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
@@ -18,10 +17,10 @@ COMMENT?=		Open VMware tools for FreeBSD VMware guests
 LICENSE=		LGPL21
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-RELEASE_DATE=		2010.10.18
-BUILD_VER=		313025
+RELEASE_VER=		8.6.0
+BUILD_VER=		425873
 
-WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
+WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 
@@ -43,14 +42,12 @@ CONFIGURE_ARGS+=	--disable-unity
 .endif
 LIB_DEPENDS+=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 CONFIGURE_ARGS+=	--with-x
-CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 USE_XORG=		x11 ice sm xext xineramaproto xinerama xrandr xrender \
 			xtst
 USE_GNOME=		gtk20 glib20
 PLIST_SUB+=		X11=""
 CONFLICTS=		open-vm-tools-nox11-[0-9]*
-BROKEN=			Does not compile with X11 support
 .endif
 
 .if !defined(WITHOUT_FUSE)
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 89fd09259b7..0fa47bdb224 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) = cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
-SIZE (open-vm-tools-2010.10.18-313025.tar.gz) = 3565621
+SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
+SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
diff --git a/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in b/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in
index 17fdf9708a2..9d9d10a38fb 100644
--- a/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in
+++ b/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in
@@ -1,15 +1,22 @@
---- hgfsmounter/Makefile.in.orig	2009-04-06 17:24:30.000000000 -0400
-+++ hgfsmounter/Makefile.in	2009-04-06 17:26:09.000000000 -0400
-@@ -569,9 +569,9 @@
+--- hgfsmounter/Makefile.in.orig	2011-09-21 18:25:50.000000000 +0000
++++ hgfsmounter/Makefile.in	2011-09-25 04:03:22.000000000 +0000
+@@ -606,14 +606,14 @@
  @FREEBSD_TRUE@	mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
  @FREEBSD_TRUE@		$(DESTDIR)$(sbindir)/mount_vmhgfs
- @FREEBSD_TRUE@@WITH_ROOT_PRIVILEGES_TRUE@	chmod u+s $(DESTDIR)$(sbindir)/mount_vmhgfs
--@FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
+ @FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
 -@FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
 -@FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
-+#@FREEBSD_TRUE@	-$(MKDIR_P) $(DESTDIR)/sbin
 +#@FREEBSD_TRUE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
 +#@FREEBSD_TRUE@		$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
  @FREEBSD_TRUE@uninstall-hook:
  @FREEBSD_TRUE@	rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
  @FREEBSD_FALSE@install-exec-hook:
+-@FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
+-@FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
+-@FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
++#@FREEBSD_FALSE@	-$(MKDIR_P) $(DESTDIR)/sbin
++#@FREEBSD_FALSE@	-$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
++#@FREEBSD_FALSE@		$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
+ @FREEBSD_FALSE@uninstall-hook:
+ @FREEBSD_FALSE@	rm -f $(DESTDIR)/sbin/mount.vmhgfs
+ 
diff --git a/emulators/open-vm-tools/files/patch-wrapper-Makefile.in b/emulators/open-vm-tools/files/patch-wrapper-Makefile.in
deleted file mode 100644
index ecd2355ae35..00000000000
--- a/emulators/open-vm-tools/files/patch-wrapper-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- vmware-user-suid-wrapper/Makefile.in.orig	2010-10-20 05:20:08.000000000 +0900
-+++ vmware-user-suid-wrapper/Makefile.in	2010-11-16 17:52:55.000000000 +0900
-@@ -301,7 +301,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\"
-+AM_CPPFLAGS = -DVMTOOLSD_PATH=\"$(bindir)/vmtoolsd\" -DVMWARE_KMOD_DIR=\"$(prefix)/lib/vmware-tools/modules/drivers\"
- vmware_user_suid_wrapper_SOURCES = main.c wrapper-@TARGET_OS@.c
- vmware_user_suid_wrapper_LDADD = ../lib/vmSignal/libVmSignal.la
- desktopfile = vmware-user.desktop
-@@ -583,7 +583,8 @@
- 
- info-am:
- 
--install-data-am: install-autostartDATA
-+#install-data-am: install-autostartDATA
-+install-data-am:
- 
- install-dvi: install-dvi-am
- 
diff --git a/emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c b/emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c
deleted file mode 100644
index c5c9d0a1fd2..00000000000
--- a/emulators/open-vm-tools/files/patch-wrapper-wrapper-freebsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmware-user-suid-wrapper/wrapper-freebsd.c.orig	2010-10-20 05:19:54.000000000 +0900
-+++ vmware-user-suid-wrapper/wrapper-freebsd.c	2010-11-16 17:52:55.000000000 +0900
-@@ -116,7 +116,7 @@
-    /*
-     * Kldload(2) will handle module search paths for us.
-     */
--   if (kldload(MODULE_NAME) == -1) {
-+   if (kldload(VMWARE_KMOD_DIR "/" MODULE_NAME ".ko") == -1) {
-       Error("failed to load vmblock: %s\n", strerror(errno));
-       return FALSE;
-    }
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index abf0f706b5f..c73f7906628 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -48,9 +48,9 @@ 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/toolboxcmd_de.vmsg
-share/open-vm-tools/messages/toolboxcmd_ja.vmsg
-share/open-vm-tools/messages/toolboxcmd_zh_CN.vmsg
+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
 @exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
@@ -62,6 +62,9 @@ share/vmware-tools/scripts/vmware/network
 @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
 @dirrmtry share/open-vm-tools/messages
 @dirrmtry share/open-vm-tools/scripts/vmware
 @dirrmtry share/open-vm-tools/scripts