Update VMware Tools for 4.0.1 build-5289, the latest version of VMware

Workstation.

This commit makes vmware-tools4 a slave port of vmware-guestd4, since
both are made from the same tarball, and it would be easy to maintain.
Vmware-guestd4 also installs a kernel module named vmmemctl; you may
want to kldload(8) it with a shell script under rc.d/ directory.

VMware Workstation 4.0.1 does fix "jumping the pointer" bug (yeah, thanks
VMware developer team).  This means that you do not have to install
linux-vmware-toolbox4.  However, it can be used as it should be, I
do not disable and/or remove this port.

3 files changed, 7 insertions, 100 deletions

diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile
index 9c8e1b1d5303..6b376e402e01 100644
--- a/emulators/vmware-tools6/Makefile
+++ b/emulators/vmware-tools6/Makefile
@@ -5,90 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	vmware-tools
-PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-CATEGORIES=	emulators
+PORTNAME=	vmware
 MASTER_SITES=	# bundled with VMware itself
-DISTNAME=	vmware-freebsd-tools
+PKGNAMESUFFIX?=	-tools
 
-MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware tools for guest OS (for VMware 4.x, FreeBSD version)
 
-LIB_DEPENDS=	c.3:${PORTSDIR}/misc/compat3x
-RUN_DEPENDS=	${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd4
+MASTERDIR=	${.CURDIR}/../vmware-guestd4
+DESCR=		${PKGDIR}/pkg-descr.tools
+PLIST=		${PKGDIR}/pkg-plist.tools
 
-DISTDIR=	${MOUNT_PT}
-IGNOREFILES=	${DISTFILES}
-WRKSRC=		${WRKDIR}/vmware-freebsd-tools
+VMWARE_X_PORTS=	YES
 
-ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
-NO_BUILD=	yes
-.if !defined(BATCH)
-IS_INTERACTIVE=	yes
-.endif
-
-RESTRICTED=	"Not sure if we can redistribute this."
-NO_PACKAGE=	${RESTRICTED}
-
-VMWARE_VER=	4.0.0
-BUILD_VER=	4460
-
-MOUNT_DEV?=	/dev/acd0c
-MOUNT_PT?=	/mnt
-MOUNT=		/sbin/mount
-UMOUNT=		/sbin/umount
-
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-PLIST_SUB+=	INSTALLXSERVER:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER:="@comment "
-.endif
-
-do-fetch:
-	@${DO_NADA}
-fetch-list:
-	@${DO_NADA}
-
-pre-extract:
-	@${ECHO} ""
-	@${ECHO} "========================================================================"
-	@${ECHO} "Choose \"File\" -> \"Install VMware Tools...\" from the Workstation menu"
-	@${ECHO} "to connect the VM's CD-ROM drive temporarily to installation CD image."
-	@${ECHO} "========================================================================"
-	@${ECHO} ""
-.if !defined(BATCH)
-	@${ECHO} "This port mounts ${MOUNT_DEV} to ${MOUNT_PT}."
-	@${ECHO} ""
-	@${ECHO} -n "Are you ready? [Y/n]: "
-	@(read line;			\
-	  case "$${line}" in		\
-		[Nn]*)			\
-			${FALSE} ;;	\
-		*)			\
-			${TRUE} ;;	\
-	  esac)
-.endif
-	${MKDIR} ${MOUNT_PT}
-	-${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null
-	-${UMOUNT} ${MOUNT_DEV} 2>&1 >/dev/null
-	${MOUNT} -t cd9660 ${MOUNT_DEV} ${MOUNT_PT}
-
-post-extract:
-	${UMOUNT} ${MOUNT_PT}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin
-.if ${XFREE86_VERSION} == 3
-	${INSTALL_PROGRAM} ${WRKSRC}/XF86_VMware ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/XF86Config.dist ${PREFIX}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${PREFIX}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.endif
-	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/emulators/vmware-tools6/pkg-descr b/emulators/vmware-tools6/pkg-descr
deleted file mode 100644
index 68165f70e46f..000000000000
--- a/emulators/vmware-tools6/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-VMware tools support FreeBSD _guest_ OS running on VMware Workstation.
-Beware, this port is _not_ for FreeBSD _host_ OS.
-
-VMware tools for FreeBSD consist of vmware-toolbox which supports
-seamless operation between the Host and the Guest OS, dual-boot
-configulation files, and special XFree86 3.x server for Guest OS.
-However, we cannot install dual-boot configuration since it requires
-to modify /etc files.
-
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, 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.
-
-WWW:	http://www.vmware.com/products/desktop/ws_features.html
diff --git a/emulators/vmware-tools6/pkg-plist b/emulators/vmware-tools6/pkg-plist
deleted file mode 100644
index 51edd7fd6855..000000000000
--- a/emulators/vmware-tools6/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/vmware-toolbox
-%%INSTALLXSERVER:%%bin/XF86_VMware
-%%INSTALLXSERVER:%%etc/XF86Config_VMware