aboutsummaryrefslogtreecommitdiff
path: root/emulators/vmware3
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/vmware3')
-rw-r--r--emulators/vmware3/Makefile170
-rw-r--r--emulators/vmware3/distinfo3
-rw-r--r--emulators/vmware3/files/Hints.FreeBSD167
-rw-r--r--emulators/vmware3/files/Makefile5
-rw-r--r--emulators/vmware3/files/Makefile.vmmon12
-rw-r--r--emulators/vmware3/files/README.FreeBSD79
-rw-r--r--emulators/vmware3/files/config7
-rw-r--r--emulators/vmware3/files/df31
-rw-r--r--emulators/vmware3/files/kse.patch581
-rw-r--r--emulators/vmware3/files/patch-bc11
-rw-r--r--emulators/vmware3/files/patch-bd27
-rw-r--r--emulators/vmware3/files/patch-be87
-rw-r--r--emulators/vmware3/files/patch-bf15
-rw-r--r--emulators/vmware3/files/pmap.patch11
-rw-r--r--emulators/vmware3/files/vmware26
-rw-r--r--emulators/vmware3/files/vmware.sh92
-rw-r--r--emulators/vmware3/pkg-comment1
-rw-r--r--emulators/vmware3/pkg-descr14
-rw-r--r--emulators/vmware3/pkg-message11
-rw-r--r--emulators/vmware3/pkg-plist134
-rw-r--r--emulators/vmware3/scripts/configure160
-rw-r--r--emulators/vmware3/scripts/pre-install29
22 files changed, 0 insertions, 1673 deletions
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
deleted file mode 100644
index 4a4ace5aefcd..000000000000
--- a/emulators/vmware3/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# ports collection makefile for: VMware 2.0 for Linux
-# 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.15 2000/07/31 00:54:32 vsilyaev Exp $
-#
-
-PORTNAME= vmware2
-PORTVERSION= 2.0.4.1142
-CATEGORIES= emulators linux
-MASTER_SITES= http://www4.vmware.com/software/ \
- ${FREEBSD_MODULE_SITES} \
- ${VMWARE_MIRROR_SITES}
-DISTFILES= VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX} \
- vmmon-freebsd-0.98${EXTRACT_SUFX} \
- vmnet-freebsd-0.21${EXTRACT_SUFX}
-
-# Feel free to post your questions/reports/suggestions on this port to
-# freebsd-emulation mailing list with the following maintainer address CC'ed.
-MAINTAINER= vsilyaev@mindspring.com
-
-RUN_DEPENDS= ${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc
-
-RESTRICTED= "Not sure if we can redistribute it"
-
-VMWARE_MIRROR_SITES= \
- http://vmware-svca.www.conxion.com/software/ \
- http://vmware-chil.www.conxion.com/software/ \
- http://vmware-heva.www.conxion.com/software/ \
- http://www.vmware.co.uk/software/ \
- http://mirror.aarnet.edu.au/pub/vmware/software/ \
- ftp://mirror.aarnet.edu.au/pub/vmware/software/
-FREEBSD_MODULE_SITES= \
- http://www.mindspring.com/~vsilyaev/vmware/files/ \
- ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
- http://mirror.aarnet.edu.au/pub/vmware/freebsd/
-
-USE_LINUX= yes
-VMDIR= ${PREFIX}/lib/vmware
-
-ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
-WRKSRC= ${WRKDIR}/vmware-distrib
-GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
-MAN1= vmware.1
-
-MODULES= vmmon vmnet
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400013
-BROKEN= "Systems prior to 400013 is out of support"
-.endif
-
-.if !defined(HAVE_LINPROCFS) && !exists(/modules/linprocfs.ko) && !exists(/boot/kernel/linprocfs.ko) && !exists(${PREFIX}/modules/linprocfs.ko)
-BROKEN= "This software absolutely requires Linux procfs support"
-.endif
-
-.if !exists(/sys/Makefile)
-BROKEN= "Kernel source files required"
-.endif
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
-.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
-.endif
-
-SCRIPTS_ENV+= LINUXBASE="${LINUXBASE}" \
- VMNET_HOST_IP="${VMNET_HOST_IP}" \
- VMNET_NETMASK="${VMNET_NETMASK}"
-MAKE_ARGS= KMODDIR="${VMDIR}/lib/modules"
-PLIST_SUB= LINUXBASE="${LINUXBASE}"
-
-post-extract:
-.for m in ${MODULES}
- ${TAR} -xf ${WRKSRC}/lib/modules/source/${m}.tar -C ${WRKSRC}
-.endfor
- ${GUNZIP_CMD} ${WRKSRC}/man/man1/vmware.1.gz
-
-pre-patch:
- ${PERL} -i -ne 'if (m{^Index: vmnet-only/userif\.c$$}..m{^Index: vmnet-only/vm_oui\.h$$}) { next unless m{^Index: vmnet-only/vm_oui\.h$$} } print' ${WRKDIR}/vmnet-freebsd.diff
-.for m in ${MODULES}
- ${CP} -R ${WRKDIR}/${m}-only ${WRKSRC}/
- ${PATCH} ${PATCH_ARGS} < ${WRKDIR}/${m}-freebsd.diff
-.endfor
-
-post-patch:
-.if ${OSVERSION} >= 500023
- cat ${FILESDIR}/kse.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
-.if ${OSVERSION} >= 500027
- cat ${FILESDIR}/pmap.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
-.endif
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
- ${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
- ${RM} -rf ${WRKSRC}/vmmon-only/linux/
-.if exists(/sys/compat/linux/linux_ioctl.h)
- ${PERL} -i -pe 's,i386(/linux/linux_ioctl\.h),compat$$1,' \
- ${WRKSRC}/vmnet-only/freebsd/vmnet_linux.c
-.endif
-.if exists(/usr/include/sys/selinfo.h)
- ${PERL} -i -pe 's,<sys/select\.h>,<sys/selinfo.h>,' \
- ${WRKSRC}/vmmon-only/freebsd/*.c
-.endif
- cd ${WRKSRC}/vmmon-only/freebsd && ${TOUCH} bus_if.h device_if.h
-.if ${OSVERSION} >= 500019
- ${PERL} -i -pe 's,<machine/ioctl_fd\.h>,<sys/fdcio.h>,' \
- ${WRKSRC}/vmmon-only/freebsd/*.c \
- ${WRKSRC}/vmware-distrib/vmmon-only/freebsd/*.c
-.endif
-
-setoptions:
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
- -e 's;@@NETMASK@@;${VMNET_NETMASK};' \
- ${FILESDIR}/config > ${WRKDIR}/config
-
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUXBASE@@;${LINUXBASE};' \
- -e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
- -e 's;@@BRIDGED@@;${VMNET_BRIDGED};' \
- -e 's;@@BRIDGE_INTF@@;${VMNET_BRIDGED_INTERFACE};' \
- ${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
-
- ${SED} -e 's;@@PREFIX@@;${PREFIX};' \
- -e 's;@@LINUXBASE@@;${LINUXBASE};' \
- ${FILESDIR}/vmware > ${WRKDIR}/vmware
-
-pre-install: setoptions
- ${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
- ${MKDIR} ${VMDIR}/lib/modules
-
- ${MKDIR} ${PREFIX}/etc/vmware
- ${INSTALL_DATA} ${WRKDIR}/config ${PREFIX}/etc/vmware
-
- ${INSTALL_SCRIPT} ${WRKDIR}/vmware.sh ${PREFIX}/etc/rc.d
-
- ${MKDIR} ${VMDIR}/bin
- ${INSTALL_SCRIPT} ${FILESDIR}/df ${VMDIR}/bin
- [ -f ${LINUXBASE}/bin/df ] || ${LN} -s ${VMDIR}/bin/df ${LINUXBASE}/bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${VMDIR}/bin
- for i in \
- vmnet-bridge vmnet-dhcpd vmnet-sniffer \
- vmware-loop vmware-ping vmware-wizard \
- ; do \
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
- done
- ${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
- ${INSTALL_SCRIPT} ${WRKDIR}/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
- ${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${VMDIR}/lib/xkeymap
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/vmware
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
-.for f in README.FreeBSD Hints.FreeBSD
- ${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/doc/vmware
-.endfor
-.endif
-
-post-install:
- ${LN} -sf ${PREFIX}/etc/vmware /etc/
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/emulators/vmware3/distinfo b/emulators/vmware3/distinfo
deleted file mode 100644
index 53a4d507b230..000000000000
--- a/emulators/vmware3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (VMware-2.0.4-1142.tar.gz) = 5f6432f91531b5fbf484765af3d62e06
-MD5 (vmmon-freebsd-0.98.tar.gz) = ed381460a92c6733d9889192256e1023
-MD5 (vmnet-freebsd-0.21.tar.gz) = bb79acba1a4d7d9f3063510ea2bd91ad
diff --git a/emulators/vmware3/files/Hints.FreeBSD b/emulators/vmware3/files/Hints.FreeBSD
deleted file mode 100644
index 15aa5a2f69dc..000000000000
--- a/emulators/vmware3/files/Hints.FreeBSD
+++ /dev/null
@@ -1,167 +0,0 @@
-$FreeBSD$
-
-Here is a list of some useful hints on using VMware on FreeBSD.
-
-- Note that this port includes some kernel modules, which means you
-should rebuild and reinstall this port everytime you update the kernel
-so as to keep them in sync; otherwise VMware might coredump or crash
-together with the whole system if kernel interfaces were somewhat
-different than before.
-
-- Full screen text mode does not work. Don't ever do it!
-
-- Full screen graphics mode will work, but you have to be careful e.g.
-when running a DOS prompt on MS Windows. Hitting Alt+Enter will crash
-VMware before you can say "Chuck!"
-
-- Running VMware as root is NOT the right way to do it. Edit
-/etc/fbtab to obtain the proper permission for the device files that
-you are going to access, then run VMware as a normal user.
-
-- Raw disk may not work. Use virtual or plain disk instead.
-
-- The vmware-mount.pl utility does not work. If you want to mount
-the "disk" while VMware is not running, you must use plain disks
-instead of virtual ones. Set up a 63 sector file as an "mbr"
-section, then a file for each partition on the "plain" disk.
-To mount the "disk", use vnconfig -c /dev/vn__ file and
-then mount the vn device.
-
-If you are setting up a plain disk as a workaround for the broken
-raw disks, you will need to set up the disk description file
-by hand, as the configuration editor will complain. Here is a
-sample one:
-
-DRIVETYPE ide
-CYLINDERS 16383
-HEADS 16
-SECTORS 63
-ACCESS "/path/disk.mbr" 0 63
-ACCESS "/dev/rad0s1" 63 4192902
-RDONLY "/dev/null" 4192965 12305790
-
-The geometry must be the physical geometry reported by the disk.
-grep ad0 /var/run/dmesg.boot and look for the 3 numbers in the
-brackets. They are the C/H/S.
-
-In the example above, "disk.mbr" is file used to keep a replacement
-MBR for the disk. You can use dd if=/dev/rad0 bs=1b count=63 of=mbr
-to create it if you like. The reason is so that the guest's decision
-about which OS you booted last is different than the host's (this is
-for the FreeBSD boot manager). You can also feel free to replace
-the MBR with the standard boot manager if you like. fdisk(8) and a vn
-device can help with this, though you will have to be sure and
-supply the correct geometry to fdisk(8) since the vn device won't
-support those calls. This time it's the BIOS "fake" geometry.
-Watch out!
-
-As you can see, the 1st partition simply is a FreeBSD slice device.
-The first number after the filename is the offset in blocks where the
-given file starts in the plain disk. The last number on the line is
-the length of the block. If you are using a file, its length must
-be equal to this number * 512.
-
-The last entry is an example of how to block out partitions you don't
-want VMware to mess with. Why do this instead of simply making the
-C/H/S numbers for the disk smaller? Because then the guest's BIOS
-might not make the same choices about the "fake" geometry to use,
-which would prevent the OS from booting in most cases.
-
-You might be able to follow the same procedure to make SCSI drives
-work. It is slightly less likely to work as SCSI vendors often
-differ as to how they set up BIOS geometries. Your raw device
-must end up having the same BIOS geometry as a Bustek SCSI
-controller, which is the device VMware virtually supplies as the
-host adapter.
-
-- It is a good idea to disconnect removable media devices (CDROMs
-and Floppies and the like) from the "guest" either when they are
-empty or when you're about to eject the media.
-
-- Under FreeBSD, floppy device should be configured as follows:
-
- Type: file
- Path: /dev/fd0
-
-(Obtain the write permission on /dev/fd0 if you write floppy disks)
-
-- VMware creates a file that is about 25% larger than the guest OS's
-RAM size, unlinks it and mmap's on it on the first startup of the VM.
-
-The default directory for the mmap is the value of TMPDIR environment
-variable, or if it's undefined, /tmp.
-
-Therefore, it would be a good idea to have your TMPDIR variable
-defined as a directory 1) that performs fast, 2) that has sufficient
-free space, and 3) that isn't on MFS; if your /tmp doesn't meet those
-three conditions.
-
-1 is because that will significantly improve the performance, 2 is
-because the VM cannot even boot when the mmap fails, and 3 is because
-such a large, active file on MFS could lead the system to deadlocks.
-
-
-Alternatively, you can make /compat/linux/tmp to fake /tmp, however,
-you should note that it would cause you silly troubles: Imagine a
-Linux application (say, Linux Netscape) which creates a temporary file
-in /tmp and passes it to some external program; you'll see it actually
-creates a file in /compat/linux/tmp when the external program searches
-/tmp literally.
-
-- There is a bug you may wish to work around if you aren't running
-5-current or a very recent 4-stable system.
-
-Some background first: With FreeBSD, when you mmap a file, the syncer
-will attempt by default to periodically synchronize the on-disk version
-of the file with the changes being made in the mmap'd region. You can
-change this behavior using the MAP_NOSYNC flag to mmap(). With this
-flag, the syncer will leave the dirty pages alone and only the
-pagedaemon will flush them when it's absolutely necessary. However,
-Linux always behaves as if the MAP_NOSYNC flag was given, but the
-Linuxulator was not adding MAP_NOSYNC to the flags as part of the
-compatibility layer. But that is ok, since unlinking the last reference
-to an mmap()ed file causes FreeBSD to add MAP_NOSYNC in anyway (under
-the theory that if the machine reboots in that situation the file's
-inode would be freed since it would be an orphan).
-
-The problem is that VMware doesn't actually unlink the save-to-disk file
-when resuming -- it merely uses it in place. The result is that the
-MAP_NOSYNC flag doesn't get set, which causes the performance of a
-resumed session to be terrible compared to a new session. Every time the
-syncer runs (sysctl -a kern.filedelay), vmware hangs while the RAM file
-dirty pages are flushed.
-
-This problem has been fixed in 4.2-STABLE as of 2 Mar 2001
-(sys/i386/linux/linux_machdep.c versions 1.13 and 1.6.2.3).
-
-- If you configure vmware to use bridging, you must still specify the
-"Host only" mode to the VMware configurator. It will still work just
-like a bridged interface. If your bridged VMware guest is a DHCP client,
-you may wish to fix its Ethernet address so as not to generate a new
-lease every time you start VMware. To do so, add this line to your
-guest's .cfg file:
-
-ethernet0.address = "00:50:56:1e:ad:bf"
-
-You can only change the last 5 hex digits, which MUST be unique (at least
-within your LAN).
-
-Note that bridging only works on (real) Interfaces where both the 'set
-promisc 1' and 'set autosrc 0' steps function. This means that the
-interface must be capable of transmitting frames with other than its own
-Ethernet address and receiving promiscuously. Most interfaces can, but
-notably wi interfaces are among those that cannot. Note that promiscuous
-mode is entered when the vmware.sh startup script is run, which may
-cause increased interrupt loads on your machine if it's plugged into a
-busy network. If you only run vmware infrequently, it may be better to
-only manually run the vmware startup script (as root) just before you
-start vmware and again (with the stop argument this time) when you're
-finished.
-
-- Don't miss the VMware FAQ available on the official site.
-
- http://www.vmware.com/products/productfaq.html
-
---
-Akinori -Aki- MUSHA <knu@idaemons.org>
-Nick Sayer <nsayer@FreeBSD.org>
diff --git a/emulators/vmware3/files/Makefile b/emulators/vmware3/files/Makefile
deleted file mode 100644
index 73c7bbd4ac41..000000000000
--- a/emulators/vmware3/files/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= vmmon-only
-
-.include <bsd.subdir.mk>
diff --git a/emulators/vmware3/files/Makefile.vmmon b/emulators/vmware3/files/Makefile.vmmon
deleted file mode 100644
index ad418ac981a8..000000000000
--- a/emulators/vmware3/files/Makefile.vmmon
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-MAKE_SMP= make -f Makefile.FreeBSD SMP=YES
-MAKE_UP= make -f Makefile.FreeBSD SMP=NO
-
-all:
- ${MAKE_SMP} clean && ${MAKE_SMP}
- ${MAKE_UP} clean && ${MAKE_UP}
-
-install:
- ${MAKE_SMP} install
- ${MAKE_UP} install
diff --git a/emulators/vmware3/files/README.FreeBSD b/emulators/vmware3/files/README.FreeBSD
deleted file mode 100644
index 78ca8de35360..000000000000
--- a/emulators/vmware3/files/README.FreeBSD
+++ /dev/null
@@ -1,79 +0,0 @@
-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 2.0 for Linux on FreeBSD 4.0 and better ;) systems.
-
-===
-
-What's done.
-
-At this time I was able to successfully run the following operation systems
-under VMware on FreeBSD:
-
- - FreeBSD 4.0 Current
- - Linux (Debian 2.1)
- - Windows NT
- - Windows 95 OSR2 (in safe mode :)
- - MS DOS 7.0 (Part of Win'95)
-
-I think that all platforms supported by VMware should work under FreeBSD.
-
-
-Installation procedure.
-
-The easiest solution is to obtain the vmware port and try to build it.
-The name of the port is vmware.tar.gz, and it can be downloaded from the
-following location:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/vmware.tar.gz
-
-If you are like to use the linux proc filesystem emulator, you are need
-to install the next port:
-
-http://www.mindspring.com/~vsilyaev/vmware/files/linuxproc.tar.gz
-
-At build time, you will get further instructions on how to proceed.
-
-After a successful port installation you will need to obtain a license key
-to run VMware (you can use an old one for Linux). If you want to obtain
-a new key from http://www.vmware.com , you will have to select Linux as the
-'server' platform.
-
-Features currently unsupported
-
- - Fullscreen text mode
-
- - Mounting vmware virtual drive
-
- - Parallel ports were never tested. However, to support bidirectional
- transfers, we will need a FreeBSD version of the vmppuser driver.
-
-Caveats.
-
- - Onle one guest may be runned at one time.
-
- - Floppy disk detection currently doesn't work. It is assumed that
- a disk is always present in the floppy drive. Because of that, if you
- have enabled both IDE and floppy drives in the same VMware session, you
- _must_ select the right booting order in the Phoenix BIOS Setup.
-
- - 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
- with a rest of the world.
-
-Copyright issue.
-
- Unclear. My own code has a BSD-style copyright license,
- but in order to write it, I used VMware-copyrighted sources.
- In any case, I'm distributing only my own patch set, and all
- modified files retain the original copyright information.
-
-Author.
-
- Vladimir N. Silyaev.
- E-Mail: vsilyaev@mindspring.com
diff --git a/emulators/vmware3/files/config b/emulators/vmware3/files/config
deleted file mode 100644
index 66c1a93c6b33..000000000000
--- a/emulators/vmware3/files/config
+++ /dev/null
@@ -1,7 +0,0 @@
-vmware.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware"
-wizard.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-wizard"
-dhcpd.fullpath = "@@PREFIX@@/lib/vmware/bin/vmnet-dhcpd"
-loop.fullpath = ""@@PREFIX@@/lib/vmware/bin/vmware-loop"
-libdir = "@@PREFIX@@/lib/vmware/lib"
-vmnet1.HostOnlyAddress = "@@HOST_IP@@"
-vmnet1.HostOnlyNetMask = "@@NETMASK@@"
diff --git a/emulators/vmware3/files/df b/emulators/vmware3/files/df
deleted file mode 100644
index b9db0532e013..000000000000
--- a/emulators/vmware3/files/df
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-# Hacky emulation of GNU df.
-# Intented to use with vmware wizard.
-# Depend from the _absence_ linux version perl in the dir /compat/linux/usr/bin/
-#
-# $FreeBSD$
-#
-@NARGV=('-n');
-$type=0;
-foreach (@ARGV) {
- exit if $_ eq '-n'; # Aargh it's me again, exit immediatly
- next if $_ eq '-P';
- $type=1,next if $_ eq '-T';
- push @NARGV, $_;
-}
-
-$line = 0;
-
-open(DF,"-|") or exec '/bin/df', @NARGV;
-while(<DF>) {
-
- unless ($type) { print $_; next;}
- @cols = split();
- if ($line++) {
- $col = 'ext2fs';
- } else {
- $col = 'Type';
- }
- @cols = (@cols[0], $col, @cols[1..$#cols]);
- print join("\t", @cols),"\n";
-}
diff --git a/emulators/vmware3/files/kse.patch b/emulators/vmware3/files/kse.patch
deleted file mode 100644
index f4e611e6ee2a..000000000000
--- a/emulators/vmware3/files/kse.patch
+++ /dev/null
@@ -1,581 +0,0 @@
---- ./vmmon-only/common/vmx86.c.orig Sat Nov 10 16:54:14 2001
-+++ ./vmmon-only/common/vmx86.c Sat Nov 10 16:55:02 2001
-@@ -51,6 +51,7 @@
-
-
- static VMDriver *vmDriverList = NULL;
-+VMDriver * Vmx86_CurrentVM(void *uniqHandle);
-
- static int32 lockedPageLimit;
- static int32 numLockedPages;
---- ./vmmon-only/freebsd/driver.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/driver.c Sat Nov 10 16:54:52 2001
-@@ -147,6 +147,8 @@
- #endif
-
- #define CDEV_MINOR 0
-+
-+/* static struct cdevsw vmmon_cdevsw = { */
- static struct cdevsw vmmon_cdevsw = {
- /* open */ FreeBSD_Driver_Open,
- /* close */ FreeBSD_Driver_Close,
-@@ -162,8 +164,12 @@
- /* psize */ nopsize,
- /* flags */ 0,
- /* bmaj */ -1
-+
-+
- };
-
-+
-+
- /*
- *----------------------------------------------------------------------
- *
-@@ -329,7 +335,7 @@
- *----------------------------------------------------------------------
- */
- static int
--FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Open(dev_t dev, int oflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD;
- VMDriver *vm;
-@@ -353,7 +359,7 @@
- }
- memset(vmFreeBSD, 0, sizeof *vmFreeBSD);
-
-- vm = Vmx86_Init((void *)dev, (void *)(p->p_pid));
-+ vm = Vmx86_Init((void *)dev, (void *)(td->td_proc->p_pid));
- if (vm == NULL) {
- Warning("Vmx86_Init failed\n");
- free(vmFreeBSD, M_DEVBUF);
-@@ -409,7 +415,7 @@
- */
-
- static int
--FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct proc *p)
-+FreeBSD_Driver_Close(dev_t dev, int fflag, int devtype, struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
-
-@@ -419,7 +425,7 @@
-
- if (!vmFreeBSD->vm) {
- printf("/dev/" DEVICE_NAME ": (zombie) close fd for pid=%d\n",
-- p->p_pid);
-+ td->td_proc->p_pid);
- } else {
- /*printf("/dev/" DEVICE_NAME ": useCount DEC pid=%d\n",vmFreeBSD->pids[0]);*/
- }
-@@ -461,7 +467,7 @@
- */
-
- static int
--FreeBSD_Driver_Poll(dev_t dev, int events, struct proc *p)
-+FreeBSD_Driver_Poll(dev_t dev, int events, struct thread *td)
- {
- int revents = 0;
-
-@@ -492,7 +498,7 @@
- #if POLL_TRACE
- nanotime(&vmFreeBSD->time_sleep);
- #endif
-- selrecord(p, &vmFreeBSD->rsel);
-+ selrecord(td, &vmFreeBSD->rsel);
- vmFreeBSD->flags.twaiting = TRUE;
- vmFreeBSD->thandle = timeout(FreeBSD_DriverSelectTimeout, vmFreeBSD, 1);
- }
-@@ -544,7 +550,7 @@
- */
- static int
- FreeBSD_Driver_Ioctl( dev_t dev, u_long cmd, caddr_t parg, int mode,
-- struct proc *p)
-+ struct thread *td)
- {
- VMFreeBSD *vmFreeBSD = (VMFreeBSD *) dev->si_drv1;
- VMDriver *vm = vmFreeBSD->vm;
-@@ -575,7 +581,7 @@
- ASSERT(!err);
- err = Vmx86_CreateVM(vm, &initParams);
- if (err) {
-- p->p_retval[0] = -1;
-+ td->td_retval[0] = -1;
- retval = EAGAIN;
- }
- err = HostIF_CopyToUser((char*)arg,&initParams,sizeof(InitBlock));
-@@ -591,7 +597,7 @@
- case VMIO_RUN:
- ASSERT(vm != NULL);
- vm_hold = vm;
-- p->p_retval[0] = Vmx86_RunVM(vm);
-+ td->td_retval[0] = Vmx86_RunVM(vm);
- break;
-
- case VMIO_BEEP: { /* XXX for buggy Linux */
-@@ -625,7 +631,7 @@
- char *addr = (char *)arg;
- MPN mpn;
- mpn = HostIF_LookupUserMPN(vm,addr);
-- p->p_retval[0] = mpn;
-+ td->td_retval[0] = mpn;
- break;
- }
-
-@@ -633,18 +639,18 @@
- char *addr = (char *)arg;
- MPN mpn;
- mpn = Vmx86_LockPage(vm, addr, TRUE);
-- p->p_retval[0] = mpn;
-+ td->td_retval[0] = mpn;
- break;
- }
-
- case VMIO_UNLOCKPAGE: {
- char *addr = (char *)arg;
-- p->p_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
-+ td->td_retval[0] = Vmx86_UnlockPage(vm, addr, TRUE);
- break;
- }
-
- case VMIO_GET_NUM_VMS : {
-- p->p_retval[0] = Vmx86_GetNumVMs();
-+ td->td_retval[0] = Vmx86_GetNumVMs();
- break;
- }
-
-@@ -660,7 +666,7 @@
- }
-
- case VMIO_GET_HARD_LIMIT: {
-- p->p_retval[0] = Vmx86_GetLockedPagesLimit();
-+ td->td_retval[0] = Vmx86_GetLockedPagesLimit();
- break;
- }
-
-@@ -762,9 +768,9 @@
-
- case VMIO_ISMPSAFE : {
- #ifdef SMP
-- p->p_retval[0] = TRUE;
-+ td->td_retval[0] = TRUE;
- #else
-- p->p_retval[0] = FALSE;
-+ td->td_retval[0] = FALSE;
- #endif
- break;
- }
-@@ -772,25 +778,25 @@
- case VMIO_APICBASE: {
- MA ma;
- ma = HostIF_APIC_Base(vm, (Bool)arg);
-- p->p_retval[0] = ma;
-+ td->td_retval[0] = ma;
- break;
- }
-
- case VMIO_IOAPICBASE: {
- MA ma;
- ma = HostIF_IOAPIC_Base(vm);
-- p->p_retval[0] = ma;
-+ td->td_retval[0] = ma;
- break;
- }
-
-
- case VMIO_CHECK_MEMORY :
-- p->p_retval[0] = HostIF_CheckMemory(vm);
-+ td->td_retval[0] = HostIF_CheckMemory(vm);
- break;
-
- case VMIO_REGISTER_PASSTHROUGH_IRQ: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
-+ td->td_retval[0] = Passthrough_RegisterIRQ((unsigned char) arg, "VMware", vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -802,7 +808,7 @@
- struct passthrough_iorange ior;
-
- err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
-- p->p_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
-+ td->td_retval[0] = Passthrough_RegisterIORegion(ior.ioBase, ior.numPorts, "VMware");
- #else
- retval = EINVAL;
- #endif
-@@ -823,7 +829,7 @@
- struct passthrough_iorange ior;
-
- err = HostIF_CopyFromUser(&ior, (char*)arg, sizeof(ior));
-- p->p_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
-+ td->td_retval[0] = Passthrough_ReleaseIORegion(ior.ioBase, ior.numPorts);
- #else
- retval = EINVAL;
- #endif
-@@ -832,7 +838,7 @@
-
- case VMIO_START_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_Init(vmFreeBSD);
-+ td->td_retval[0] = Passthrough_Init(vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -841,7 +847,7 @@
-
- case VMIO_STOP_PASSTHROUGH: {
- #ifdef SUPPORT_PASSTHROUGH
-- p->p_retval[0] = Passthrough_Release(vmFreeBSD);
-+ td->td_retval[0] = Passthrough_Release(vmFreeBSD);
- #else
- retval = EINVAL;
- #endif
-@@ -853,7 +859,7 @@
- unsigned char irq;
- if (vmFreeBSD->numPendingPassthroughIRQs > 0) {
- irq = vmFreeBSD->pendingPassthroughIRQs[--vmFreeBSD->numPendingPassthroughIRQs],
-- p->p_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
-+ td->td_retval[0] = vmFreeBSD->numPendingPassthroughIRQs;
- } else {
- irq = 0x0;
- retval = EAGAIN;
-@@ -950,7 +956,7 @@
- va_list args;
-
-
-- vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-
- va_start(args, fmt);
- vsprintf(freebsdState.buf, fmt, args);
-@@ -978,7 +984,7 @@
- va_list args;
-
-
-- vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
-
- va_start(args, fmt);
- vsprintf(freebsdState.buf, fmt, args);
-@@ -1009,7 +1015,7 @@
- void
- Panic(char *fmt, ...)
- {
-- VMDriver *vm = Vmx86_GetVMforProcess((void *)(curproc->p_pid));
-+ VMDriver *vm = Vmx86_GetVMforProcess((void *)(curthread->td_proc->p_pid));
- va_list args;
-
- va_start(args, fmt);
-@@ -1029,13 +1035,13 @@
- if (vm) {
- vLog(vm->logFD);
- vWarning(vm);
-- sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curproc->p_pid);
-+ sprintf(freebsdState.buf,"VMX86 driver panic. pid=%d\n\r",curthread->td_proc->p_pid);
- vLog(vm->logFD);
- vWarning(vm);
- }
-
- /* XXX Why it's right */
-- exit1(curproc, 0);
-+ exit1(curthread, 0);
- /* NOTREACHED */
- }
-
---- ./vmmon-only/freebsd/hostif.c.orig Sat Nov 10 16:56:01 2001
-+++ ./vmmon-only/freebsd/hostif.c Sat Nov 10 16:56:21 2001
-@@ -55,10 +55,9 @@
-
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#include <sys/lock.h>
- #if __FreeBSD_version >= 500018
- #include <sys/mutex.h>
--#else
--#include <sys/lock.h>
- #endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
---- ./vmmon-only/freebsd/linux_emu.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmmon-only/freebsd/linux_emu.c Sat Nov 10 16:54:57 2001
-@@ -300,13 +300,13 @@
- }
-
- static int
--linux_to_bsd_fdgetprm(struct proc *p, struct file *fp, struct linux_floppy_struct *flp)
-+linux_to_bsd_fdgetprm(struct thread *td, struct file *fp, struct linux_floppy_struct *flp)
- {
- int error;
- struct linux_floppy_struct fls;
- struct fd_type fdt;
-
-- if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, p)) != 0)
-+ if ((error = fo_ioctl(fp, FD_GTYPE, (caddr_t)&fdt, td)) != 0)
- return error;
- bzero(&fls, sizeof(fls));
-
-@@ -324,13 +324,13 @@
- }
-
- static int
--linux_to_bsd_get_geometry(struct proc *p, struct file *fp, struct linux_hd_geometry *geo)
-+linux_to_bsd_get_geometry(struct thread *td, struct file *fp, struct linux_hd_geometry *geo)
- {
- int error;
- struct linux_hd_geometry drive_geo;
- struct disklabel dl;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- return error;
-
- bzero(&drive_geo, sizeof(drive_geo));
-@@ -344,14 +344,14 @@
- }
-
- static int
--linux_to_bsd_hdio_identity(struct proc *p, struct file *fp, struct linux_hd_driveid *id)
-+linux_to_bsd_hdio_identity(struct thread *td, struct file *fp, struct linux_hd_driveid *id)
- {
- int error;
- struct disklabel dl;
- struct linux_hd_driveid driveid;
- unsigned int capacity;
-
-- if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, p)) != 0)
-+ if ((error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td)) != 0)
- return error;
-
- bzero(&driveid, sizeof(driveid));
-@@ -382,13 +382,13 @@
- }
-
- static int
--linux_to_bsd_cdromvolread(struct proc *p, struct file *fp, struct linux_cdrom_volctrl *vol)
-+linux_to_bsd_cdromvolread(struct thread *td, struct file *fp, struct linux_cdrom_volctrl *vol)
- {
- int error;
- struct ioc_vol bsd_vol;
- struct linux_cdrom_volctrl linux_vol;
-
-- if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOCGETVOL, (caddr_t)&bsd_vol, td)) != 0)
- return error;
-
- linux_vol.channel0 = bsd_vol.vol[0];
-@@ -400,7 +400,7 @@
- }
-
- static int
--linux_cdrom_get_multisession(struct proc *p, struct file *fp, struct linux_cdrom_multisession *muls)
-+linux_cdrom_get_multisession(struct thread *td, struct file *fp, struct linux_cdrom_multisession *muls)
- {
- struct linux_cdrom_multisession ms;
- struct ioc_toc_header h;
-@@ -411,7 +411,7 @@
- if ((error = copyin(muls, &ms, sizeof(ms))) != 0)
- return error;
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&h, td)) != 0)
- return error;
-
- bzero(&t, sizeof(t));
-@@ -419,7 +419,7 @@
- t.address_format = ms.addr_format ; /* BSD and LINUX formats equal */
- t.track = 0; /* get content from the first track */
-
-- if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, p)) != 0)
-+ if ((error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&t, td)) != 0)
- return error;
-
- bsd_to_linux_msf_lba(ms.addr_format, &t.entry.addr, &ms.addr);
-@@ -430,37 +430,37 @@
- }
-
- static int
--linux_ioctl_hdfdcd(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_hdfdcd(struct thread *td, struct linux_ioctl_args *args)
- {
-- struct file *fp = p->p_fd->fd_ofiles[args->fd];
-+ struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd];
- switch (args->cmd & 0xffff) {
- case LINUX_HDIO_GET_IDENTITY:
- case LINUX_HDIO_OBSOLETE_IDENTITY:
-- return linux_to_bsd_hdio_identity(p, fp, (struct linux_hd_driveid *)args->arg);
-+ return linux_to_bsd_hdio_identity(td, fp, (struct linux_hd_driveid *)args->arg);
- case LINUX_HDIO_GETGEO:
-- return linux_to_bsd_get_geometry(p, fp, (struct linux_hd_geometry *)args->arg);
-+ return linux_to_bsd_get_geometry(td, fp, (struct linux_hd_geometry *)args->arg);
-
- case LINUX_FDTWADDLE:
- return 0;
- case LINUX_CDROMVOLREAD:
-- return linux_to_bsd_cdromvolread(p, fp, (struct linux_cdrom_volctrl*)args->arg);
-+ return linux_to_bsd_cdromvolread(td, fp, (struct linux_cdrom_volctrl*)args->arg);
- case LINUX_CDROMMULTISESSION:
-- return linux_cdrom_get_multisession(p, fp, (struct linux_cdrom_multisession *)args->arg);
-+ return linux_cdrom_get_multisession(td, fp, (struct linux_cdrom_multisession *)args->arg);
- case LINUX_CDROM_SET_OPTIONS:
- switch (args->arg) {
- case 0:
-- p->p_retval[0] = 0;
-+ td->td_retval[0] = 0;
- return 0;
- default:
- return ENOSYS;
- }
- break;
- case LINUX_CDROM_CLEAR_OPTIONS:
-- p->p_retval[0] = 0;
-+ td->td_retval[0] = 0;
- return 0;
- case LINUX_CDROM_LOCKDOOR:
- args->cmd = args->arg ? CDIOCPREVENT : CDIOCALLOW;
-- return ioctl(p, (struct ioctl_args *)args);
-+ return ioctl(td, (struct ioctl_args *)args);
- case LINUX_CDROM_MEDIA_CHANGED:
- case LINUX_CDROM_DRIVE_STATUS:
- case LINUX_CDROM_DISC_STATUS:
-@@ -470,7 +470,7 @@
- case LINUX_FDPOLLDRVSTAT:
- return linux_fdpolldrvstat((struct linux_floppy_drive_struct*)args->arg);
- case LINUX_FDGETPRM:
-- return linux_to_bsd_fdgetprm(p, fp, (struct linux_floppy_struct*)args->arg);
-+ return linux_to_bsd_fdgetprm(td, fp, (struct linux_floppy_struct*)args->arg);
- }
- return (ENOIOCTL);
- }
-@@ -482,7 +482,7 @@
- #define LINUX_TIOCLINUX 0x541C
-
- static int
--linux_tioclinux(struct proc *p, struct linux_ioctl_args *args)
-+linux_tioclinux(struct thread *td, struct linux_ioctl_args *args)
- {
- int type;
- int error = ENOIOCTL;
-@@ -503,7 +503,7 @@
-
-
- static int
--linux_ioctl_video(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_video(struct thread *td, struct linux_ioctl_args *args)
- {
- int error = ENOIOCTL;
-
-@@ -513,7 +513,7 @@
- error = 0;
- break;
- case LINUX_TIOCLINUX:
-- error = linux_tioclinux(p, args);
-+ error = linux_tioclinux(td, args);
- break;
- default:
- break;
-@@ -526,18 +526,17 @@
- LINUX_IOCTL_SET(vmmon, IOCTLCMD_NONE, IOCTLCMD_LAST);
-
- static int
--linux_ioctl_vmmon(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_vmmon(struct thread *td, struct linux_ioctl_args *args)
- {
- #define DEB(x)
-
- switch (args->cmd & 0xffff) {
- #define IOCTL(name) case IOCTLCMD_##name: args->cmd = VMIO_##name; \
- DEB(printf("vmmware: IOCTL %s arg %p\n", #name, (void *)args->arg)); \
-- return ioctl(p, (struct ioctl_args *)args);
-+ return ioctl(td, (struct ioctl_args *)args);
- #include "ioctls.h"
- #undef IOCTL
- }
- return (ENOIOCTL);
- #undef DEB
- }
--
---- ./vmnet-only/freebsd/vmnet_linux.c.orig Sat Nov 10 16:54:17 2001
-+++ ./vmnet-only/freebsd/vmnet_linux.c Sat Nov 10 16:54:59 2001
-@@ -76,9 +76,9 @@
-
-
- static int
--linux_ioctl_setmacaddr(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_setmacaddr(struct thread *td, struct linux_ioctl_args *args)
- {
-- struct file *fp = p->p_fd->fd_ofiles[args->fd];
-+ struct file *fp = td->td_proc->p_fd->fd_ofiles[args->fd];
- int error;
- VNet_SetMacAddrIOCTL macAddr;
-
-@@ -90,7 +90,7 @@
-
- switch (macAddr.version) {
- case 1:
-- error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, p);
-+ error = fo_ioctl(fp, SIOCSIFADDR, (caddr_t)macAddr.addr, td);
- DEB(printf("Get ethernet address: %6D\n", macAddr.addr, ":"));
- break;
- default:
-@@ -102,7 +102,7 @@
-
-
- static int
--linux_ioctl_net(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_net(struct thread *td, struct linux_ioctl_args *args)
- {
- int error=ENOIOCTL;
-
-@@ -116,7 +116,7 @@
- #endif
- case LINUX_SIOCSIFADDR:
- args->cmd = SIOCSIFADDR;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCSLADRF:
- case LINUX_SIOCSKEEP:
-@@ -125,18 +125,18 @@
- break;
- case LINUX_SIOCPORT:
- args->cmd = VMIO_SIOCPORT;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCBRIDGE:
- args->cmd = VMIO_SIOCBRIDGE;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCNETIF:
- args->cmd = VMIO_SIOCNETIF;
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- break;
- case LINUX_SIOCSETMACADDR:
-- error = linux_ioctl_setmacaddr(p, args);
-+ error = linux_ioctl_setmacaddr(td, args);
- break;
- }
- DEB(printf(__FUNCTION__ ": return %d\n", error));
-@@ -147,16 +147,16 @@
-
- /* What is the dumb idea to use SIOCSIFFLAGS ioctl, and directly pass flags? */
- static int
--linux_ioctl_net_sifflags(struct proc *p, struct linux_ioctl_args *args)
-+linux_ioctl_net_sifflags(struct thread *td, struct linux_ioctl_args *args)
- {
- int error;
-
- DEB(printf(__FUNCTION__ ": cmd 0x%04lx arg %p\n", args->cmd, (void*)args->arg));
- args->cmd = SIOCGIFFLAGS;
-- error = ioctl(p, (struct ioctl_args *)args); /* First try standart */
-+ error = ioctl(td, (struct ioctl_args *)args); /* First try standart */
- if (error) {
- args->cmd = VMIO_SIOCSIFFLAGS; /* Than vmnet */
-- error = ioctl(p, (struct ioctl_args *)args);
-+ error = ioctl(td, (struct ioctl_args *)args);
- }
- DEB(printf(__FUNCTION__ ": return %d\n", error));
- return error;
diff --git a/emulators/vmware3/files/patch-bc b/emulators/vmware3/files/patch-bc
deleted file mode 100644
index b2764c90596a..000000000000
--- a/emulators/vmware3/files/patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmnet-only/freebsd/vmnet.c.orig Mon Jul 31 08:36:25 2000
-+++ vmnet-only/freebsd/vmnet.c Mon Sep 11 00:34:08 2000
-@@ -164,7 +164,7 @@
-
- s = splimp();
- if_attach(ifp);
-- ether_ifattach(ifp);
-+ ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
- bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
- splx(s);
-
diff --git a/emulators/vmware3/files/patch-bd b/emulators/vmware3/files/patch-bd
deleted file mode 100644
index ff0ea92d6a36..000000000000
--- a/emulators/vmware3/files/patch-bd
+++ /dev/null
@@ -1,27 +0,0 @@
---- vmmon-only/freebsd/driver.c.orig Thu Jun 29 21:06:18 2000
-+++ vmmon-only/freebsd/driver.c Sat Sep 23 01:41:34 2000
-@@ -73,6 +73,24 @@
- #include "private.h"
- #endif
-
-+#if __FreeBSD_version >= 500013
-+enum intr_type {
-+ INTR_TYPE_TTY = 1,
-+ INTR_TYPE_BIO = 2,
-+ INTR_TYPE_NET = 4,
-+ INTR_TYPE_CAM = 8,
-+ INTR_TYPE_MISC = 16,
-+ INTR_HEAVY = 32, /* heavyweight interrupt process */
-+ INTR_LIGHT = 64, /* light weight interrupt thread */
-+ INTR_THREADED = INTR_LIGHT | INTR_HEAVY, /* any kind of interrupt thread */
-+ INTR_FAST = 128,
-+ INTR_EXCL = 256, /* exclusive interrupt */
-+ INTR_MPSAFE = 512 /* this interrupt is SMP safe */
-+};
-+
-+typedef void driver_intr_t(void*);
-+#endif
-+
- #ifdef SUPPORT_PASSTHROUGH
- #include "passthrough.h" // _driver_ version of passthrough.h
- #endif
diff --git a/emulators/vmware3/files/patch-be b/emulators/vmware3/files/patch-be
deleted file mode 100644
index 1bfac1cee747..000000000000
--- a/emulators/vmware3/files/patch-be
+++ /dev/null
@@ -1,87 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig Thu Jul 12 22:05:29 2001
-+++ vmmon-only/freebsd/hostif.c Thu Jul 12 22:14:09 2001
-@@ -55,7 +55,11 @@
-
- #include <vm/vm.h>
- #include <vm/vm_param.h>
-+#if __FreeBSD_version >= 500018
-+#include <sys/mutex.h>
-+#else
- #include <sys/lock.h>
-+#endif
- #include <vm/pmap.h>
- #include <vm/vm_map.h>
- #include <vm/vm_page.h>
-@@ -107,7 +111,16 @@
-
- paddr = (vm_offset_t)addr;
- m = PHYS_TO_VM_PAGE(paddr);
-+#if __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+#endif
- vm_page_wire(m);
-+#if __FreeBSD_version >= 500021
-+#elif __FreeBSD_version >= 500013
-+ mtx_unlock(&vm_mtx);
-+#endif
- return 0;
- }
-
-@@ -120,7 +133,16 @@
-
- paddr = (vm_offset_t)addr;
- m = PHYS_TO_VM_PAGE(paddr);
-+#if __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+#endif
- vm_page_unwire(m, 1);
-+#if __FreeBSD_version >= 500021
-+#elif __FreeBSD_version >= 500013
-+ mtx_unlock(&vm_mtx);
-+#endif
- return 0;
- }
-
-@@ -1066,10 +1088,19 @@
- return NULL;
- }
- paddr = vtophys(addr);
-+#if __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+#endif
- ka->kaddr = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
- ka->map = PHYS_TO_VM_PAGE(paddr);
- vm_page_wire(ka->map);
- pmap_kenter(ka->kaddr, paddr);
-+#if __FreeBSD_version >= 500021
-+#elif __FreeBSD_version >= 500013
-+ mtx_unlock(&vm_mtx);
-+#endif
- return ka->kaddr;
- }
-
-@@ -1079,9 +1110,18 @@
- if (ka->map==NULL)
- return 0;
-
-+#if __FreeBSD_version >= 500021
-+ GIANT_REQUIRED;
-+#elif __FreeBSD_version >= 500013
-+ mtx_lock(&vm_mtx);
-+#endif
- vm_page_unwire(ka->map, 1);
- pmap_kremove(ka->kaddr);
- kmem_free(kernel_map, ka->kaddr, PAGE_SIZE);
-+#if __FreeBSD_version >= 500021
-+#elif __FreeBSD_version >= 500013
-+ mtx_unlock(&vm_mtx);
-+#endif
- ka->kaddr = 0;
- ka->map = NULL;
- return 0;
diff --git a/emulators/vmware3/files/patch-bf b/emulators/vmware3/files/patch-bf
deleted file mode 100644
index e2b7e590503f..000000000000
--- a/emulators/vmware3/files/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../vmware-distrib/vmmon-only/common/hostif.h.orig Wed Jul 18 11:27:34 2001
-+++ ../vmware-distrib/vmmon-only/common/hostif.h Wed Jul 18 11:29:28 2001
-@@ -118,7 +118,12 @@
- EXTERN void HostIF_GlobalVMLock(int callerID);
- EXTERN void HostIF_GlobalVMUnLock(int callerID);
-
-+#ifdef __FreeBSD__
-+/* The HostIF_APIC_Base for FreeBSD still just takes two parameters */
-+EXTERN MA HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr);
-+#else
- EXTERN MA HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr, Bool probe);
-+#endif
- EXTERN MA HostIF_IOAPIC_Base(VMDriver *vm);
-
- EXTERN void HostIF_LockKernel(void);
diff --git a/emulators/vmware3/files/pmap.patch b/emulators/vmware3/files/pmap.patch
deleted file mode 100644
index 2a914e47c047..000000000000
--- a/emulators/vmware3/files/pmap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vmmon-only/freebsd/hostif.c.orig Tue Dec 4 20:49:08 2001
-+++ vmmon-only/freebsd/hostif.c Tue Dec 4 20:49:44 2001
-@@ -170,7 +170,7 @@
- {
- #define DEB(x)
- caddr_t addr = (caddr_t)VPN_2_VA(ppn);
-- pt_entry_t pteptr = (pt_entry_t)vtopte(addr);
-+ pt_entry_t *pteptr = vtopte(addr);
- PTE pte;
-
- DEB(printf("FindMPN: for page %d address %p(phys %p) pteptr %p", ppn, addr, (caddr_t)vtophys(addr), pteptr));
diff --git a/emulators/vmware3/files/vmware b/emulators/vmware3/files/vmware
deleted file mode 100644
index 6693fad91f09..000000000000
--- a/emulators/vmware3/files/vmware
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Run vmware
-#
-# $FreeBSD$
-
-if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then
- echo "************************************************************"
- echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc."
- echo "VMware does not work without Linux procfs mounted."
- echo
- echo "For details, see linprocfs(5) manpage."
- echo "************************************************************"
- exit 1
-fi
-
-LANG=C
-PATH=/bin:$PATH
-
-if [ _$TMPDIR = _ ]; then
- TMPDIR=/var/tmp
- echo Setting TMPDIR="$TMPDIR".
- export TMPDIR
-fi
-
-exec @@PREFIX@@/lib/vmware/bin/vmware "$@"
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
deleted file mode 100644
index a5d8029ee831..000000000000
--- a/emulators/vmware3/files/vmware.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Start or stop vmware
-#
-# $FreeBSD$
-
-vmware_config_file=@@PREFIX@@/etc/vmware/config
-
-if [ ! -e $vmware_config_file ]; then
- echo "$vmware_config_file does not exist!" >&2
- exit 255
-fi
-
-vmware_config() {
- cat $vmware_config_file | while read var eq value; do
- if [ "$1" = "$var" ]; then
- ret=`expr "$value" : '"\(.*\)"$'`
- echo ${ret:-$value}
- break
- fi
- done
-}
-
-vmware=`vmware_config vmware.fullpath`
-vmware_libdir=`vmware_config libdir`
-networking=@@NETWORKING@@
-bridged=@@BRIDGED@@
-bridge_interface=@@BRIDGE_INTF@@
-host_ip=`vmware_config vmnet1.HostOnlyAddress`
-netmask=`vmware_config vmnet1.HostOnlyNetMask`
-dev_vmnet1=@@LINUXBASE@@/dev/vmnet1
-
-if [ ! -x $vmware ]; then
- echo "$vmware does not exist!" >&2
- exit 255
-fi
-
-if [ `sysctl -n hw.ncpu` -eq 1 ]; then
- suffix=up
-else
- suffix=smp
-fi
-
-exec >/dev/null
-
-case $1 in
-start)
- kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
- if [ $networking -eq 1 ]; then
- kldstat -v | grep if_tap >/dev/null || kldload if_tap.ko
- if [ ! -e $dev_vmnet1 ]; then
- echo "$dev_vmnet1 does not exist!" >&2
- echo "Your VMware installation seems broken. Please reinstall VMware port." >&2
- exit 255
- fi
- echo -n > $dev_vmnet1
- ifconfig vmnet1 $host_ip netmask $netmask
- if [ X$bridged = XYES ]; then
- kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko
- kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko
- kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko
- ngctl mkpeer vmnet1: bridge lower link0
- ngctl name vmnet1:lower vmnet_bridge
- ngctl connect vmnet_bridge: ${bridge_interface}: link1 lower
- ngctl connect vmnet_bridge: ${bridge_interface}: link2 upper
- ngctl msg ${bridge_interface}: setautosrc 0
- ngctl msg ${bridge_interface}: setpromisc 1
- ngctl msg vmnet1: setautosrc 0
- ngctl msg vmnet1: setpromisc 1
- fi
- fi
- echo -n " VMware" >&2
- ;;
-
-stop)
- kldunload vmmon_${suffix}
- if [ $networking -eq 1 ]; then
- ifconfig vmnet1 down
- ifconfig vmnet1 delete $host_ip
- if [ X$bridged = XYES ]; then
- ngctl shutdown vmnet_bridge:
- ngctl msg ${bridge_interface}: setautosrc 1
- ngctl msg ${bridge_interface}: setpromisc 0
- fi
- fi
- ;;
-
-*)
- echo "usage: `basename $0` {start|stop}" >&2
- exit 64
- ;;
-esac
diff --git a/emulators/vmware3/pkg-comment b/emulators/vmware3/pkg-comment
deleted file mode 100644
index 3e6b90a9f6e7..000000000000
--- a/emulators/vmware3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine emulator - a full PC in a window
diff --git a/emulators/vmware3/pkg-descr b/emulators/vmware3/pkg-descr
deleted file mode 100644
index 400a2f031035..000000000000
--- a/emulators/vmware3/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This is the Linux version of the VMware virtual machine emulator made
-to run on FreeBSD using the Linux compatibility mode. VMware can be
-used to run Microsoft MS-DOS, Windows 95/98/NT/2000, Linux, FreeBSD,
-or any other operating system that runs on the i486.
-
-Official VMware, Inc. web site:
-WWW: http://www.vmware.com/
-
-
-We all are thankful to Vladimir N. Silyaev for porting vmmon/vmnet
-modules to FreeBSD. Have a look at his page for the latest
-information:
-
- http://www.mindspring.com/~vsilyaev/vmware/
diff --git a/emulators/vmware3/pkg-message b/emulators/vmware3/pkg-message
deleted file mode 100644
index 46a622351f49..000000000000
--- a/emulators/vmware3/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-************************************************************
-Get Linux procfs ready and initialize vmmon/vmnet as follows:
-
- ${PREFIX}/etc/rc.d/vmware.sh start
-
-then you'll be ready to start vmware.
-
-Don't miss the documents installed:
-
- vmware(1) ${PREFIX}/share/doc/vmware/*
-************************************************************
diff --git a/emulators/vmware3/pkg-plist b/emulators/vmware3/pkg-plist
deleted file mode 100644
index 3410eb1b03ed..000000000000
--- a/emulators/vmware3/pkg-plist
+++ /dev/null
@@ -1,134 +0,0 @@
-bin/vmware
-etc/rc.d/vmware.sh
-etc/vmware/config
-lib/vmware/bin/df
-lib/vmware/bin/vmware
-lib/vmware/bin/vmnet-bridge
-lib/vmware/bin/vmnet-dhcpd
-lib/vmware/bin/vmnet-sniffer
-lib/vmware/bin/vmware-config.pl
-lib/vmware/bin/vmware-mount.pl
-lib/vmware/bin/vmware-uninstall.pl
-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
-lib/vmware/lib/help/Configuration.htm
-lib/vmware/lib/help/Fit.htm
-lib/vmware/lib/help/FullScreen.gif
-lib/vmware/lib/help/Fullscreen.htm
-lib/vmware/lib/help/GeneralInput.htm
-lib/vmware/lib/help/GeneralMemory.htm
-lib/vmware/lib/help/GeneralPreferences.htm
-lib/vmware/lib/help/Glossary.htm
-lib/vmware/lib/help/Help.gif
-lib/vmware/lib/help/Interacting.htm
-lib/vmware/lib/help/Introduction.htm
-lib/vmware/lib/help/Power.htm
-lib/vmware/lib/help/PowerOff.gif
-lib/vmware/lib/help/PowerOff.htm
-lib/vmware/lib/help/PowerOn.gif
-lib/vmware/lib/help/PowerOn.htm
-lib/vmware/lib/help/PowerReset.gif
-lib/vmware/lib/help/PowerReset.htm
-lib/vmware/lib/help/Resume.gif
-lib/vmware/lib/help/Resume.htm
-lib/vmware/lib/help/RunVM.htm
-lib/vmware/lib/help/SendCtlAltDel.htm
-lib/vmware/lib/help/Setremdev.htm
-lib/vmware/lib/help/Settings.htm
-lib/vmware/lib/help/ShowAllHints.htm
-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
-lib/vmware/lib/help/Wizdisk.htm
-lib/vmware/lib/help/Wizdisk3.htm
-lib/vmware/lib/help/WizdiskType.htm
-lib/vmware/lib/help/Wizfloppy.htm
-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_smp.ko
-lib/vmware/lib/modules/vmmon_up.ko
-lib/vmware/lib/xkeymap/be101
-lib/vmware/lib/xkeymap/be104
-lib/vmware/lib/xkeymap/chde101
-lib/vmware/lib/xkeymap/chde104
-lib/vmware/lib/xkeymap/chfr101
-lib/vmware/lib/xkeymap/chfr104
-lib/vmware/lib/xkeymap/de101
-lib/vmware/lib/xkeymap/de104
-lib/vmware/lib/xkeymap/dk101
-lib/vmware/lib/xkeymap/dk104
-lib/vmware/lib/xkeymap/es101
-lib/vmware/lib/xkeymap/es104
-lib/vmware/lib/xkeymap/fi101
-lib/vmware/lib/xkeymap/fi104
-lib/vmware/lib/xkeymap/fr101
-lib/vmware/lib/xkeymap/fr104
-lib/vmware/lib/xkeymap/gb101
-lib/vmware/lib/xkeymap/gb104
-lib/vmware/lib/xkeymap/is101
-lib/vmware/lib/xkeymap/is104
-lib/vmware/lib/xkeymap/it101
-lib/vmware/lib/xkeymap/it104
-lib/vmware/lib/xkeymap/jp106
-lib/vmware/lib/xkeymap/jp109
-lib/vmware/lib/xkeymap/no101
-lib/vmware/lib/xkeymap/no104
-lib/vmware/lib/xkeymap/pt101
-lib/vmware/lib/xkeymap/pt104
-lib/vmware/lib/xkeymap/se101
-lib/vmware/lib/xkeymap/se104
-lib/vmware/lib/xkeymap/us101
-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 %%LINUXBASE%%/dev;for n in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/ttyv$n %%LINUXBASE%%/dev/tty$n;done
-@exec ln -s /dev/ttyva %%LINUXBASE%%/dev/tty10
-@exec ln -s /dev/ttyvb %%LINUXBASE%%/dev/tty11
-@exec mknod %%LINUXBASE%%/dev/null c 2 2
-@exec chmod 666 %%LINUXBASE%%/dev/null
-@exec mknod %%LINUXBASE%%/dev/hda b 0 0x00010002
-@exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a
-@exec ln -sf %D/etc/vmware /etc/
-@exec mknod %%LINUXBASE%%/dev/vmmon c 200 0
-@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 65537
-@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
-@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
-@dirrm lib/vmware/lib
-@dirrm lib/vmware
-@dirrm share/doc/vmware
diff --git a/emulators/vmware3/scripts/configure b/emulators/vmware3/scripts/configure
deleted file mode 100644
index 4b00cb17e72e..000000000000
--- a/emulators/vmware3/scripts/configure
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-[ "_$VMNET_HOST_IP" = _ ] && VMNET_HOST_IP="192.168.254.1"
-[ "_$VMNET_NETMASK" = _ ] && VMNET_NETMASK="255.255.255.0"
-
-host_ip=$VMNET_HOST_IP
-netmask=$VMNET_NETMASK
-title="VMware network options"
-
-get_network_settings() {
- bridged="NO"
- /usr/bin/dialog --title "$title" --clear --yesno \
-"\n"\
-"Do you want to use netgraph bridging?\n"\
- 10 50
- if [ $? -eq 0 ]; then
- bridged="YES"
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"To which interface would you\n"\
-"like to tie the bridge?:"\
- 10 50 "" \
- 2>&1 > /dev/tty`
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- bdg_interface=$result
- ;;
- 1)
- return 1
- ;;
- esac
- host_ip=192.168.0.1
- netmask=255.255.255.0
- else
-
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"What will be the IP address of your host\n"\
-"on your private network?:"\
- 10 50 $host_ip \
- 2>&1 >/dev/tty `
-
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- host_ip=$result
- ;;
- 1)
- return 1
- ;;
- esac
-
- result=`/usr/bin/dialog --title "$title" --clear --inputbox \
-"\n"\
-"What will be the netmask of your private\n"\
-"network?:"\
- 10 50 $netmask \
- 2>&1 >/dev/tty `
-
- case $? in
- 0)
- if [ -z "$result" ]; then
- return 1
- fi
- netmask=$result
- ;;
- 1)
- return 1
- ;;
- esac
- return 0;
- fi
-}
-
-do_network() {
- while true; do
- get_network_settings
-
- if [ "X$bridged" != "XYES" ]; then
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Are the following options correct?\n\n"\
-"Configuration: host only\n"\
-"IP address: $host_ip\n"\
-"Netmask: $netmask\n"\
- 10 50
- [ $? -eq 0 ] && return 0
- else
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Are the following options correct?\n\n"\
-"Configuration: bridged\n"\
-"Interface: $bdg_interface\n"\
- 10 50
- [ $? -eq 0 ] && return 0
- fi
-
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Do you want to edit network options again?\n"\
- 10 50
- [ $? -eq 0 ] && continue
-
- /usr/bin/dialog --title "Confirmation" --clear --yesno \
-"\n"\
-"Do you want to continue without networking?\n"\
- 10 50
- [ $? -eq 0 ] && return 1
-
- host_ip=$VMNET_HOST_IP
- netmask=$VMNET_NETMASK
-
- return 0;
- done
-}
-
-networking=0
-if [ _$BATCH = _ ]; then
- do_network
-
- if [ $? -eq 0 ]; then
- networking=1
- if [ X$bridged = XYES ]; then
- /usr/bin/dialog --title "$title" --infobox \
-"\n"\
-"The following options will be used.\n\n"\
-"Configuration: bridged\n"\
-"Interface: $bdg_interface\n"\
- 10 50
- else
- /usr/bin/dialog --title "$title" --infobox \
-"\n"\
-"The following options will be used.\n\n"\
-"Configuration: host only\n"\
-"IP address: $host_ip\n"\
-"Netmask: $netmask\n"\
- 10 50
- fi
- fi
-else #BATCH
- [ -f ${WRKDIR}/Makefile.inc.net ] && exit 0
-fi #BATCH
-
-(
-exec > ${WRKDIR}/Makefile.inc.net
-
-echo '#' `date`
-echo VMNET_BRIDGED=$bridged
-echo VMNET_BRIDGED_INTERFACE=$bdg_interface
-echo VMNET_HOST_IP=$host_ip
-echo VMNET_NETMASK=$netmask
-echo VMNET_NETWORKING=$networking
-)
-
-exit 0
diff --git a/emulators/vmware3/scripts/pre-install b/emulators/vmware3/scripts/pre-install
deleted file mode 100644
index 3b6a1f8eb30c..000000000000
--- a/emulators/vmware3/scripts/pre-install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-echo Setup Linux compatible /dev directory
-linux_dev=${LINUXBASE}/dev
-if [ ! -d $linux_dev ]; then
- echo Creating $linux_dev
- mkdir $linux_dev
- chown root:wheel $linux_dev
- chmod 755 $linux_dev
-fi
-echo Creating $linux_dev/tty\?
-for n in 0 1 2 3 4 5 6 7 8 9; do
- ln -s /dev/ttyv$n $linux_dev/tty`expr 1 + $n`;
-done
-ln -s /dev/ttyva ${linux_dev}/tty11
-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
-# Do not enable below, because vmware-wizard is locked when
-# doing something like access("/dev/hdc"...)
-#mknod ${linux_dev}/hdc b 0 0x00010012
-#mknod ${linux_dev}/hdd b 0 0x0001001a
-echo Done