Dear VMware Workstation users around the world, here is an upgrade of

VMware Workstation FreeBSD-guest related ports for VMware Workstation
5.5.0 build 18463.

New features are:

- Spell "VMware Workstation" appropriately.
	There are much VMware products, it would be the time that I have
	to spell VMware Workstation as VMware Workstation.
- Support FreeBSD/amd64 since 64-bit binaries are provided from VMware.
	I don't test any of 64-bit related portion, since I have no
	FreeBSD/amd64 machine.  If something trouble please email me.
- New variable "WITH_VMWARE_GTK" (emulators/vmware-tools5)
	Install gtk version of VMware Tools if defined
	(add more dependencies on other gtk-related ports)
- New variable "WITH_VMWARE_VMXNET" (emulators/vmware-guestd5)
	Install "vmxnet.ko" kernel module (vmxnet driver) if defined
	Usage:
		- shutdown FreeBSD guest VM
		- add following line to FreeBSD guest VM config file
			Ethernet0.virtualDev="vmxnet"
		- Boot FreeBSD guest VM
		- load vmxnet.ko kernel module
		- ifconfig vxn0 ...
	New rc.conf variable "vmware_guest_vmxnet_enable" is also added
	to vmware-guestd.sh to load kernel module at startup.  However,
	${PREFIX}/etc/rc.d/vmware-guestd.sh run _after_ /etc/rc.d/netif,
	so it maybe too late to load here...
	Note that vmxnet.ko supports FreeBSD 4.8-RELEASE or later, and
	5.3-RELEASE and later (as VMware said).  I've confirmed that
	recent 7-current got 100% instant panic if vmxnet.ko is loaded.
- "vmware_guest_kmod_enable" is renamed to "vmware_guest_vmmemctl_enable"
	Now this ports has two kernel modules now, old name is not
	appropriate one, hard to understand this variable is for which
	kernel module.  I also put backward compatibility code, but users
	of vmware_guest_kmod_enable please change variable name.

Bugfixes are:

- Resolve conflicts on ${PREFIX}/share/vmware-tools.
	Unfortunately both vmware-guestd5 and vmware-tools5 installs
	files to ${PREFIX}/share/vmware-tools directory.  Since this
	directory is only for vmware-tools, vmware-guestd5 doesn't do
	anything for now.
- WWW: line in pkg-descr points bogus page.
- Add note that there's official VMware Tools installer, and what is the
  difference between the two.

Finally, as usual, bump PORTVERSION.

2 files changed, 22 insertions, 10 deletions

diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile
index 0d507ed4001f..291b23b86095 100644
--- a/emulators/linux-vmware-toolbox5/Makefile
+++ b/emulators/linux-vmware-toolbox5/Makefile
@@ -7,18 +7,21 @@
 
 PORTNAME=	vmware-toolbox
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION=	1
+#PORTREVISION=	0
 CATEGORIES=	emulators linux
-MASTER_SITES=	# bundled with VMware itself
+MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMEPREFIX=	linux-
 DISTNAME=	VMwareTools-${VMWARE_VER}-${BUILD_VER}
 
 MAINTAINER=	matusita@FreeBSD.org
-COMMENT=VMware toolbox for guest OS (for VMware 5.x, Linux version)
+COMMENT=VMware toolbox for guest OS (VMware Workstation 5.x, Linux version)
+
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
-PLIST_FILES=	bin/linux-vmware-toolbox
+PLIST_FILES=	bin/linux-vmware-toolbox bin/linux-vmware-toolbox-gtk \
+		bin/linux-vmware-user
 WRKSRC=		${WRKDIR}/vmware-tools-distrib
 
 ONLY_FOR_ARCHS=	i386
@@ -32,8 +35,8 @@ IS_INTERACTIVE=	yes
 RESTRICTED=	"Not sure if we can redistribute this."
 NO_PACKAGE=	${RESTRICTED}
 
-VMWARE_VER=	5.0.0
-BUILD_VER=	13124
+VMWARE_VER=	5.5.0
+BUILD_VER=	18463
 
 .include <bsd.port.pre.mk>
 
@@ -46,6 +49,12 @@ MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
+.if ${ARCH} == i386
+BITS?=		32
+.else # ${ARCH} == amd64
+BITS?=		64
+.endif
+
 do-fetch:
 	@${DO_NADA}
 fetch-list:
@@ -87,7 +96,10 @@ post-extract:
 	${UMOUNT} ${MOUNT_DEV}
 
 do-install:
-	${BRANDELF} -t Linux ${WRKSRC}/bin/vmware-toolbox-old
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox-old ${PREFIX}/bin/linux-vmware-toolbox
+.for file in vmware-toolbox-gtk vmware-user
+	${BRANDELF} -t Linux ${WRKSRC}/lib/bin${BITS}/${file}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/${file} ${PREFIX}/bin/linux-${file}
+.endfor
+	${LN} -sfh linux-vmware-toolbox-gtk ${PREFIX}/bin/linux-vmware-toolbox
 
 .include <bsd.port.post.mk>
diff --git a/emulators/linux-vmware-toolbox5/distinfo b/emulators/linux-vmware-toolbox5/distinfo
index e6bcd878efae..6bbc765b1294 100644
--- a/emulators/linux-vmware-toolbox5/distinfo
+++ b/emulators/linux-vmware-toolbox5/distinfo
@@ -1,2 +1,2 @@
-MD5 (VMwareTools-5.0.0-13124.tar.gz) = IGNORE
-SHA256 (VMwareTools-5.0.0-13124.tar.gz) = IGNORE
+MD5 (VMwareTools-5.5.0-18463.tar.gz) = IGNORE
+SHA256 (VMwareTools-5.5.0-18463.tar.gz) = IGNORE