Merge with Vladimir's latest version.

- Add support for FreeBSD bridging facility.  To use it, you need a
kernel built with `options BRIDGE'.

- Integrate vmnet and if_tap code into vmmon module.

- Install vmmon/vmnet1 pseudo-device nodes under /compat/linux/dev
instead of /dev

- Set TMPDIR to /var/tmp if empty.

- Change MAINTAINER back to Vladimir N. Silyaev <vns@delta.odessa.ua>,
now he is back and being active. :)

8 files changed, 32 insertions, 23 deletions

diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index 158c497b16a5..6483121387f4 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -3,7 +3,7 @@
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
-# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.9 2000/01/23 22:29:24 vsilyaev Exp $
+# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.15 2000/07/31 00:54:32 vsilyaev Exp $
 #
 
 PORTNAME=	vmware2
@@ -18,17 +18,15 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
 DISTNAME=	VMware-${PORTVERSION:R}-${PORTVERSION:E}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.mindspring.com/~vsilyaev/vmware/files/ \
+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/
-PATCH_SITE_SUBDIR=	knu
-PATCHFILES=	vmmon-freebsd-0.97-b1.tar.gz \
-		vmnet-freebsd-0.11.tar.gz
+PATCHFILES=	vmmon-freebsd-0.98.tar.gz \
+		vmnet-freebsd-0.21.tar.gz
 
 # Feel free to post your questions/reports/suggestions on this port to
 # freebsd-emulation mailing list with the following maintainer address CC'ed.
-MAINTAINER=	knu@FreeBSD.org
+MAINTAINER=	vns@delta.odessa.ua
 
 RUN_DEPENDS=	${LINUX_DIR}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 		${LINUX_DIR}/dev/rtc:${PORTSDIR}/emulators/rtc
@@ -75,6 +73,7 @@ setoptions:
 		${FILESDIR}/config > ${WRKDIR}/config
 
 	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
+		-e 's;@@LINUX_DIR@@;${LINUX_DIR};' \
 		-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
 		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
diff --git a/emulators/vmware2/distinfo b/emulators/vmware2/distinfo
index a72fb1f06220..985512db5a97 100644
--- a/emulators/vmware2/distinfo
+++ b/emulators/vmware2/distinfo
@@ -1,3 +1,3 @@
 MD5 (VMware-2.0.2-621.tar.gz) = fd96669b44664a4c0a440251c6cc4e4d
-MD5 (vmmon-freebsd-0.97-b1.tar.gz) = c9051c52c31122d33d693d681e87a543
-MD5 (vmnet-freebsd-0.11.tar.gz) = 9cbf5873139efaa136bb0b7ca7583821
+MD5 (vmmon-freebsd-0.98.tar.gz) = ed381460a92c6733d9889192256e1023
+MD5 (vmnet-freebsd-0.21.tar.gz) = bb79acba1a4d7d9f3063510ea2bd91ad
diff --git a/emulators/vmware2/files/Makefile b/emulators/vmware2/files/Makefile
index 79759423aeb8..73c7bbd4ac41 100644
--- a/emulators/vmware2/files/Makefile
+++ b/emulators/vmware2/files/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	vmmon-only vmnet-only/freebsd
+SUBDIR=	vmmon-only
 
 .include <bsd.subdir.mk>
diff --git a/emulators/vmware2/files/README.FreeBSD b/emulators/vmware2/files/README.FreeBSD
index 39c78c75e363..78ca8de35360 100644
--- a/emulators/vmware2/files/README.FreeBSD
+++ b/emulators/vmware2/files/README.FreeBSD
@@ -5,10 +5,7 @@ $FreeBSD$
 Introduction.
 
 This piece of software provides some basic support for running
-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.
+the VMware 2.0 for Linux on FreeBSD 4.0 and better ;) systems.
 
 ===
 
diff --git a/emulators/vmware2/files/vmware b/emulators/vmware2/files/vmware
index 7109da2fdb63..bb98527690c2 100644
--- a/emulators/vmware2/files/vmware
+++ b/emulators/vmware2/files/vmware
@@ -17,4 +17,10 @@ fi
 LANG=C
 PATH=/bin:$PATH
 
-@@PREFIX@@/lib/vmware/bin/vmware "$@"
+if [ _$TMPDIR = _ ]; then 
+    TMPDIR=/var/tmp
+    echo Setting TMPDIR="$TMPDIR".
+    export TMPDIR
+fi
+
+exec @@PREFIX@@/lib/vmware/bin/vmware "$@"
diff --git a/emulators/vmware2/files/vmware.sh b/emulators/vmware2/files/vmware.sh
index 1afdbf3e3813..e375434044a4 100644
--- a/emulators/vmware2/files/vmware.sh
+++ b/emulators/vmware2/files/vmware.sh
@@ -23,11 +23,16 @@ case $1 in
 start)
     kldload ${vmware_dir}/lib/modules/vmmon_${suffix}.ko
     if [ $networking -eq 1 ]; then
-	kldload ${vmware_dir}/lib/modules/vmnet.ko
-	echo -n >/dev/vmnet1
+	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
+	kldload if_tap.ko
+	echo -n >@@LINUX_DIR@@/dev/vmnet1
 	ifconfig vmnet1 $host_ip netmask $netmask
+	if [ _$bridge != _ ]; then
+	    sysctl -w net.link.ether.bridge_refresh=1
+	    sysctl -w net.link.ether.bridge=1
+	fi
     fi
-    echo -n " VMware" >/dev/tty
+    echo -n " VMware${bridge}" >&2
     ;;
 
 stop)
@@ -35,7 +40,8 @@ stop)
     if [ $networking -eq 1 ]; then
 	ifconfig vmnet1 down
 	ifconfig vmnet1 delete $host_ip
-	kldunload vmnet
+	sysctl net.link.ether.bridge_refresh && bridge="_bridge"
+	[ _$bridge != _ ] && sysctl -w net.link.ether.bridge_refresh=1
     fi
     ;;
 
diff --git a/emulators/vmware2/pkg-plist b/emulators/vmware2/pkg-plist
index 35122c42a73d..20c1c47c410c 100644
--- a/emulators/vmware2/pkg-plist
+++ b/emulators/vmware2/pkg-plist
@@ -72,7 +72,6 @@ lib/vmware/lib/help/Wizpath.htm
 lib/vmware/lib/help/toc.htm
 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
 lib/vmware/lib/xkeymap/chde101
@@ -121,9 +120,9 @@ share/doc/vmware/SAMBA-LICENSE
 @exec mknod /compat/linux/dev/hda b 0 0x00010002
 @exec mknod /compat/linux/dev/hdb b 0 0x0001000a
 @exec ln -s %D/etc/vmware /etc/vmware
-@exec mknod /dev/vmmon c 200 0
-@exec mknod /dev/vmnet1 c 201 1
-@unexec rm -f /etc/vmware /dev/vmmon /dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd? /compat/linux/dev/null
+@exec mknod /compat/linux/dev/vmmon c 200 0
+@exec mknod /compat/linux/dev/vmnet1 c 149 65537
+@unexec rm -f /etc/vmware /compat/linux/dev/vmmon /compat/linux/dev/vmnet1 /compat/linux/bin/df /compat/linux/dev/tty[0-9]* /compat/linux/dev/hd? /compat/linux/dev/null
 @dirrm etc/vmware
 @dirrm lib/vmware/bin
 @dirrm lib/vmware/lib/floppies
diff --git a/emulators/vmware2/scripts/pre-install b/emulators/vmware2/scripts/pre-install
index 2ac0bc85a983..ac9ecea947a5 100644
--- a/emulators/vmware2/scripts/pre-install
+++ b/emulators/vmware2/scripts/pre-install
@@ -17,6 +17,8 @@ ln -s /dev/ttyvb ${linux_dev}/tty12
 ln -s ${linux_dev}/tty1 ${linux_dev}/tty0
 mknod ${linux_dev}/null c 2 2
 chmod 666 ${linux_dev}/null
+echo Creating vmnet1 node
+mknod /compat/linux/dev/vmnet1 c 149 65537
 echo Creating $linux_dev/hd\?
 mknod ${linux_dev}/hda b 0 0x00010002
 mknod ${linux_dev}/hdb b 0 0x0001000a