Update for VMware 3.0.0 build 1455.

	- Extracts tarball from (pseudo) CD-ROM directly.
	- RUN_DEPENDS to vmware-guestd which is newly added.
	- Install XF86_VMware X server if and only if XFREE86_VERSION=3.
	- Some cosmetics.

1 files changed, 66 insertions, 14 deletions

diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile
index e67f2d1f77ee..733a3a41096e 100644
--- a/emulators/vmware-tools6/Makefile
+++ b/emulators/vmware-tools6/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>