6 files changed, 67 insertions, 43 deletions

diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile
index 77d0cb092888..1cc979ce2c6f 100644
--- a/emulators/linux-vmware-toolbox6/Makefile
+++ b/emulators/linux-vmware-toolbox6/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	VMwareTools-${VMWARE_VER}-${BUILD_VER}
 
 MAINTAINER=	matusita@FreeBSD.org
-COMMENT=VMware toolbox for guest OS (VMware Workstation 5.x, Linux version)
+COMMENT=VMware toolbox for guest OS (VMware Workstation 6.x, Linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
@@ -34,8 +34,8 @@ IS_INTERACTIVE=	yes
 RESTRICTED=	"Not sure if we can redistribute this."
 NO_PACKAGE=	${RESTRICTED}
 
-VMWARE_VER=	5.5.1
-BUILD_VER=	19175
+VMWARE_VER=	6.0.0
+BUILD_VER=	39849
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 901c3ec0ad3d..dded4ab6b718 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	2
+#PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
 DISTNAME=	vmware-freebsd-tools
 
 MAINTAINER=	matusita@FreeBSD.org
-COMMENT?=VMware guest OS supporting daemon (VMware Workstation 5.x, FreeBSD version)
+COMMENT?=VMware guest OS supporting daemon (VMware Workstation 6.x, FreeBSD version)
 
 .if defined(VMWARE_X_PORTS)
 RUN_DEPENDS=	${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd5
@@ -32,14 +32,12 @@ IS_INTERACTIVE=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 .if defined(WITH_VMWARE_GTK)
-PLIST_SUB+=	INSTALLXGTKTOOL:=""
+PLIST_SUB+=	INSTALLXGTKTOOL=""
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GNOME=	glib12 gtk12
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .else
-PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
+PLIST_SUB+=	INSTALLXGTKTOOL="@comment "
 .endif
 .else
 USE_RC_SUBR=	vmware-guestd.sh
@@ -48,11 +46,16 @@ USE_RC_SUBR=	vmware-guestd.sh
 RESTRICTED=	"Not sure if we can redistribute this."
 NO_PACKAGE=	${RESTRICTED}
 
-VMWARE_VER=	5.5.1
-BUILD_VER=	19175
+VMWARE_VER=	6.0.0
+BUILD_VER=	39849
 
 .include <bsd.port.pre.mk>
 
+.if (${OSVERSION} >= 700000) && (!exists(/lib/libc.so.6))
+IGNORE= requires libc.so.6
+#LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+.endif
+
 .if ${OSVERSION} < 500000
 MOUNT_DEV?=	/dev/acd0c
 .else
@@ -67,13 +70,18 @@ BITS?=		32
 .else # ${ARCH} == amd64
 BITS?=		64
 .endif
+.if ${OSVERSION} < 600000
+OSSFX?=
+.else # ${OSVERSION >= 600000
+OSSFX?=		-6
+.endif
 
 .if defined(VMWARE_X_PORTS)
 
 .if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER4:=""
+PLIST_SUB+=	INSTALLXSERVER4=""
 .else
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
+PLIST_SUB+=	INSTALLXSERVER4="@comment "
 .endif
 
 .else
@@ -88,35 +96,48 @@ WITH_VMWARE_VMXNET=YES
 .endif
 
 .if defined(WITH_VMWARE_VMMEMCTL)
-PLIST_SUB+=	VMWARE_VMMEMCTL:=""
+PLIST_SUB+=	VMWARE_VMMEMCTL=""
 .else
-PLIST_SUB+=	VMWARE_VMMEMCTL:="@comment "
+PLIST_SUB+=	VMWARE_VMMEMCTL="@comment "
 .endif
 
 .if defined(WITH_VMWARE_VMXNET)
-.if (${OSVERSION} >= 480000) && (${OSVERSION} < 500000) && (${BITS} == 32)
-PLIST_SUB+=	VMWARE_VMXNET:=""
+.if (${OSVERSION} >= 300000) && (${OSVERSION} < 400000) && (${BITS} == 32)
+PLIST_SUB+=	VMWARE_VMXNET=""
+VMWARE_VMXNET_PATH=	3.2/vmxnet.ko
+.elif (${OSVERSION} >= 400000) && (${OSVERSION} < 480000) && (${BITS} == 32)
+PLIST_SUB+=	VMWARE_VMXNET=""
+VMWARE_VMXNET_PATH=	4.0/vmxnet.ko
+.elif (${OSVERSION} >= 480000) && (${OSVERSION} < 500000) && (${BITS} == 32)
+PLIST_SUB+=	VMWARE_VMXNET=""
 VMWARE_VMXNET_PATH=	4.9/vmxnet.ko
 .elif (${OSVERSION} >= 500000) && (${OSVERSION} < 600000)
-PLIST_SUB+=	VMWARE_VMXNET:=""
+PLIST_SUB+=	VMWARE_VMXNET=""
 .if ${BITS} == 32
 VMWARE_VMXNET_PATH=	5.3-i386/vmxnet.ko
 .else
 VMWARE_VMXNET_PATH=	5.3-amd64/vmxnet.ko
 .endif
+.elif (${OSVERSION} >= 600000) && (${OSVERSION} < 700000)
+PLIST_SUB+=	VMWARE_VMXNET=""
+.if ${BITS} == 32
+VMWARE_VMXNET_PATH=	6.0-i386/vmxnet.ko
+.else
+VMWARE_VMXNET_PATH=	6.0-amd64/vmxnet.ko
+.endif
 .else
 # VMware doesn't provide vmxnet.ko for other versions
 .undef WITH_VMWARE_VMXNET
-PLIST_SUB+=	VMWARE_VMXNET:="@comment "
+PLIST_SUB+=	VMWARE_VMXNET="@comment "
 .endif
 .else
-PLIST_SUB+=	VMWARE_VMXNET:="@comment "
+PLIST_SUB+=	VMWARE_VMXNET="@comment "
 .endif
 
 .if defined(WITH_VMWARE_VMMEMCTL) || defined(WITH_VMWARE_VMXNET)
-PLIST_SUB+=	VMWARE_KMODDIR:=""
+PLIST_SUB+=	VMWARE_KMODDIR=""
 .else
-PLIST_SUB+=	VMWARE_KMODDIR:="@comment "
+PLIST_SUB+=	VMWARE_KMODDIR="@comment "
 .endif
 
 .endif
@@ -158,19 +179,19 @@ post-extract:
 .if defined(VMWARE_X_PORTS)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${X11BASE}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-tcl ${X11BASE}/bin
 	${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox
 .if defined(WITH_VMWARE_GTK)
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/drivers ; \
 	fi
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
+	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 .if ${BITS} == 32
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
@@ -180,18 +201,20 @@ do-install:
 .endif
 .else
 .if ${BITS} == 32
+	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .else
+	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .endif
 .endif
-	-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
+	-${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1
 
 .else
 
 post-patch:
 	LC_CTYPE=C ${REINPLACE_CMD} "`${PRINTF} 's|\0152\013\0350|\0152\\\n\0350|g'`" \
-		${WRKSRC}/lib/sbin${BITS}/vmware-checkvm
+		${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-checkvm
 
 do-build:
 .if defined(WITH_VMWARE_VMMEMCTL)
@@ -203,8 +226,8 @@ do-install:
 		${ECHO_CMD} "Remove old ${PREFIX}/etc/rc.d/${USE_RC_SUBR} before install."; \
 		exit 1; \
 	fi
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-guestd ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-checkvm ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-checkvm ${PREFIX}/sbin
 .if defined(WITH_VMWARE_VMMEMCTL)
 	${MKDIR} ${VMWARE_KMODDIR}
 	${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
@@ -213,7 +236,7 @@ do-install:
 	${MKDIR} ${VMWARE_KMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
 .endif
-	-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
+	-${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1
 	${MKDIR} ${PREFIX}/share/vmware-tools
 	${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default
 	${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default
diff --git a/emulators/vmware-guestd6/pkg-descr.tools b/emulators/vmware-guestd6/pkg-descr.tools
index cccff5433821..291162d0271d 100644
--- a/emulators/vmware-guestd6/pkg-descr.tools
+++ b/emulators/vmware-guestd6/pkg-descr.tools
@@ -8,7 +8,7 @@ since it requires to modify /etc files.
 
 This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
-ports/emulators/vmware-guestd4, but this port install guestd automatically.
+ports/emulators/vmware-guestd6, but this port install guestd automatically.
 
 This port assumes that a) users want only "must-have" binaries and
 b) guest OS runs on a certain architecture and never be changed.  For
diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist
index 5db02fe2affb..db0e4c7b647d 100644
--- a/emulators/vmware-guestd6/pkg-plist
+++ b/emulators/vmware-guestd6/pkg-plist
@@ -1,10 +1,10 @@
 @stopdaemon vmware-guestd
 sbin/vmware-checkvm
 sbin/vmware-guestd
-%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
-%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
-%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules
-%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools
+%%VMWARE_VMMEMCTL%%lib/vmware-tools/modules/vmmemctl.ko
+%%VMWARE_VMXNET%%lib/vmware-tools/modules/vmxnet.ko
+%%VMWARE_KMODDIR%%@dirrmtry lib/vmware-tools/modules
+%%VMWARE_KMODDIR%%@dirrmtry lib/vmware-tools
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools
index 46e5ed9684cc..27e9f68924b1 100644
--- a/emulators/vmware-guestd6/pkg-plist.tools
+++ b/emulators/vmware-guestd6/pkg-plist.tools
@@ -1,8 +1,9 @@
 bin/vmware-toolbox
 bin/vmware-toolbox-tcl
-%%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk
-%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
-%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
+%%INSTALLXGTKTOOL%%bin/vmware-toolbox-gtk
+%%INSTALLXSERVER4%%etc/XF86Config-4_VMware
+lib/modules/drivers/vmware_drv.o_VMware
 lib/modules/input/vmmouse_drv.o_VMware
-%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
+@dirrmtry lib/modules/drivers
 @dirrmtry lib/modules/input
+@unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile
index 975e57444c43..998f15553681 100644
--- a/emulators/vmware-tools6/Makefile
+++ b/emulators/vmware-tools6/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	vmware
-PORTREVISION?=	2
+#PORTREVISION?=	0
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-tools
 
-COMMENT=VMware Tools for guest OS (VMware Workstation 5.x, FreeBSD version)
+COMMENT=VMware Tools for guest OS (VMware Workstation 6.x, FreeBSD version)
 
-MASTERDIR=	${.CURDIR}/../vmware-guestd5
+MASTERDIR=	${.CURDIR}/../vmware-guestd6
 DESCR=		${PKGDIR}/pkg-descr.tools
 PLIST=		${PKGDIR}/pkg-plist.tools