6 files changed, 26 insertions, 76 deletions
diff --git a/emulators/vmware-tools2/Makefile b/emulators/vmware-tools2/Makefile
index 23ca8ff9c1f8..10fc04a49e7a 100644
--- a/emulators/vmware-tools2/Makefile
+++ b/emulators/vmware-tools2/Makefile
@@ -8,16 +8,15 @@
 PORTNAME=	vmware-tools
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
 CATEGORIES=	emulators
-MASTER_SITES=	# none
-DISTNAME=	vmware-freebsd-tools
+MASTER_SITES=	http://vmware-svca.www.conxion.com/software/ \
+		http://vmware-chil.www.conxion.com/software/ \
+		http://vmware-heva.www.conxion.com/software/ \
+		http://vmware.wespe.de/software/ \
+		ftp://vmware.wespe.de/pub/software/
+DISTNAME=	tools-for-freebsd-${BUILD_VER}
 
 MAINTAINER=	matusita@FreeBSD.org
 
-LIB_DEPENDS=	c.3:${PORTSDIR}/misc/compat3x
-RUN_DEPENDS=	${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd
-
-DISTDIR=	${MOUNT_PT}
-IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/vmware-freebsd-tools
 
 ONLY_FOR_ARCHS=	i386
@@ -26,64 +25,12 @@ NO_BUILD=	yes
 
 RESTRICTED=	"Not sure if we can redistribute this."
 
-VMWARE_VER=	3.0.0
-BUILD_VER=	1455
-
-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 \"Settings\" -> \"VMware Tools Install...\" from the Wrokstation 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}
+VMWARE_VER=	2.0.4
+BUILD_VER=	307
 
 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
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/vmware-tools2/distinfo b/emulators/vmware-tools2/distinfo
new file mode 100644
index 000000000000..57f4e3d4ab0e
--- /dev/null
+++ b/emulators/vmware-tools2/distinfo
@@ -0,0 +1 @@
+MD5 (tools-for-freebsd-307.tar.gz) = c9e4b04abe26f7158003fa183bcfa48f
diff --git a/emulators/vmware-tools2/pkg-comment b/emulators/vmware-tools2/pkg-comment
index 2d6183bd4376..16259bc1a645 100644
--- a/emulators/vmware-tools2/pkg-comment
+++ b/emulators/vmware-tools2/pkg-comment
@@ -1 +1 @@
-VMware tools for FreeBSD guest OS
+VMware tools for FreeBSD guest OS (for VMware 2.x)
diff --git a/emulators/vmware-tools2/pkg-descr b/emulators/vmware-tools2/pkg-descr
index e8deec969f96..6ccd281f4a21 100644
--- a/emulators/vmware-tools2/pkg-descr
+++ b/emulators/vmware-tools2/pkg-descr
@@ -3,14 +3,12 @@ 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.
+configulation files, and special X server for Guest OS.  However,
+vmware-toolbox for FreeBSD lacks some features that vmware-toolbox for
+Linux has, and dual-boot configulation is broken because checkvm
+doesn't work.
 
-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-guestd, but this port install guestd automatically.
+So this port installs X server ONLY.  If you want vmware-toolbox,
+install emulators/linux-vmware-toolbox on your FreeBSD _Guest_ OS.
 
-WWW:	http://www.vmware.com/products/desktop/ws_features.html
+WWW:	http://www.vmware.com/download/downloadtools.html
diff --git a/emulators/vmware-tools2/pkg-message b/emulators/vmware-tools2/pkg-message
new file mode 100644
index 000000000000..57a109cb8812
--- /dev/null
+++ b/emulators/vmware-tools2/pkg-message
@@ -0,0 +1,5 @@
+XFree86 configulation file is in ${PREFIX}/etc/XF86Config_VMware.
+Copy this file to /etc/XF86Config before starting X.
+
+This package does not contain vmware-toolbox.  You need to install
+emulators/linux-vmware-toolbox if you want it.
diff --git a/emulators/vmware-tools2/pkg-plist b/emulators/vmware-tools2/pkg-plist
index 51edd7fd6855..fd515f110692 100644
--- a/emulators/vmware-tools2/pkg-plist
+++ b/emulators/vmware-tools2/pkg-plist
@@ -1,3 +1,2 @@
-bin/vmware-toolbox
-%%INSTALLXSERVER:%%bin/XF86_VMware
-%%INSTALLXSERVER:%%etc/XF86Config_VMware
+bin/XF86_VMware
+etc/XF86Config_VMware