Update VMware-related tools to the of VMware Workstation 4.0.0 build-4460

(after repocopying old ones, thank you joe).

It seems that VMware does not provide a new version of guest tools
for VMware 4.x to FreeBSD guest, but it would be better to add these
ports, since users will know FreeBSD runs on VMware 4.x.

I've also add vmware-toolbox port for VMware 4.x, which is for Linux
guest.  In VMware 3.x, we FreeBSD guest user are happy to use FreeBSD
version of vmware-toolbox so we don't need the Linux version.  However,
at least my VMs, FreeBSD version's vmware-toolbox causes X pointer a
bumpy one (pointer moves every seconds); it is unusable.  Linux version
seems OK for me, so if you have seen such behavior, please try
linux-vmware-toolbox4 instead.

Old ports cleanup will come later.

Reviewed by: kuriyama (mentor)

2 files changed, 41 insertions, 50 deletions

diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile
index ee82e72ab6a9..d57c556fbaff 100644
--- a/emulators/linux-vmware-toolbox4/Makefile
+++ b/emulators/linux-vmware-toolbox4/Makefile
@@ -13,51 +13,55 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	vmware-linux-tools
 
 MAINTAINER=	matusita@FreeBSD.org
-COMMENT=VMware toolbox for FreeBSD Guest OS (full-featured Linux version)
+COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version)
+
+DISTDIR=	${MOUNT_PT}
+IGNOREFILES=	${DISTFILES}
+WRKSRC=		${WRKDIR}/vmware-tools-distrib
+STRIP=
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
+.if !defined(BATCH)
 IS_INTERACTIVE=	yes
+.endif
 
 RESTRICTED=	"Not sure if we can redistribute this."
 
-.include <bsd.port.pre.mk>
-
-LINUX_FLP?=	${DISTDIR}/linux.flp
-MOUNT_PT?=	${WRKDIR}/mnt
-.if exists(${LINUX_FLP})
-.if ${OSVERSION} >= 500018
-DEV_ATTACH=	/usr/sbin/mdconfig -a -t vnode -f ${LINUX_FLP} -u ${MOUNT_DEV}
-DEV_DETACH=	/usr/sbin/mdconfig -d -u ${MOUNT_DEV}
-MOUNT_DEV?=	md0
-.else
-DEV_ATTACH=	/usr/sbin/vnconfig -c ${MOUNT_DEV} ${LINUX_FLP}
-DEV_DETACH=	/usr/sbin/vnconfig -u ${MOUNT_DEV}
-MOUNT_DEV?=	vn0
-.endif
-.else
-MOUNT_DEV?=	fd0
-.endif
-VMWARE_VER=	2.0.4
-BUILD_VER=	1142
+VMWARE_VER=	4.0.0
+BUILD_VER=	4460
 
+MOUNT_DEV?=	/dev/acd0
+MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-pre-fetch:
-.if !exists("${DISTDIR}/${DISTFILES}")
+do-fetch:
+	@${DO_NADA}
+fetch-list:
+	@${DO_NADA}
+
+pre-extract:
 	@${ECHO} "========================================================================"
 	@${ECHO} ""
-	@${ECHO} "To install this port, please:"
+	@${ECHO} "Before installing this port, please follow this instructions:"
 	@${ECHO} ""
-	@${ECHO} "     Select the menu item \"Devices -> floppy0 -> Edit\" on VMware,"
-	@${ECHO} "     and choose the file \"linux.flp\"."
+	@${ECHO} "     *) Be sure that your VM have an IDE CD-ROM."
+	@${ECHO} "     *) Select \"Edit -> Removable Devices -> CD-ROM 1 -> Edit\" on VMware menu,"
+	@${ECHO} "     *) Check \"Connected\" box."
+	@${ECHO} "     *) Check \"Use ISO image\" radio button."
+	@${ECHO} "     *) Choose the file \"linux.iso\" for the ISO image.  You will find"
+	@${ECHO} "        it under the directory VMware Workstation installed."
+	@${ECHO} "     *) Press \"OK\" button."
+	@${ECHO} ""
+	@${ECHO} "Don\'t forget to restore the configuration after installing this port."
 	@${ECHO} ""
 	@${ECHO} "========================================================================"
 	@${ECHO} ""
-	@${ECHO} -n "Are ready to install this ports? [Y/n]: "
+.if !defined(BATCH)
+	@${ECHO} -n "Ready to install this ports? [Y/n]: "
 	@(read line;			\
 	  case "$${line}" in		\
 		[Nn]*)			\
@@ -66,27 +70,15 @@ pre-fetch:
 			${TRUE} ;;	\
 	  esac)
 .endif
-
-do-fetch:
-.if exists("${DISTDIR}/${DISTFILES}")
-	@${ECHO} "Found ${DISTDIR}/${DISTFILES}."
-.else
 	${MKDIR} ${MOUNT_PT}
-	-@${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null
-	-@${UMOUNT} /dev/${MOUNT_DEV} 2>&1 >/dev/null
-.if exists(${LINUX_FLP})
-	-@${DEV_DETACH} 2>&1 >/dev/null
-	${DEV_ATTACH}
-.endif
-	${MOUNT} -t msdos -r /dev/${MOUNT_DEV} ${MOUNT_PT}
-	${CP} ${MOUNT_PT}/${DISTFILES} ${DISTDIR}
-	${UMOUNT} /dev/${MOUNT_DEV}
-.if exists(${LINUX_FLP})
-	${DEV_DETACH}
-.endif
-.endif
+	-${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null
+	-${UMOUNT} ${MOUNT_DEV} 2>&1 >/dev/null
+	${MOUNT} -t cd9660 -r ${MOUNT_DEV} ${MOUNT_PT}
+
+post-extract:
+	${UMOUNT} ${MOUNT_DEV}
 
 do-install:
-	${CP} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/linux-vmware-toolbox4/pkg-descr b/emulators/linux-vmware-toolbox4/pkg-descr
index 00996c8f08da..19e4af351d3b 100644
--- a/emulators/linux-vmware-toolbox4/pkg-descr
+++ b/emulators/linux-vmware-toolbox4/pkg-descr
@@ -7,9 +7,8 @@ synchronization between the virtual machine and the Host OS.  That is
 why this port is provided.
 
 
-Before installing this port, make sure you have a `linux.flp' file
+Before installing this port, make sure you have a `linux.iso' file
 that comes with VMware:
 
-	Windows NT/2000: C:\Program Files\VMware\Programs\linux.flp
-	Linux: /usr/lib/vmware/lib/floppies/linux.flp
-	FreeBSD (via ports): ${PREFIX}/lib/vmware/lib/floppies/linux.flp
+	Windows: C:\Program Files\VMware\VMware Workstation\linux.iso
+	Linux: /usr/lib/vmware/lib/isoimages/linux.iso