6 files changed, 81 insertions, 32 deletions

diff --git a/emulators/vmware-tools2/Makefile b/emulators/vmware-tools2/Makefile
index e67f2d1f77ee..733a3a41096e 100644
--- a/emulators/vmware-tools2/Makefile
+++ b/emulators/vmware-tools2/Makefile
@@ -8,17 +8,16 @@
 PORTNAME=	vmware-tools
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
 CATEGORIES=	emulators
-MASTER_SITES=	${AU_ONLY_SITES} \
-		http://www4.vmware.com/software/ \
-		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}
+MASTER_SITES=	# none
+DISTNAME=	vmware-freebsd-tools
 
 MAINTAINER=	matusita@jp.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
@@ -27,16 +26,69 @@ NO_BUILD=	yes
 
 RESTRICTED=	"Not sure if we can redistribute this."
 
-.if defined(AU_RESIDENT) && (${AU_RESIDENT} == YES)
-AU_ONLY_SITES=	ftp://mirror.aarnet.edu.au/pub/vmware/software/
+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
 
-VMWARE_VER=	2.0.2
-BUILD_VER=	307
+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}
 
 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
-	@${CAT} ${PKGMESSAGE}
+	@${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
+	@${ECHO} ""
+	@${ECHO} "========================================================================"
+	@${ECHO} "Don't forget to choose \"Settings\" -> \"Cancel VMware Tools Install\","
+	@${ECHO} "to restore your CD-ROM setup.
+	@${ECHO} "========================================================================"
+	@${ECHO} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/vmware-tools2/distinfo b/emulators/vmware-tools2/distinfo
deleted file mode 100644
index 57f4e3d4ab0e..000000000000
--- a/emulators/vmware-tools2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (tools-for-freebsd-307.tar.gz) = c9e4b04abe26f7158003fa183bcfa48f
diff --git a/emulators/vmware-tools2/pkg-comment b/emulators/vmware-tools2/pkg-comment
index a92f060af645..2d6183bd4376 100644
--- a/emulators/vmware-tools2/pkg-comment
+++ b/emulators/vmware-tools2/pkg-comment
@@ -1 +1 @@
-VMware tools for FreeBSD guest OS (X Server only)
+VMware tools for FreeBSD guest OS
diff --git a/emulators/vmware-tools2/pkg-descr b/emulators/vmware-tools2/pkg-descr
index 7939544ab055..e8deec969f96 100644
--- a/emulators/vmware-tools2/pkg-descr
+++ b/emulators/vmware-tools2/pkg-descr
@@ -1,14 +1,16 @@
-VMware tools support FreeBSD _Guest_ OS running on VMware.  Beware,
-this port is _not_ for FreeBSD _Host_ OS.
+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 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.
+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.
 
-So this port installs X server ONLY.  If you want vmware-toolbox,
-install emulators/linux-vmware-toolbox on your FreeBSD _Guest_ OS.
+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.
 
-WWW:	http://www.vmware.com/download/downloadtools.html
+WWW:	http://www.vmware.com/products/desktop/ws_features.html
diff --git a/emulators/vmware-tools2/pkg-message b/emulators/vmware-tools2/pkg-message
deleted file mode 100644
index 57a109cb8812..000000000000
--- a/emulators/vmware-tools2/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-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 fd515f110692..51edd7fd6855 100644
--- a/emulators/vmware-tools2/pkg-plist
+++ b/emulators/vmware-tools2/pkg-plist
@@ -1,2 +1,3 @@
-bin/XF86_VMware
-etc/XF86Config_VMware
+bin/vmware-toolbox
+%%INSTALLXSERVER:%%bin/XF86_VMware
+%%INSTALLXSERVER:%%etc/XF86Config_VMware