Here comes the VMware 2.0 port, finally.

- Correspond to VMware 2.0 Build 476 release (not beta)
- Support SMP kernel
- Install VMware tools floppies (for Windows and Linux)
- Add Hints.FreeBSD
- Mention my unofficial `rtc' port on post-install
- Raw disk may not work for the present
- etc.

Enjoy it!

16 files changed, 168 insertions, 76 deletions

diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index cd353f4c5cbf..bb5d3c3329f1 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -1,14 +1,14 @@
-# ports collection makefile for:	VMware 1.1.2 for Linux
-# Version required:	1.1.2
+# ports collection makefile for:	VMware 2.0 for Linux
+# Version required:	2.0 - Build 476
 # Date created:		Fri 26 Nov 19:16:47 EST 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
-# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
+# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.9 2000/01/23 22:29:24 vsilyaev Exp $
 #
 
-DISTNAME=	VMware-1.1.2-364
-PKGNAME=	vmware-1.1.2.364
+DISTNAME=	VMware-2.0-476
+PKGNAME=	vmware-2.0.476
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -21,8 +21,8 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
 		http://mirror.aarnet.edu.au/pub/vmware/freebsd/
-PATCHFILES=	vmmon-freebsd-0.94.tar.gz \
-		vmnet-freebsd-0.10.tar.gz
+PATCHFILES=	vmmon-freebsd-0.95.tar.gz \
+		vmnet-freebsd-0.11.tar.gz
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 
@@ -45,12 +45,8 @@ MAN1=		vmware.1
 BROKEN=		"Systems prior to 400013 is out of support"
 .endif
 
-.if exists(/modules/linprocfs.ko) || exists(${PREFIX}/modules/linprocfs.ko)
-HAVE_LINPROCFS=	yes
-.endif
-
-.if !defined(HAVE_LINPROCFS)
-BROKEN=		"You need Linux procfs to run this software"
+.if !defined(HAVE_LINPROCFS) && !exists(/modules/linprocfs.ko) && !exists(${PREFIX}/modules/linprocfs.ko)
+BROKEN=		"This software absolutely requires Linux procfs support"
 .endif
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
@@ -64,6 +60,7 @@ MAKE_ARGS=	KMODDIR="${VMDIR}/lib/modules"
 
 post-patch:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
 
 setoptions:
 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
@@ -100,6 +97,8 @@ pre-install: setoptions
 	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
 	${MKDIR} ${VMDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
+	${MKDIR} ${VMDIR}/lib/floppies
+	${INSTALL_DATA} ${WRKSRC}/lib/floppies/* ${VMDIR}/lib/floppies
 	${MKDIR} ${VMDIR}/lib/help
 	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${VMDIR}/lib/help
 	${MKDIR} ${VMDIR}/lib/xkeymap
@@ -107,11 +106,24 @@ pre-install: setoptions
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/vmware
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/vmware
+.for f in README.FreeBSD Hints.FreeBSD
+	${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/doc/vmware
+.endfor
 .endif
 
 post-install:
 	${LN} -s ${PREFIX}/etc/vmware /etc/vmware
+.if !exists(/dev/rtc) && !exists(${LINUX_DIR}/dev/rtc)
+	@${ECHO} "************************************************************"
+	@${ECHO} "This system doesn't seem to have /dev/rtc device support."
+	@${ECHO} "With it, you can benefit from VMware's rtc support."
+	@${ECHO}
+	@${ECHO} "You may want to grab the unofficial rtc port at:"
+	@${ECHO} "    http://people.FreeBSD.org/~knu/ports/emulators/"
+	@${ECHO}
+	@${ECHO} "Use it at your own risk, thanks."
+	@${ECHO} "************************************************************"
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware2/distinfo b/emulators/vmware2/distinfo
index 3c18df7e0018..edc33b2e37b7 100644
--- a/emulators/vmware2/distinfo
+++ b/emulators/vmware2/distinfo
@@ -1,3 +1,3 @@
-MD5 (VMware-1.1.2-364.tar.gz) = c0c6f4a172cefd8a0cd838d65f9633d4
-MD5 (vmmon-freebsd-0.94.tar.gz) = 741b47111d4e826a7cdbc61ecc868594
-MD5 (vmnet-freebsd-0.10.tar.gz) = 1da694a7a1952c25d6d1dafcf7c361de
+MD5 (VMware-2.0-476.tar.gz) = 64d330c9a2476c93c66dacf4aab16fe3
+MD5 (vmmon-freebsd-0.95.tar.gz) = 8e0413c523afd11a137d90743d8643e7
+MD5 (vmnet-freebsd-0.11.tar.gz) = 9cbf5873139efaa136bb0b7ca7583821
diff --git a/emulators/vmware2/files/Hints.FreeBSD b/emulators/vmware2/files/Hints.FreeBSD
new file mode 100644
index 000000000000..1b2c36a5fa7f
--- /dev/null
+++ b/emulators/vmware2/files/Hints.FreeBSD
@@ -0,0 +1,20 @@
+Here lists some useful hints on using VMware on FreeBSD.
+
+- Raw disk may not work.  Use virtual disk instead.
+
+- Under FreeBSD, floppy device should be configured as follows:
+
+	Type: file
+	Path: /dev/rfd0
+
+(Obtain the write permission on /dev/rfd0 if you write floppy disks)
+
+- Consider making a link /compat/linux/tmp if your /tmp doesn't have
+sufficient free space or is slow.  VMware uses /tmp to back the VM's
+memory.
+
+e.g.
+	ln -s /usr/tmp /compat/linux/tmp
+
+-- 
+Akinori -Aki- MUSHA <knu@idaemons.org>
diff --git a/emulators/vmware2/files/Makefile.vmmon b/emulators/vmware2/files/Makefile.vmmon
new file mode 100644
index 000000000000..ad036c646530
--- /dev/null
+++ b/emulators/vmware2/files/Makefile.vmmon
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+all:	
+	make -f Makefile.FreeBSD SMP=YES clean all
+	make -f Makefile.FreeBSD SMP=NO clean all
+
+install:	
+	make -f Makefile.FreeBSD SMP=YES install
+	make -f Makefile.FreeBSD SMP=NO install
diff --git a/emulators/vmware2/files/README.FreeBSD b/emulators/vmware2/files/README.FreeBSD
index 08ccb3434c55..39c78c75e363 100644
--- a/emulators/vmware2/files/README.FreeBSD
+++ b/emulators/vmware2/files/README.FreeBSD
@@ -1,11 +1,11 @@
-VMware 1.1 for Linux on FreeBSD.
-$Date: 1999/12/17 00:36:01 $
+VMware 2.0 for Linux on FreeBSD.
+$Date: 2000/01/23 22:28:10 $
 $FreeBSD$
 
 Introduction.
 
 This piece of software provides some basic support for running
-the VMware 1.1 for Linux on FreeBSD.
+the VMware 2.0 for Linux on FreeBSD.
 
 I'm using FreeBSD 4.0 -current system and don't know whether
 this software will work on the 3.X branch.
@@ -64,8 +64,6 @@ Caveats.
       have enabled both IDE and floppy drives in the same VMware session, you
       _must_ select the right booting order in the Phoenix BIOS Setup.
       
-    - Doesn't work on a SMP kernel.
-    
     - Support only for Host networking. Doesn't have a bridgink networking
       But really this mean, that you are need to enable gateway on
       our FreeBSD box. And after that virtual machine can communicate 
diff --git a/emulators/vmware2/files/vmware.sh b/emulators/vmware2/files/vmware.sh
index 6764ced056e2..1afdbf3e3813 100644
--- a/emulators/vmware2/files/vmware.sh
+++ b/emulators/vmware2/files/vmware.sh
@@ -10,11 +10,18 @@ host_ip=@@HOST_IP@@
 netmask=@@NETMASK@@
 
 [ -x $vmware_dir/bin/vmware ] || exit
+
+if [ `sysctl -n hw.ncpu` -eq 1 ]; then
+    suffix=up
+else
+    suffix=smp
+fi
+
 exec >/dev/null
 
 case $1 in
 start)
-    kldload ${vmware_dir}/lib/modules/vmmon.ko
+    kldload ${vmware_dir}/lib/modules/vmmon_${suffix}.ko
     if [ $networking -eq 1 ]; then
 	kldload ${vmware_dir}/lib/modules/vmnet.ko
 	echo -n >/dev/vmnet1
@@ -24,7 +31,7 @@ start)
     ;;
 
 stop)
-    kldunload vmmon
+    kldunload vmmon_${suffix}
     if [ $networking -eq 1 ]; then
 	ifconfig vmnet1 down
 	ifconfig vmnet1 delete $host_ip
diff --git a/emulators/vmware2/pkg-message b/emulators/vmware2/pkg-message
index f20a0c372f92..0bc581718b7b 100644
--- a/emulators/vmware2/pkg-message
+++ b/emulators/vmware2/pkg-message
@@ -1,20 +1,11 @@
 ************************************************************
-Add the following entry to /etc/fstab:
+Get Linux procfs ready and initialize vmmon/vmnet as follows:
 
-	linproc /compat/linux/proc linprocfs rw 0 0
-
-and you can play with VMware after the next boot.
-
-Or hit the following commands to play now. :)
-
-	/sbin/mount_linprocfs linproc /compat/linux/proc
 	/usr/local/etc/rc.d/vmware.sh start
 
-Also, consider making a link /compat/linux/tmp if your /tmp
-doesn't have sufficient free space or is slow.  VMware uses
-/tmp to back the VM's memory.
+then you'll be ready to start vmware.
 
-e.g.
-	ln -s /usr/tmp /compat/linux/tmp
+Don't miss the documents installed:
 
+	vmware(1) /usr/local/share/doc/vmware/*
 ************************************************************
diff --git a/emulators/vmware2/pkg-plist b/emulators/vmware2/pkg-plist
index da8830d4a218..baf569ba0570 100644
--- a/emulators/vmware2/pkg-plist
+++ b/emulators/vmware2/pkg-plist
@@ -13,15 +13,19 @@ lib/vmware/bin/vmware-loop
 lib/vmware/bin/vmware-ping
 lib/vmware/bin/vmware-wizard
 lib/vmware/lib/config
+lib/vmware/lib/floppies/linux.flp
+lib/vmware/lib/floppies/windows.flp
 lib/vmware/lib/help/AutoFit.htm
 lib/vmware/lib/help/ConfigDiskPartition.htm
 lib/vmware/lib/help/ConfigDisks.htm
 lib/vmware/lib/help/ConfigEditor.htm
 lib/vmware/lib/help/ConfigEthernet.htm
 lib/vmware/lib/help/ConfigFloppy.htm
+lib/vmware/lib/help/ConfigGuestOS.htm       
 lib/vmware/lib/help/ConfigMemory.htm
 lib/vmware/lib/help/ConfigMisc.htm
 lib/vmware/lib/help/ConfigParallel.htm
+lib/vmware/lib/help/ConfigScsiDisks.htm
 lib/vmware/lib/help/ConfigSerial.htm
 lib/vmware/lib/help/ConfigSound.htm
 lib/vmware/lib/help/ConfigWiz.htm
@@ -54,6 +58,7 @@ lib/vmware/lib/help/StatusBar.htm
 lib/vmware/lib/help/Suspend.gif
 lib/vmware/lib/help/Suspend.htm
 lib/vmware/lib/help/ToolbarButtons.htm
+lib/vmware/lib/help/ToolsInstall.htm
 lib/vmware/lib/help/View.htm
 lib/vmware/lib/help/Wizcd.htm
 lib/vmware/lib/help/Wizcongrats.htm
@@ -65,7 +70,8 @@ lib/vmware/lib/help/Wiznetwork.htm
 lib/vmware/lib/help/Wizos.htm
 lib/vmware/lib/help/Wizpath.htm
 lib/vmware/lib/help/toc.htm
-lib/vmware/lib/modules/vmmon.ko
+lib/vmware/lib/modules/vmmon_smp.ko
+lib/vmware/lib/modules/vmmon_up.ko
 lib/vmware/lib/modules/vmnet.ko
 lib/vmware/lib/xkeymap/be101
 lib/vmware/lib/xkeymap/be104
@@ -102,9 +108,11 @@ lib/vmware/lib/xkeymap/us104
 share/doc/vmware/CHANGES
 share/doc/vmware/DHCP-COPYRIGHT
 share/doc/vmware/EULA
+share/doc/vmware/Hints.FreeBSD
 share/doc/vmware/INSTALL
 share/doc/vmware/README
 share/doc/vmware/README.FreeBSD
+share/doc/vmware/SAMBA-LICENSE
 @exec mkdir -p /compat/linux/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n /compat/linux/dev/tty$n;done
 @exec ln -s /dev/ttyva /compat/linux/dev/tty10
 @exec ln -s /dev/ttyvb /compat/linux/dev/tty11
@@ -116,6 +124,7 @@ share/doc/vmware/README.FreeBSD
 @unexec rm -f /etc/vmware /dev/vmmon /dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd?
 @dirrm etc/vmware
 @dirrm lib/vmware/bin
+@dirrm lib/vmware/lib/floppies
 @dirrm lib/vmware/lib/help
 @dirrm lib/vmware/lib/modules
 @dirrm lib/vmware/lib/xkeymap
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index cd353f4c5cbf..bb5d3c3329f1 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,14 +1,14 @@
-# ports collection makefile for:	VMware 1.1.2 for Linux
-# Version required:	1.1.2
+# ports collection makefile for:	VMware 2.0 for Linux
+# Version required:	2.0 - Build 476
 # Date created:		Fri 26 Nov 19:16:47 EST 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
-# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
+# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.9 2000/01/23 22:29:24 vsilyaev Exp $
 #
 
-DISTNAME=	VMware-1.1.2-364
-PKGNAME=	vmware-1.1.2.364
+DISTNAME=	VMware-2.0-476
+PKGNAME=	vmware-2.0.476
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -21,8 +21,8 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
 		http://mirror.aarnet.edu.au/pub/vmware/freebsd/
-PATCHFILES=	vmmon-freebsd-0.94.tar.gz \
-		vmnet-freebsd-0.10.tar.gz
+PATCHFILES=	vmmon-freebsd-0.95.tar.gz \
+		vmnet-freebsd-0.11.tar.gz
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 
@@ -45,12 +45,8 @@ MAN1=		vmware.1
 BROKEN=		"Systems prior to 400013 is out of support"
 .endif
 
-.if exists(/modules/linprocfs.ko) || exists(${PREFIX}/modules/linprocfs.ko)
-HAVE_LINPROCFS=	yes
-.endif
-
-.if !defined(HAVE_LINPROCFS)
-BROKEN=		"You need Linux procfs to run this software"
+.if !defined(HAVE_LINPROCFS) && !exists(/modules/linprocfs.ko) && !exists(${PREFIX}/modules/linprocfs.ko)
+BROKEN=		"This software absolutely requires Linux procfs support"
 .endif
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
@@ -64,6 +60,7 @@ MAKE_ARGS=	KMODDIR="${VMDIR}/lib/modules"
 
 post-patch:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
 
 setoptions:
 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
@@ -100,6 +97,8 @@ pre-install: setoptions
 	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
 	${MKDIR} ${VMDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
+	${MKDIR} ${VMDIR}/lib/floppies
+	${INSTALL_DATA} ${WRKSRC}/lib/floppies/* ${VMDIR}/lib/floppies
 	${MKDIR} ${VMDIR}/lib/help
 	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${VMDIR}/lib/help
 	${MKDIR} ${VMDIR}/lib/xkeymap
@@ -107,11 +106,24 @@ pre-install: setoptions
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/vmware
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/vmware
+.for f in README.FreeBSD Hints.FreeBSD
+	${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/doc/vmware
+.endfor
 .endif
 
 post-install:
 	${LN} -s ${PREFIX}/etc/vmware /etc/vmware
+.if !exists(/dev/rtc) && !exists(${LINUX_DIR}/dev/rtc)
+	@${ECHO} "************************************************************"
+	@${ECHO} "This system doesn't seem to have /dev/rtc device support."
+	@${ECHO} "With it, you can benefit from VMware's rtc support."
+	@${ECHO}
+	@${ECHO} "You may want to grab the unofficial rtc port at:"
+	@${ECHO} "    http://people.FreeBSD.org/~knu/ports/emulators/"
+	@${ECHO}
+	@${ECHO} "Use it at your own risk, thanks."
+	@${ECHO} "************************************************************"
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware3/distinfo b/emulators/vmware3/distinfo
index 3c18df7e0018..edc33b2e37b7 100644
--- a/emulators/vmware3/distinfo
+++ b/emulators/vmware3/distinfo
@@ -1,3 +1,3 @@
-MD5 (VMware-1.1.2-364.tar.gz) = c0c6f4a172cefd8a0cd838d65f9633d4
-MD5 (vmmon-freebsd-0.94.tar.gz) = 741b47111d4e826a7cdbc61ecc868594
-MD5 (vmnet-freebsd-0.10.tar.gz) = 1da694a7a1952c25d6d1dafcf7c361de
+MD5 (VMware-2.0-476.tar.gz) = 64d330c9a2476c93c66dacf4aab16fe3
+MD5 (vmmon-freebsd-0.95.tar.gz) = 8e0413c523afd11a137d90743d8643e7
+MD5 (vmnet-freebsd-0.11.tar.gz) = 9cbf5873139efaa136bb0b7ca7583821
diff --git a/emulators/vmware3/files/Hints.FreeBSD b/emulators/vmware3/files/Hints.FreeBSD
new file mode 100644
index 000000000000..1b2c36a5fa7f
--- /dev/null
+++ b/emulators/vmware3/files/Hints.FreeBSD
@@ -0,0 +1,20 @@
+Here lists some useful hints on using VMware on FreeBSD.
+
+- Raw disk may not work.  Use virtual disk instead.
+
+- Under FreeBSD, floppy device should be configured as follows:
+
+	Type: file
+	Path: /dev/rfd0
+
+(Obtain the write permission on /dev/rfd0 if you write floppy disks)
+
+- Consider making a link /compat/linux/tmp if your /tmp doesn't have
+sufficient free space or is slow.  VMware uses /tmp to back the VM's
+memory.
+
+e.g.
+	ln -s /usr/tmp /compat/linux/tmp
+
+-- 
+Akinori -Aki- MUSHA <knu@idaemons.org>
diff --git a/emulators/vmware3/files/Makefile.vmmon b/emulators/vmware3/files/Makefile.vmmon
new file mode 100644
index 000000000000..ad036c646530
--- /dev/null
+++ b/emulators/vmware3/files/Makefile.vmmon
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+all:	
+	make -f Makefile.FreeBSD SMP=YES clean all
+	make -f Makefile.FreeBSD SMP=NO clean all
+
+install:	
+	make -f Makefile.FreeBSD SMP=YES install
+	make -f Makefile.FreeBSD SMP=NO install
diff --git a/emulators/vmware3/files/README.FreeBSD b/emulators/vmware3/files/README.FreeBSD
index 08ccb3434c55..39c78c75e363 100644
--- a/emulators/vmware3/files/README.FreeBSD
+++ b/emulators/vmware3/files/README.FreeBSD
@@ -1,11 +1,11 @@
-VMware 1.1 for Linux on FreeBSD.
-$Date: 1999/12/17 00:36:01 $
+VMware 2.0 for Linux on FreeBSD.
+$Date: 2000/01/23 22:28:10 $
 $FreeBSD$
 
 Introduction.
 
 This piece of software provides some basic support for running
-the VMware 1.1 for Linux on FreeBSD.
+the VMware 2.0 for Linux on FreeBSD.
 
 I'm using FreeBSD 4.0 -current system and don't know whether
 this software will work on the 3.X branch.
@@ -64,8 +64,6 @@ Caveats.
       have enabled both IDE and floppy drives in the same VMware session, you
       _must_ select the right booting order in the Phoenix BIOS Setup.
       
-    - Doesn't work on a SMP kernel.
-    
     - Support only for Host networking. Doesn't have a bridgink networking
       But really this mean, that you are need to enable gateway on
       our FreeBSD box. And after that virtual machine can communicate 
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index 6764ced056e2..1afdbf3e3813 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -10,11 +10,18 @@ host_ip=@@HOST_IP@@
 netmask=@@NETMASK@@
 
 [ -x $vmware_dir/bin/vmware ] || exit
+
+if [ `sysctl -n hw.ncpu` -eq 1 ]; then
+    suffix=up
+else
+    suffix=smp
+fi
+
 exec >/dev/null
 
 case $1 in
 start)
-    kldload ${vmware_dir}/lib/modules/vmmon.ko
+    kldload ${vmware_dir}/lib/modules/vmmon_${suffix}.ko
     if [ $networking -eq 1 ]; then
 	kldload ${vmware_dir}/lib/modules/vmnet.ko
 	echo -n >/dev/vmnet1
@@ -24,7 +31,7 @@ start)
     ;;
 
 stop)
-    kldunload vmmon
+    kldunload vmmon_${suffix}
     if [ $networking -eq 1 ]; then
 	ifconfig vmnet1 down
 	ifconfig vmnet1 delete $host_ip
diff --git a/emulators/vmware3/pkg-message b/emulators/vmware3/pkg-message
index f20a0c372f92..0bc581718b7b 100644
--- a/emulators/vmware3/pkg-message
+++ b/emulators/vmware3/pkg-message
@@ -1,20 +1,11 @@
 ************************************************************
-Add the following entry to /etc/fstab:
+Get Linux procfs ready and initialize vmmon/vmnet as follows:
 
-	linproc /compat/linux/proc linprocfs rw 0 0
-
-and you can play with VMware after the next boot.
-
-Or hit the following commands to play now. :)
-
-	/sbin/mount_linprocfs linproc /compat/linux/proc
 	/usr/local/etc/rc.d/vmware.sh start
 
-Also, consider making a link /compat/linux/tmp if your /tmp
-doesn't have sufficient free space or is slow.  VMware uses
-/tmp to back the VM's memory.
+then you'll be ready to start vmware.
 
-e.g.
-	ln -s /usr/tmp /compat/linux/tmp
+Don't miss the documents installed:
 
+	vmware(1) /usr/local/share/doc/vmware/*
 ************************************************************
diff --git a/emulators/vmware3/pkg-plist b/emulators/vmware3/pkg-plist
index da8830d4a218..baf569ba0570 100644
--- a/emulators/vmware3/pkg-plist
+++ b/emulators/vmware3/pkg-plist
@@ -13,15 +13,19 @@ lib/vmware/bin/vmware-loop
 lib/vmware/bin/vmware-ping
 lib/vmware/bin/vmware-wizard
 lib/vmware/lib/config
+lib/vmware/lib/floppies/linux.flp
+lib/vmware/lib/floppies/windows.flp
 lib/vmware/lib/help/AutoFit.htm
 lib/vmware/lib/help/ConfigDiskPartition.htm
 lib/vmware/lib/help/ConfigDisks.htm
 lib/vmware/lib/help/ConfigEditor.htm
 lib/vmware/lib/help/ConfigEthernet.htm
 lib/vmware/lib/help/ConfigFloppy.htm
+lib/vmware/lib/help/ConfigGuestOS.htm       
 lib/vmware/lib/help/ConfigMemory.htm
 lib/vmware/lib/help/ConfigMisc.htm
 lib/vmware/lib/help/ConfigParallel.htm
+lib/vmware/lib/help/ConfigScsiDisks.htm
 lib/vmware/lib/help/ConfigSerial.htm
 lib/vmware/lib/help/ConfigSound.htm
 lib/vmware/lib/help/ConfigWiz.htm
@@ -54,6 +58,7 @@ lib/vmware/lib/help/StatusBar.htm
 lib/vmware/lib/help/Suspend.gif
 lib/vmware/lib/help/Suspend.htm
 lib/vmware/lib/help/ToolbarButtons.htm
+lib/vmware/lib/help/ToolsInstall.htm
 lib/vmware/lib/help/View.htm
 lib/vmware/lib/help/Wizcd.htm
 lib/vmware/lib/help/Wizcongrats.htm
@@ -65,7 +70,8 @@ lib/vmware/lib/help/Wiznetwork.htm
 lib/vmware/lib/help/Wizos.htm
 lib/vmware/lib/help/Wizpath.htm
 lib/vmware/lib/help/toc.htm
-lib/vmware/lib/modules/vmmon.ko
+lib/vmware/lib/modules/vmmon_smp.ko
+lib/vmware/lib/modules/vmmon_up.ko
 lib/vmware/lib/modules/vmnet.ko
 lib/vmware/lib/xkeymap/be101
 lib/vmware/lib/xkeymap/be104
@@ -102,9 +108,11 @@ lib/vmware/lib/xkeymap/us104
 share/doc/vmware/CHANGES
 share/doc/vmware/DHCP-COPYRIGHT
 share/doc/vmware/EULA
+share/doc/vmware/Hints.FreeBSD
 share/doc/vmware/INSTALL
 share/doc/vmware/README
 share/doc/vmware/README.FreeBSD
+share/doc/vmware/SAMBA-LICENSE
 @exec mkdir -p /compat/linux/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n /compat/linux/dev/tty$n;done
 @exec ln -s /dev/ttyva /compat/linux/dev/tty10
 @exec ln -s /dev/ttyvb /compat/linux/dev/tty11
@@ -116,6 +124,7 @@ share/doc/vmware/README.FreeBSD
 @unexec rm -f /etc/vmware /dev/vmmon /dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd?
 @dirrm etc/vmware
 @dirrm lib/vmware/bin
+@dirrm lib/vmware/lib/floppies
 @dirrm lib/vmware/lib/help
 @dirrm lib/vmware/lib/modules
 @dirrm lib/vmware/lib/xkeymap