summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/Makefile6
-rw-r--r--emulators/vmware-module/DESCR3
-rw-r--r--emulators/vmware-module/MESSAGE23
-rw-r--r--emulators/vmware-module/Makefile82
-rw-r--r--emulators/vmware-module/PLIST19
-rw-r--r--emulators/vmware-module/distinfo10
-rw-r--r--emulators/vmware-module/patches/patch-ab41
-rw-r--r--emulators/vmware-module/patches/patch-ac205
-rw-r--r--emulators/vmware-module/patches/patch-ad45
-rw-r--r--emulators/vmware-module/patches/patch-ae209
-rw-r--r--emulators/vmware-module/patches/patch-af20
-rw-r--r--emulators/vmware-module3/DESCR3
-rw-r--r--emulators/vmware-module3/MESSAGE23
-rw-r--r--emulators/vmware-module3/Makefile78
-rw-r--r--emulators/vmware-module3/PLIST19
-rw-r--r--emulators/vmware-module3/distinfo6
-rw-r--r--emulators/vmware-module3/patches/patch-ab41
-rw-r--r--emulators/vmware/DESCR8
-rw-r--r--emulators/vmware/Makefile77
-rw-r--r--emulators/vmware/PLIST127
-rw-r--r--emulators/vmware/distinfo5
-rw-r--r--emulators/vmware3/DESCR8
-rw-r--r--emulators/vmware3/MESSAGE.NetBSD13
-rw-r--r--emulators/vmware3/Makefile108
-rw-r--r--emulators/vmware3/PLIST306
-rw-r--r--emulators/vmware3/distinfo9
-rw-r--r--emulators/vmware3/patches/patch-aa15
27 files changed, 1 insertions, 1508 deletions
diff --git a/emulators/Makefile b/emulators/Makefile
index 23f745c4a2e..6582c38e061 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2010/02/05 20:23:51 markd Exp $
+# $NetBSD: Makefile,v 1.181 2010/02/10 17:10:52 joerg Exp $
#
COMMENT= Emulators for other operating systems
@@ -173,10 +173,6 @@ SUBDIR+= uips
SUBDIR+= vba
SUBDIR+= vice
SUBDIR+= vmips
-SUBDIR+= vmware
-SUBDIR+= vmware-module
-SUBDIR+= vmware-module3
-SUBDIR+= vmware3
SUBDIR+= wine
SUBDIR+= wine-devel
SUBDIR+= x48
diff --git a/emulators/vmware-module/DESCR b/emulators/vmware-module/DESCR
deleted file mode 100644
index b2a96c122ea..00000000000
--- a/emulators/vmware-module/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package consists of set of kernel modules and scripts that will
-allow owners of the Linux version of VMware 2.x to run their binaries under
-NetBSD.
diff --git a/emulators/vmware-module/MESSAGE b/emulators/vmware-module/MESSAGE
deleted file mode 100644
index 9ec3c4155f5..00000000000
--- a/emulators/vmware-module/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
-
-To use ${PKGNAME}, you will need to copy the following files from
-${PREFIX}/etc/rc.d to /etc/rc.d:
-
- linuxrtc vmmon vmnet vmnetif
-
-and append the following content to /etc/rc.conf:
-
- vmware_prefix="${PREFIX}"
- vmmon=YES
- vmnet=YES
- linuxrtc=NO
- # XXX should cater for multiple interfaces
- vmnetif=YES
- vmnetifname=vmnet1
- vmnetdev=/dev/vmnet1
- vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
- vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
deleted file mode 100644
index 42dee772f8d..00000000000
--- a/emulators/vmware-module/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2008/03/03 19:21:38 jlam Exp $
-
-DISTNAME= vmware-netbsd-1.2
-PKGNAME= vmware-module-1.2
-CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.wasabisystems.com/
-COMMENT= Kernel modules for the VMware 2.x emulator
-
-CONFLICTS= vmware-module-3*
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}
-NO_CONFIGURE= yes
-
-NO_SRC_ON_FTP= already there
-
-# to override <bsd.own.mk>, MUST be set this way BEFORE bsd.prefs.mk
-BSDSRCDIR?= /nonexistent
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-extract:
-.if ${BSDSRCDIR} == "/nonexistent"
- @${ECHO_MSG} "Please set BSDSRCDIR in /etc/mk.conf, pointing it"
- @${ECHO_MSG} "to a directory that contains sources that match"
- @${ECHO_MSG} "your currently running system (esp. kernel), e.g."
- @${ECHO_MSG} "/usr/src."
- @${FALSE}
-.endif
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
- @${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
- @${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
- @${FALSE}
-.endif
-
-do-build:
-.for dir in linuxrtc vmmon vmnet
- cd ${WRKSRC}/source/${dir} && ${MAKE}
-.endfor
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKDIR}/rc.conf.d/linuxrtc \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmmon \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmnet \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKDIR}/rc.conf.d/vmnetif \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKDIR}/source/linuxrtc/linuxrtc.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_DATA} ${WRKDIR}/source/vmmon/vmmon.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_DATA} ${WRKDIR}/source/vmnet/if_hub.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/if_hub_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/linuxrtc_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKDIR}/share/lkm/vmmon_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- @cd ${WRKSRC}/rc.d && for f in linuxrtc vmmon vmnet vmnetif; do \
- ${SED} -e 's,@PREFIX@,${PREFIX},' < $$f > $$f.patched; \
- ${INSTALL_SCRIPT} $$f.patched ${DESTDIR}${PREFIX}/etc/rc.d/$$f; \
- done
- ${SED} -e 's,@VMWARE_PREFIX@,${PREFIX},' \
- < ${WRKSRC}/rc.conf.d/vmware > ${WRKSRC}/rc.conf.d/vmware.patched
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d/vmware
-
-.include "../../mk/bsd.pkg.mk"
-
-LDFLAGS= # empty since we use BSD-style makefiles
diff --git a/emulators/vmware-module/PLIST b/emulators/vmware-module/PLIST
deleted file mode 100644
index c8b9f48ff88..00000000000
--- a/emulators/vmware-module/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:54:52 joerg Exp $
-etc/rc.conf.d/linuxrtc
-etc/rc.conf.d/vmmon
-etc/rc.conf.d/vmnet
-etc/rc.conf.d/vmnetif
-etc/rc.conf.d/vmware
-etc/rc.d/linuxrtc
-etc/rc.d/vmmon
-etc/rc.d/vmnet
-etc/rc.d/vmnetif
-lkm/if_hub.o
-lkm/if_hub_post.sh
-lkm/linuxrtc.o
-lkm/linuxrtc_post.sh
-lkm/vmmon.o
-lkm/vmmon_post.sh
-@unexec ${RM} -f %D/lkm/if_hub. 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/linuxrtc 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/vmmon 2>/dev/null || ${TRUE}
diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo
deleted file mode 100644
index cf23e98d3e9..00000000000
--- a/emulators/vmware-module/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.8 2007/07/31 14:44:02 obache Exp $
-
-SHA1 (vmware-netbsd-1.2.tgz) = 383512f5a9f6cbc50ad5d25ea7e2ae921b00bb1a
-RMD160 (vmware-netbsd-1.2.tgz) = 857b17876611ca999747e38fce234a85ed9802a9
-Size (vmware-netbsd-1.2.tgz) = 97596 bytes
-SHA1 (patch-ab) = 19ff0b151b62870835a2b87e69a52b1cb3d95045
-SHA1 (patch-ac) = a576f04959e793cffbcbaddc409f69ad6929c541
-SHA1 (patch-ad) = 68d7ab77e51f73074f2ef4661af928bfafc7b72d
-SHA1 (patch-ae) = 928deb0c7530905ffe5a04045ef27699fc68d43f
-SHA1 (patch-af) = 2ac5dfaecf97152ca8735c2ec40db881b49d2d76
diff --git a/emulators/vmware-module/patches/patch-ab b/emulators/vmware-module/patches/patch-ab
deleted file mode 100644
index 94fc9949224..00000000000
--- a/emulators/vmware-module/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/16 02:35:56 bad Exp $
-
---- rc.d/linuxrtc Wed Apr 4 04:43:17 2001
-+++ rc.d/linuxrtc Sun Jun 10 13:55:56 2001
-@@ -13,8 +17,8 @@
-
- load_rc_config $name
-
--linuxrtc_lkm="$vmware_prefix/share/vmware/lkm/linuxrtc.o"
--linuxrtc_post_script="$vmware_prefix/share/vmware/lkm/linuxrtc_post.sh"
-+linuxrtc_lkm="@PREFIX@/lkm/linuxrtc.o"
-+linuxrtc_post_script="@PREFIX@/lkm/linuxrtc_post.sh"
-
- linuxrtc_prestart()
- {
---- rc.d/vmmon Wed Apr 4 04:42:40 2001
-+++ rc.d/vmmon Sun Jun 10 13:56:04 2001
-@@ -13,8 +13,8 @@
-
- load_rc_config $name
-
--vmmon_lkm="$vmware_prefix/share/vmware/lkm/vmmon.o"
--vmmon_post_script="$vmware_prefix/share/vmware/lkm/vmmon_post.sh"
-+vmmon_lkm="@PREFIX@/lkm/vmmon.o"
-+vmmon_post_script="@PREFIX@/lkm/vmmon_post.sh"
-
- vmmon_prestart()
- {
---- rc.d/vmnet Wed Apr 4 04:42:40 2001
-+++ rc.d/vmnet Sun Jun 10 13:56:12 2001
-@@ -13,8 +13,8 @@
-
- load_rc_config $name
-
--vmnet_lkm="$vmware_prefix/share/vmware/lkm/if_hub.o"
--vmnet_post_script="$vmware_prefix/share/vmware/lkm/if_hub_post.sh"
-+vmnet_lkm="@PREFIX@/lkm/if_hub.o"
-+vmnet_post_script="@PREFIX@/lkm/if_hub_post.sh"
-
- vmnet_prestart()
- {
diff --git a/emulators/vmware-module/patches/patch-ac b/emulators/vmware-module/patches/patch-ac
deleted file mode 100644
index 0c3d810cdbc..00000000000
--- a/emulators/vmware-module/patches/patch-ac
+++ /dev/null
@@ -1,205 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/07/31 14:44:03 obache Exp $
-
---- source/vmmon/netbsd/drv.c.orig 2003-02-16 21:28:36.000000000 +0900
-+++ source/vmmon/netbsd/drv.c
-@@ -68,6 +68,29 @@
- #include <vm/vm.h>
- #endif
-
-+/* use curproc for pre-nathanw-sa world, curlwp post */
-+#if __NetBSD_Version__ >= 106130000
-+#define CURLWP curlwp /* new world order */
-+#else
-+#define CURLWP curproc /* old world order */
-+#endif
-+
-+/* change to pass lwp rather than proc to driver entry points in 1.6V */
-+#if __NetBSD_Version__ == 106220000 || __NetBSD_Version__ >= 399001400
-+#define ENTRYARG lwp
-+#define LWP2PROC(l) (l->l_proc)
-+#else
-+#define ENTRYARG proc
-+#define LWP2PROC(l) (l)
-+#endif
-+
-+/* dupfd moved from struct proc to struct lwp in 1.6ZA */
-+#if __NetBSD_Version__ >= 106270000
-+#define DUPFD(p) (curlwp)->l_dupfd
-+#else
-+#define DUPFD(p) (p)->p_dupfd
-+#endif
-+
- #define FILECODE "F(300)"
-
- #include "x86.h"
-@@ -95,13 +118,13 @@
- int vmmon_lkmentry(struct lkm_table *, int, int);
- static int vmmon_handle(struct lkm_table *, int);
-
--static int vmmon_open(dev_t dev, int oflags, int devtype, struct proc *p);
--static int vmmon_close(dev_t dev, int cflags, int devtype, struct proc *p);
-+static int vmmon_open(dev_t dev, int oflags, int devtype, struct ENTRYARG *l);
-+static int vmmon_close(dev_t dev, int cflags, int devtype, struct ENTRYARG *l);
- static int vmmon_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
-- struct proc *p);
--static int vmmon_poll(dev_t, int, struct proc *);
-+ struct ENTRYARG *l);
-+static int vmmon_poll(dev_t, int, struct ENTRYARG *);
-
--static int vmmon_fake_clonedev(dev_t, int, struct proc *);
-+static int vmmon_fake_clonedev(dev_t, int, struct ENTRYARG *);
-
- static int vm_create(struct vmmon_softc *, struct vmx86_softc **);
- static struct vmx86_softc * vm_allocate(struct vmmon_softc *);
-@@ -163,19 +186,19 @@ vmmon_handle(struct lkm_table *lkmtp, in
- }
-
- static int
--vmmon_open(dev_t dev, int flag, int mode, struct proc *p)
-+vmmon_open(dev_t dev, int flag, int mode, struct ENTRYARG *l)
- {
- struct vmmon_softc *vmmonsc;
- struct vmx86_softc *vmxsc;
- int error;
- VMDriver *vm;
-
-- if (p->p_dupfd >= 0)
-+ if (DUPFD(LWP2PROC(l)) >= 0)
- return ENODEV;
-
-- VMDEBUG("vmmon: %d opened device\n", p->p_pid);
-+ VMDEBUG("vmmon: %d opened device\n", LWP2PROC(l)->p_pid);
-
-- if (suser(p->p_ucred, &p->p_acflag) != 0)
-+ if (suser(LWP2PROC(l)->p_ucred, &LWP2PROC(l)->p_acflag) != 0)
- return (EPERM);
-
- vmmonsc = &vmmon_sc;
-@@ -189,15 +212,15 @@ vmmon_open(dev_t dev, int flag, int mode
- vmmon_refcnt++;
-
- VMDEBUG("vmmon: pid %d new vm: num %d major %d\n",
-- p->p_pid, VMNUM(vmxsc->vm_dev), major(vmxsc->vm_dev));
-+ LWP2PROC(l)->p_pid, VMNUM(vmxsc->vm_dev), major(vmxsc->vm_dev));
-
-- error = vmmon_fake_clonedev(vmxsc->vm_dev, flag, p);
-- if (error != 0 && p->p_dupfd < 0) {
-+ error = vmmon_fake_clonedev(vmxsc->vm_dev, flag, l);
-+ if (error != 0 && DUPFD(LWP2PROC(l)) < 0) {
- vm_destroy(vmmonsc, VMNUM(vmxsc->vm_dev));
- return error;
- }
-
-- vm = Vmx86_Init((void *)vmxsc, (void *)(p->p_pid));
-+ vm = Vmx86_Init((void *)vmxsc, (void *)(LWP2PROC(l)->p_pid));
- if (vm == NULL) {
- vm_destroy(vmmonsc, VMNUM(vmxsc->vm_dev));
- error = ENOMEM;
-@@ -211,13 +234,13 @@ vmmon_open(dev_t dev, int flag, int mode
-
-
- static int
--vmmon_close(dev_t dev, int flags, int mode, struct proc *p)
-+vmmon_close(dev_t dev, int flags, int mode, struct ENTRYARG *l)
- {
- int num;
- struct vmmon_softc *sc;
- struct vmx86_softc *vmxsc;
-
-- VMDEBUG("vmmon: close vm %d by pid %d\n", VMNUM(dev), p->p_pid);
-+ VMDEBUG("vmmon: close vm %d by pid %d\n", VMNUM(dev), LWP2PROC(l)->p_pid);
-
- sc = &vmmon_sc;
-
-@@ -240,7 +263,7 @@ vmmon_close(dev_t dev, int flags, int mo
- printf("vmmon: refcnt < 0 ??\n");
- }
-
-- VMDEBUG("vmmon: vm %d closed by %d\n", num, p->p_pid);
-+ VMDEBUG("vmmon: vm %d closed by %d\n", num, LWP2PROC(l)->p_pid);
-
- return (0);
- }
-@@ -250,7 +273,7 @@ vmmon_close(dev_t dev, int flags, int mo
- * XXXX - poor man's device cloning.
- */
- int
--vmmon_fake_clonedev(dev_t dev, int flag, struct proc *p)
-+vmmon_fake_clonedev(dev_t dev, int flag, struct ENTRYARG *l)
- {
- struct file *fp;
- int error, fd;
-@@ -260,7 +283,7 @@ vmmon_fake_clonedev(dev_t dev, int flag,
- /* XXX */
- return EINVAL;
-
-- error = falloc(p, &fp, &fd);
-+ error = falloc(LWP2PROC(l), &fp, &fd);
- if (error != 0)
- return error;
- error = cdevvp(dev, &vp);
-@@ -279,9 +302,9 @@ vmmon_fake_clonedev(dev_t dev, int flag,
- FILE_SET_MATURE(fp);
- #endif
- #endif
-- FILE_UNUSE(fp, p);
-+ FILE_UNUSE(fp, l);
-
-- p->p_dupfd = fd;
-+ DUPFD(LWP2PROC(l)) = fd;
-
- return ENXIO;
- }
-@@ -292,7 +315,7 @@ vmmon_fake_clonedev(dev_t dev, int flag,
- * set syscall return values for the benefit of Linux emulation.
- */
- static int
--vmmon_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
-+vmmon_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct ENTRYARG *l)
- {
- struct vmx86_softc *vmxsc;
- struct vmmon_softc *sc;
-@@ -307,7 +330,7 @@ vmmon_ioctl(dev_t dev, u_long cmd, caddr
- VMDriver *vm;
-
- VMDEBUG("vmmon: ioctl %lx on vm %d by pid %d\n",
-- cmd, VMNUM(dev), p->p_pid);
-+ cmd, VMNUM(dev), LWP2PROC(l)->p_pid);
-
- sc = &vmmon_sc;
-
-@@ -469,7 +492,7 @@ vm_select_timo(void *arg)
-
-
- static int
--vmmon_poll(dev_t dev, int events, struct proc *p)
-+vmmon_poll(dev_t dev, int events, struct ENTRYARG *l)
- {
- struct vmmon_softc *sc;
- struct vmx86_softc *vmxsc;
-@@ -484,7 +507,7 @@ vmmon_poll(dev_t dev, int events, struct
- return ENXIO;
-
- VMDEBUG("vmmon: poll on vm %d by pid %d\n",
-- VMNUM(dev), p->p_pid);
-+ VMNUM(dev), LWP2PROC(l)->p_pid);
-
- s = splsoftclock();
- if (vmxsc->vm_flags & VMFL_SELTIMO) {
-@@ -493,7 +516,7 @@ vmmon_poll(dev_t dev, int events, struct
- } else {
- if (vmxsc->vm_flags & VMFL_SELWAIT)
- callout_stop(&vmxsc->vm_callout);
-- selrecord(p, &vmxsc->vm_rsel);
-+ selrecord(l, &vmxsc->vm_rsel);
- vmxsc->vm_flags |= VMFL_SELWAIT;
- callout_reset(&vmxsc->vm_callout, 1, vm_select_timo, vmxsc);
- }
-@@ -673,6 +696,6 @@ Panic(char *fmt, ...)
- vWarning(vm);
- }
-
-- exit1(curproc, 0);
-+ exit1(CURLWP, 0);
- /* NOTREACHED */
- }
diff --git a/emulators/vmware-module/patches/patch-ad b/emulators/vmware-module/patches/patch-ad
deleted file mode 100644
index b138367716c..00000000000
--- a/emulators/vmware-module/patches/patch-ad
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/07/31 14:44:03 obache Exp $
-
---- source/vmmon/netbsd/host.c.orig 2003-02-16 21:28:36.000000000 +0900
-+++ source/vmmon/netbsd/host.c
-@@ -60,6 +60,13 @@ lyaev Exp $
- extern vm_map_t kernel_map;
- #endif
-
-+/* use curproc for pre-nathanw-sa world, curlwp post */
-+#if __NetBSD_Version__ >= 106130000
-+#define CURLWP curlwp /* new world order */
-+#else
-+#define CURLWP curproc /* old world order */
-+#endif
-+
- #include "x86.h"
- #include "vm_types.h"
- #include "vm_assert.h"
-@@ -272,7 +279,7 @@ HostIF_InitFP(VMDriver *vm)
-
- if (!(val & mask)) {
- val = val | mask;
-- outb(val,0xA1);
-+ outb(0xA1,val);
- }
- #endif
- }
-@@ -635,7 +642,7 @@ HostIF_UserToDriverPtr(VMDriver *vm, voi
- if (vm->crossvaddr != NULL)
- Warning("KernelAddr already allocated\n");
-
-- PHOLD(curproc);
-+ PHOLD(CURLWP);
- uvm_vslock(curproc, addr, PAGE_SIZE,
- VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-@@ -644,7 +651,7 @@ HostIF_UserToDriverPtr(VMDriver *vm, voi
- pmap_extract(vm_map_pmap(&curproc->p_vmspace->vm_map), uaddr, &paddr);
- pmap_kenter_pa(kvaddr, paddr,
- VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE);
-- PRELE(curproc);
-+ PRELE(CURLWP);
- vm->crossvaddr = (void *)kvaddr;
- vm->crossuaddr = addr;
- #ifdef DEBUG
diff --git a/emulators/vmware-module/patches/patch-ae b/emulators/vmware-module/patches/patch-ae
deleted file mode 100644
index 33cfb9ef686..00000000000
--- a/emulators/vmware-module/patches/patch-ae
+++ /dev/null
@@ -1,209 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2007/07/31 14:44:04 obache Exp $
-
---- source/vmnet/if_hubmod.c.orig 2003-02-16 11:09:13.000000000 +0900
-+++ source/vmnet/if_hubmod.c
-@@ -87,17 +87,40 @@ static int ether_ioctl(struct ifnet *, u
- #include <vm/vm.h>
- #endif
-
-+/* use curproc for pre-nathanw-sa world, curlwp post */
-+#if __NetBSD_Version__ >= 106130000
-+#define CURLWP curlwp /* new world order */
-+#else
-+#define CURLWP curproc /* old world order */
-+#endif
-+
-+/* change to pass lwp rather than proc to driver entry points in 1.6V */
-+#if __NetBSD_Version__ == 106220000 || __NetBSD_Version__ >= 399001400
-+#define ENTRYARG lwp
-+#define LWP2PROC(l) (l->l_proc)
-+#else
-+#define ENTRYARG proc
-+#define LWP2PROC(l) (l)
-+#endif
-+
-+/* dupfd moved from struct proc to struct lwp in 1.6ZA */
-+#if __NetBSD_Version__ >= 106270000
-+#define DUPFD(p) (curlwp)->l_dupfd
-+#else
-+#define DUPFD(p) (p)->p_dupfd
-+#endif
-+
- #define HUBDEBUG if (hub_debug) printf
-
- int if_hub_lkmentry(struct lkm_table *, int, int);
-
--static int hub_open(dev_t dev, int oflags, int devtype, struct proc *p);
--static int hub_close(dev_t dev, int cflags, int devtype, struct proc *p);
-+static int hub_open(dev_t dev, int oflags, int devtype, struct ENTRYARG *l);
-+static int hub_close(dev_t dev, int cflags, int devtype, struct ENTRYARG *l);
- static int hub_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
-- struct proc *p);
-+ struct ENTRYARG *p);
- static int hub_read(dev_t, struct uio *, int);
- static int hub_write(dev_t, struct uio *, int);
--static int hub_poll(dev_t, int, struct proc *);
-+static int hub_poll(dev_t, int, struct ENTRYARG *);
-
- static int hub_ifinit(struct ifnet *);
- static int hub_handle(struct lkm_table *, int);
-@@ -112,7 +135,7 @@ static struct hubport_softc *port_alloca
- static void port_deallocate(struct hubport_softc *);
-
- static int hub_sendchain(struct hubport_softc *, struct mbuf *);
--static int hub_fake_clonedev(dev_t, int, struct proc *);
-+static int hub_fake_clonedev(dev_t, int, struct ENTRYARG *);
-
-
-
-@@ -356,24 +379,24 @@ port_pktmatch(struct hubport_softc *port
-
-
- static int
--hub_open(dev_t dev, int flag, int mode, struct proc *p)
-+hub_open(dev_t dev, int flag, int mode, struct ENTRYARG *l)
- {
- struct hubdev_softc *hubsc;
- struct hubport_softc *portsc;
- int error, unit;
-
-- if (p->p_dupfd >= 0)
-+ if (DUPFD(LWP2PROC(l)) >= 0)
- return ENODEV;
-
- unit = HUBUNIT(dev);
-
-- HUBDEBUG("if_hub: %d opened minor %d hub %d\n", p->p_pid, minor(dev),
-+ HUBDEBUG("if_hub: %d opened minor %d hub %d\n", LWP2PROC(l)->p_pid, minor(dev),
- unit);
-
- if (unit >= MAXHUBDEVS)
- return (ENXIO);
-
-- if (suser(p->p_ucred, &p->p_acflag) != 0)
-+ if (suser(LWP2PROC(l)->p_ucred, &LWP2PROC(l)->p_acflag) != 0)
- return (EPERM);
-
- hubsc = hub_scs[unit];
-@@ -393,11 +416,11 @@ hub_open(dev_t dev, int flag, int mode,
- hub_refcnt++;
-
- HUBDEBUG("if_hub: pid %d new port: unit %d, port %d\n",
-- p->p_pid, HUBUNIT(portsc->port_dev),
-+ LWP2PROC(l)->p_pid, HUBUNIT(portsc->port_dev),
- HUBPORT(portsc->port_dev));
-
-- error = hub_fake_clonedev(portsc->port_dev, flag, p);
-- if (error != 0 && p->p_dupfd < 0)
-+ error = hub_fake_clonedev(portsc->port_dev, flag, l);
-+ if (error != 0 && DUPFD(LWP2PROC(l)) < 0)
- port_destroy(hubsc, HUBPORT(portsc->port_dev));
-
- return error;
-@@ -410,7 +433,7 @@ hub_open(dev_t dev, int flag, int mode,
- * close the device - mark i/f down & delete routing info
- */
- static int
--hub_close(dev_t dev, int flags, int mode, struct proc *p)
-+hub_close(dev_t dev, int flags, int mode, struct ENTRYARG *l)
- {
- int s, unit, port;
- struct hubdev_softc *hubsc;
-@@ -418,7 +441,7 @@ hub_close(dev_t dev, int flags, int mode
- struct mbuf *m;
-
- HUBDEBUG("if_hub: close hub %d unit %d by pid %d\n",
-- HUBUNIT(dev), HUBPORT(dev), p->p_pid);
-+ HUBUNIT(dev), HUBPORT(dev), LWP2PROC(l)->p_pid);
- /*
- * The 2 cases below shouldn't ever happen.
- */
-@@ -452,7 +475,7 @@ hub_close(dev_t dev, int flags, int mode
- printf("if_hub: refcnt < 0 ??\n");
- }
-
-- HUBDEBUG("if_hub: hub %d port %d closed by %d\n", unit, port, p->p_pid);
-+ HUBDEBUG("if_hub: hub %d port %d closed by %d\n", unit, port, LWP2PROC(l)->p_pid);
-
- return (0);
- }
-@@ -485,7 +508,7 @@ hub_ifioctl(struct ifnet *ifp, u_long cm
- * XXXX - poor man's device cloning.
- */
- int
--hub_fake_clonedev(dev_t dev, int flag, struct proc *p)
-+hub_fake_clonedev(dev_t dev, int flag, struct ENTRYARG *l)
- {
- struct file *fp;
- int error, fd;
-@@ -495,7 +518,7 @@ hub_fake_clonedev(dev_t dev, int flag, s
- /* XXX */
- return EINVAL;
-
-- error = falloc(p, &fp, &fd);
-+ error = falloc(LWP2PROC(l), &fp, &fd);
- if (error != 0)
- return error;
- error = cdevvp(dev, &vp);
-@@ -514,11 +537,15 @@ hub_fake_clonedev(dev_t dev, int flag, s
- FILE_SET_MATURE(fp);
- #endif
- #endif
-- FILE_UNUSE(fp, p);
-+ FILE_UNUSE(fp, l);
-
-- p->p_dupfd = fd;
-+ DUPFD(LWP2PROC(l)) = fd;
-
-+#ifdef EMOVEFD
-+ return EMOVEFD;
-+#else
- return ENXIO;
-+#endif
- }
-
- /*
-@@ -653,7 +680,7 @@ hub_ifstart(struct ifnet *ifp)
-
-
- static int
--hub_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
-+hub_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct ENTRYARG *l)
- {
- struct hubport_softc *portsc, *newport;
- struct hubdev_softc *hubsc;
-@@ -669,7 +696,7 @@ hub_ioctl(dev_t dev, u_long cmd, caddr_t
- u_long val;
-
- HUBDEBUG("if_hub: ioctl %lx on hub %d port %d by pid %d\n",
-- cmd, HUBUNIT(dev), HUBPORT(dev), p->p_pid);
-+ cmd, HUBUNIT(dev), HUBPORT(dev), LWP2PROC(l)->p_pid);
-
- hubsc = hub_scs[HUBUNIT(dev)];
- if (hubsc == NULL)
-@@ -984,7 +1011,7 @@ hub_write(dev_t dev, struct uio *uio, in
- * anyway, it either accepts the packet or drops it
- */
- static int
--hub_poll(dev_t dev, int events, struct proc *p)
-+hub_poll(dev_t dev, int events, struct ENTRYARG *l)
- {
- struct hubdev_softc *hubsc;
- struct hubport_softc *portsc;
-@@ -998,14 +1025,14 @@ hub_poll(dev_t dev, int events, struct p
- return ENXIO;
-
- HUBDEBUG("if_hub: poll on hub %d port %d by pid %d\n",
-- HUBUNIT(dev), HUBPORT(dev), p->p_pid);
-+ HUBUNIT(dev), HUBPORT(dev), LWP2PROC(l)->p_pid);
-
- s = splnet();
- if (events & (POLLIN | POLLRDNORM)) {
- if (portsc->port_rcvq.ifq_len > 0)
- revents |= (events & (POLLIN | POLLRDNORM));
- else
-- selrecord(p, &portsc->port_rsel);
-+ selrecord(l, &portsc->port_rsel);
- }
-
- if (events & (POLLOUT | POLLWRNORM))
diff --git a/emulators/vmware-module/patches/patch-af b/emulators/vmware-module/patches/patch-af
deleted file mode 100644
index 0ccf96d78c7..00000000000
--- a/emulators/vmware-module/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/07/31 14:44:04 obache Exp $
-
---- source/vmmon/include/x86.h.orig 2003-02-16 19:09:57.000000000 +0900
-+++ source/vmmon/include/x86.h
-@@ -180,9 +180,15 @@
- #define MSR_TSC 0x00000010
- #endif /* MSR_TSC */
- #define MSR_MTRR_CAP 0x000000fe
-+#ifndef MSR_SYSENTER_CS
- #define MSR_SYSENTER_CS 0x00000174
-+#endif
-+#ifndef MSR_SYSENTER_ESP
- #define MSR_SYSENTER_ESP 0x00000175
-+#endif
-+#ifndef MSR_SYSENTER_EIP
- #define MSR_SYSENTER_EIP 0x00000176
-+#endif
-
-
- typedef uint32 CReg;
diff --git a/emulators/vmware-module3/DESCR b/emulators/vmware-module3/DESCR
deleted file mode 100644
index e60c0da5d4d..00000000000
--- a/emulators/vmware-module3/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This package consists of set of kernel modules and scripts that will
-allow owners of the Linux version of VMware 3.x to run their binaries under
-NetBSD.
diff --git a/emulators/vmware-module3/MESSAGE b/emulators/vmware-module3/MESSAGE
deleted file mode 100644
index 9ec3c4155f5..00000000000
--- a/emulators/vmware-module3/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
-
-To use ${PKGNAME}, you will need to copy the following files from
-${PREFIX}/etc/rc.d to /etc/rc.d:
-
- linuxrtc vmmon vmnet vmnetif
-
-and append the following content to /etc/rc.conf:
-
- vmware_prefix="${PREFIX}"
- vmmon=YES
- vmnet=YES
- linuxrtc=NO
- # XXX should cater for multiple interfaces
- vmnetif=YES
- vmnetifname=vmnet1
- vmnetdev=/dev/vmnet1
- vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
- vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
deleted file mode 100644
index b274f7c1b11..00000000000
--- a/emulators/vmware-module3/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2008/03/03 19:21:38 jlam Exp $
-
-DISTNAME= vmware-netbsd-3.2.1.8
-PKGNAME= vmware-module-3.2.1.8
-CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vmware/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jdolecek@NetBSD.org
-HOMEPAGE= http://www.wasabisystems.com/
-COMMENT= Kernel modules for the VMware 3.2.1 PC emulator
-
-CONFLICTS= vmware-module-1.*
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-NO_CONFIGURE= yes
-
-NO_SRC_ON_FTP= already there
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS= etc/rc.conf.d etc/rc.d lkm
-
-pre-extract:
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
- @${ECHO_MSG} "Please set BSDSRCDIR in /etc/mk.conf, pointing it"
- @${ECHO_MSG} "to a directory that contains sources that match"
- @${ECHO_MSG} "your currently running system (esp. kernel), e.g."
- @${ECHO_MSG} "/usr/src."
- @${FALSE}
-.endif
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
- @${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
- @${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
- @${FALSE}
-.endif
-
-do-build:
-.for dir in linuxrtc vmmon vmnet
- cd ${WRKSRC}/source/${dir} && ${MAKE}
-.endfor
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/linuxrtc \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmmon \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmnet \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmnetif \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d
- ${INSTALL_DATA} ${WRKSRC}/source/linuxrtc/linuxrtc.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_DATA} ${WRKSRC}/source/vmmon/vmmon.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_DATA} ${WRKSRC}/source/vmnet/vmnet.o \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/vmnet_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/linuxrtc_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- ${INSTALL_SCRIPT} ${WRKSRC}/share/lkm/vmmon_post.sh \
- ${DESTDIR}${PREFIX}/lkm
- @cd ${WRKSRC}/rc.d && for f in linuxrtc vmmon vmnet vmnetif; do \
- ${SED} -e 's,@PREFIX@,${PREFIX},' < $$f > $$f.patched; \
- ${INSTALL_SCRIPT} $$f.patched ${DESTDIR}${PREFIX}/etc/rc.d/$$f; \
- done
- ${SED} -e 's,@VMWARE_PREFIX@,${PREFIX},' \
- < ${WRKSRC}/rc.conf.d/vmware > ${WRKSRC}/rc.conf.d/vmware.patched
- ${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
- ${DESTDIR}${PREFIX}/etc/rc.conf.d/vmware
-
-.include "../../mk/bsd.pkg.mk"
-
-LDFLAGS= # empty since we use BSD-style makefiles
diff --git a/emulators/vmware-module3/PLIST b/emulators/vmware-module3/PLIST
deleted file mode 100644
index d968c051092..00000000000
--- a/emulators/vmware-module3/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:54:53 joerg Exp $
-etc/rc.conf.d/linuxrtc
-etc/rc.conf.d/vmmon
-etc/rc.conf.d/vmnet
-etc/rc.conf.d/vmnetif
-etc/rc.conf.d/vmware
-etc/rc.d/linuxrtc
-etc/rc.d/vmmon
-etc/rc.d/vmnet
-etc/rc.d/vmnetif
-lkm/vmnet.o
-lkm/vmnet_post.sh
-lkm/linuxrtc.o
-lkm/linuxrtc_post.sh
-lkm/vmmon.o
-lkm/vmmon_post.sh
-@unexec ${RM} -f %D/lkm/vmnet 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/linuxrtc 2>/dev/null || ${TRUE}
-@unexec ${RM} -f %D/lkm/vmmon 2>/dev/null || ${TRUE}
diff --git a/emulators/vmware-module3/distinfo b/emulators/vmware-module3/distinfo
deleted file mode 100644
index 041d6ac770c..00000000000
--- a/emulators/vmware-module3/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2006/03/26 21:34:51 veego Exp $
-
-SHA1 (vmware-netbsd-3.2.1.8.tar.bz2) = 48fc126458f3da61ec68f45655e62e87fe0821cb
-RMD160 (vmware-netbsd-3.2.1.8.tar.bz2) = baa97e70efea5de83eb9f40f31024c8db474480b
-Size (vmware-netbsd-3.2.1.8.tar.bz2) = 81787 bytes
-SHA1 (patch-ab) = 412a3fa0a49aebe5f52cb46015fb9b981625f4ac
diff --git a/emulators/vmware-module3/patches/patch-ab b/emulators/vmware-module3/patches/patch-ab
deleted file mode 100644
index 2c95affacf0..00000000000
--- a/emulators/vmware-module3/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/02/16 19:43:36 bad Exp $
-
---- rc.d/linuxrtc Wed Apr 4 04:43:17 2001
-+++ rc.d/linuxrtc Sun Jun 10 13:55:56 2001
-@@ -13,8 +17,8 @@
-
- load_rc_config $name
-
--linuxrtc_lkm="$vmware_prefix/share/vmware/lkm/linuxrtc.o"
--linuxrtc_post_script="$vmware_prefix/share/vmware/lkm/linuxrtc_post.sh"
-+linuxrtc_lkm="@PREFIX@/lkm/linuxrtc.o"
-+linuxrtc_post_script="@PREFIX@/lkm/linuxrtc_post.sh"
-
- linuxrtc_prestart()
- {
---- rc.d/vmmon Wed Apr 4 04:42:40 2001
-+++ rc.d/vmmon Sun Jun 10 13:56:04 2001
-@@ -13,8 +13,8 @@
-
- load_rc_config $name
-
--vmmon_lkm="$vmware_prefix/share/vmware/lkm/vmmon.o"
--vmmon_post_script="$vmware_prefix/share/vmware/lkm/vmmon_post.sh"
-+vmmon_lkm="@PREFIX@/lkm/vmmon.o"
-+vmmon_post_script="@PREFIX@/lkm/vmmon_post.sh"
-
- vmmon_prestart()
- {
---- rc.d/vmnet Wed Apr 4 04:42:40 2001
-+++ rc.d/vmnet Sun Jun 10 13:56:12 2001
-@@ -13,8 +13,8 @@
-
- load_rc_config $name
-
--vmnet_lkm="$vmware_prefix/share/vmware/lkm/vmnet.o"
--vmnet_post_script="$vmware_prefix/share/vmware/lkm/vmnet_post.sh"
-+vmnet_lkm="@PREFIX@/lkm/vmnet.o"
-+vmnet_post_script="@PREFIX@/lkm/vmnet_post.sh"
-
- vmnet_prestart()
- {
diff --git a/emulators/vmware/DESCR b/emulators/vmware/DESCR
deleted file mode 100644
index 8d7c2de0ac2..00000000000
--- a/emulators/vmware/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Run Windows 95, Windows 98, Windows NT, Windows 2000, FreeBSD, NetBSD,
-or Linux under VMware Workstation 2.x.
-
-Each VMware world is the equivalent of a full PC in a window.
-
-Operating systems run simultaneously without dual booting.
-
-Add new operating systems without repartitioning disks.
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
deleted file mode 100644
index 2387b285cac..00000000000
--- a/emulators/vmware/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2009/05/21 10:44:57 zafer Exp $
-
-DISTNAME= VMware-2.0.4-1142
-PKGNAME= vmware-2.0.4
-PKGREVISION= 1
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_BACKUP}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.vmware.com/
-COMMENT= VMware 2.x emulator
-LICENSE= vmware-license
-
-DEPENDS+= vmware-module-1.*:../../emulators/vmware-module
-
-EMUL_PLATFORMS= linux-i386
-EMUL_MODULES.linux= vmware
-
-PKG_DESTDIR_SUPPORT= destdir
-
-WRKSRC= ${WRKDIR}/vmware-distrib
-
-# We could install it into /etc/vmware, but that would mean we install
-# it somewhere out of ${PREFIX}, which is not a good idea, and the linux
-# emulation has a fallbackmode to look into ${PREFIX}/emul/linux/etc,
-# so use this way.
-VMWARE_CFG_DIR= ${PREFIX}/emul/linux/etc/vmware
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- ${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
-
-do-install: do-install-dirs do-install-binaries do-install-docs \
- do-install-share
-
-do-install-dirs:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware
- for dirs in configurator doc floppies help smb xkeymap; do \
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/$$dirs; \
- done
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/smb/codepages
- ${INSTALL_DATA_DIR} ${DESTDIR}${VMWARE_CFG_DIR}
-
-do-install-binaries:
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
- ${CHMOD} u+s ${DESTDIR}${PREFIX}/bin/vmware
-
-do-install-docs:
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/vmware/doc
-
-do-install-share:
- ${INSTALL_DATA} ${WRKSRC}/lib/help/* ${DESTDIR}${PREFIX}/share/vmware/help
- ${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${DESTDIR}${PREFIX}/share/vmware/xkeymap
- ${INSTALL_DATA} ${WRKSRC}/lib/floppies/* ${DESTDIR}${PREFIX}/share/vmware/floppies
- ${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${DESTDIR}${PREFIX}/share/vmware/smb/codepages
- ${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${DESTDIR}${PREFIX}/share/vmware/configurator
- ${INSTALL_DATA} ${WRKSRC}/lib/config ${DESTDIR}${PREFIX}/share/vmware
- ${INSTALL_DATA} ${WRKSRC}/lib/floppy.nvr ${DESTDIR}${PREFIX}/share/vmware
- ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-post-install:
- @${RM} -f ${DESTDIR}${VMWARE_CFG_DIR}/config
- @( \
- ${ECHO} "vmware.fullpath = \"${PREFIX}/bin/vmware\""; \
- ${ECHO} "wizard.fullpath = \"${PREFIX}/bin/vmware-wizard\""; \
- ${ECHO} "dhcpd.fullpath = \"${PREFIX}/bin/vmware-dhcpd\""; \
- ${ECHO} "loop.fullpath = \"${PREFIX}/bin/vmware-loop\""; \
- ${ECHO} "smbpasswd.fullpath = \"${PREFIX}/bin/vmware-smbpasswd\""; \
- ${ECHO} "libdir = \"${PREFIX}/share/vmware\""; \
- ${ECHO} "vmnet1.HostOnlyAddress = \"172.16.212.1\""; \
- ${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\""; \
- ) > ${DESTDIR}${VMWARE_CFG_DIR}/config
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware/PLIST b/emulators/vmware/PLIST
deleted file mode 100644
index ec4fbeaeee8..00000000000
--- a/emulators/vmware/PLIST
+++ /dev/null
@@ -1,127 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:09 joerg Exp $
-bin/vmnet-bridge
-bin/vmnet-dhcpd
-bin/vmnet-netifup
-bin/vmnet-sniffer
-bin/vmware
-bin/vmware-config.pl
-bin/vmware-loop
-bin/vmware-mount.pl
-bin/vmware-nmbd
-bin/vmware-ping
-bin/vmware-smbd
-bin/vmware-smbpasswd
-bin/vmware-smbpasswd.bin
-bin/vmware-uninstall.pl
-bin/vmware-wizard
-emul/linux/etc/vmware/config
-man/man1/vmware.1
-share/vmware/config
-share/vmware/configurator/vmnet-dhcpd.conf
-share/vmware/configurator/vmnet-smb.conf
-share/vmware/doc/CHANGES
-share/vmware/doc/DHCP-COPYRIGHT
-share/vmware/doc/EULA
-share/vmware/doc/INSTALL
-share/vmware/doc/README
-share/vmware/doc/SAMBA-LICENSE
-share/vmware/floppies/linux.flp
-share/vmware/floppies/windows.flp
-share/vmware/floppy.nvr
-share/vmware/help/AutoFit.htm
-share/vmware/help/ConfigDiskPartition.htm
-share/vmware/help/ConfigDisks.htm
-share/vmware/help/ConfigEditor.htm
-share/vmware/help/ConfigEthernet.htm
-share/vmware/help/ConfigFloppy.htm
-share/vmware/help/ConfigGuestOS.htm
-share/vmware/help/ConfigMemory.htm
-share/vmware/help/ConfigMisc.htm
-share/vmware/help/ConfigParallel.htm
-share/vmware/help/ConfigScsiDisks.htm
-share/vmware/help/ConfigSerial.htm
-share/vmware/help/ConfigSound.htm
-share/vmware/help/ConfigWiz.htm
-share/vmware/help/Configuration.htm
-share/vmware/help/Fit.htm
-share/vmware/help/FullScreen.gif
-share/vmware/help/Fullscreen.htm
-share/vmware/help/GeneralInput.htm
-share/vmware/help/GeneralMemory.htm
-share/vmware/help/GeneralPreferences.htm
-share/vmware/help/Glossary.htm
-share/vmware/help/Help.gif
-share/vmware/help/Interacting.htm
-share/vmware/help/Introduction.htm
-share/vmware/help/Power.htm
-share/vmware/help/PowerOff.gif
-share/vmware/help/PowerOff.htm
-share/vmware/help/PowerOn.gif
-share/vmware/help/PowerOn.htm
-share/vmware/help/PowerReset.gif
-share/vmware/help/PowerReset.htm
-share/vmware/help/Resume.gif
-share/vmware/help/Resume.htm
-share/vmware/help/RunVM.htm
-share/vmware/help/SendCtlAltDel.htm
-share/vmware/help/Setremdev.htm
-share/vmware/help/Settings.htm
-share/vmware/help/ShowAllHints.htm
-share/vmware/help/StatusBar.htm
-share/vmware/help/Suspend.gif
-share/vmware/help/Suspend.htm
-share/vmware/help/ToolbarButtons.htm
-share/vmware/help/ToolsInstall.htm
-share/vmware/help/View.htm
-share/vmware/help/Wizcd.htm
-share/vmware/help/Wizcongrats.htm
-share/vmware/help/Wizdisk.htm
-share/vmware/help/Wizdisk3.htm
-share/vmware/help/WizdiskType.htm
-share/vmware/help/Wizfloppy.htm
-share/vmware/help/Wiznetwork.htm
-share/vmware/help/Wizos.htm
-share/vmware/help/Wizpath.htm
-share/vmware/help/toc.htm
-share/vmware/smb/codepages/codepage.437
-share/vmware/smb/codepages/codepage.737
-share/vmware/smb/codepages/codepage.850
-share/vmware/smb/codepages/codepage.852
-share/vmware/smb/codepages/codepage.861
-share/vmware/smb/codepages/codepage.866
-share/vmware/smb/codepages/codepage.932
-share/vmware/smb/codepages/codepage.936
-share/vmware/smb/codepages/codepage.949
-share/vmware/smb/codepages/codepage.950
-share/vmware/xkeymap/be101
-share/vmware/xkeymap/be104
-share/vmware/xkeymap/chde101
-share/vmware/xkeymap/chde104
-share/vmware/xkeymap/chfr101
-share/vmware/xkeymap/chfr104
-share/vmware/xkeymap/de101
-share/vmware/xkeymap/de104
-share/vmware/xkeymap/dk101
-share/vmware/xkeymap/dk104
-share/vmware/xkeymap/es101
-share/vmware/xkeymap/es104
-share/vmware/xkeymap/fi101
-share/vmware/xkeymap/fi104
-share/vmware/xkeymap/fr101
-share/vmware/xkeymap/fr104
-share/vmware/xkeymap/gb101
-share/vmware/xkeymap/gb104
-share/vmware/xkeymap/is101
-share/vmware/xkeymap/is104
-share/vmware/xkeymap/it101
-share/vmware/xkeymap/it104
-share/vmware/xkeymap/jp106
-share/vmware/xkeymap/jp109
-share/vmware/xkeymap/no101
-share/vmware/xkeymap/no104
-share/vmware/xkeymap/pt101
-share/vmware/xkeymap/pt104
-share/vmware/xkeymap/se101
-share/vmware/xkeymap/se104
-share/vmware/xkeymap/us101
-share/vmware/xkeymap/us104
diff --git a/emulators/vmware/distinfo b/emulators/vmware/distinfo
deleted file mode 100644
index fee929dd8bd..00000000000
--- a/emulators/vmware/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:21 agc Exp $
-
-SHA1 (VMware-2.0.4-1142.tar.gz) = 3c1ae31a366b46d787817054685a4cf6c0606afd
-RMD160 (VMware-2.0.4-1142.tar.gz) = d42a69939b83c51be07562a7789a9add1f05f6b9
-Size (VMware-2.0.4-1142.tar.gz) = 6533427 bytes
diff --git a/emulators/vmware3/DESCR b/emulators/vmware3/DESCR
deleted file mode 100644
index e8fbd10e0db..00000000000
--- a/emulators/vmware3/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Run Windows 95, Windows 98, Windows NT, Windows 2000, FreeBSD, NetBSD,
-or Linux under VMware Workstation 3.x.
-
-Each VMware world is the equivalent of a full PC in a window.
-
-Operating systems run simultaneously without dual booting.
-
-Add new operating systems without repartitioning disks.
diff --git a/emulators/vmware3/MESSAGE.NetBSD b/emulators/vmware3/MESSAGE.NetBSD
deleted file mode 100644
index f30e230196e..00000000000
--- a/emulators/vmware3/MESSAGE.NetBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2006/03/26 21:37:12 veego Exp $
-
-NetBSD had problem with emulation of Linux SVID shared memory handling,
-which caused black screen in VMware 3.x when the guest OS switched
-to graphics mode. The problem has been fixed in NetBSD 2.99.9 and
-2.0RC3.
-
-If you experience this problem, setting your DISPLAY environment variable
-to "localhost:0" should help.
-
-VMware fails to start if you use a tmpfs for /tmp.
-===========================================================================
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
deleted file mode 100644
index 3601a56d77e..00000000000
--- a/emulators/vmware3/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:13 wiz Exp $
-
-DISTNAME= VMware-workstation-3.2.1-2242
-PKGNAME= vmware-3.2.1pl1
-PKGREVISION= 2
-CATEGORIES= emulators
-MASTER_SITES= http://download3.vmware.com/software/wkst/
-
-# Binary patch to fix an problem with the nice(3) interface in an
-# newer glibc (>= v2.3.3)
-VMWARE_BIN_PATCH= vmware-any-any-update99
-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= ${VMWARE_BIN_PATCH}.tar.gz
-SITES.${VMWARE_BIN_PATCH}.tar.gz= ftp://ftp.cvut.cz/vmware/obsolete/
-
-MAINTAINER= jdolecek@NetBSD.org
-HOMEPAGE= http://www.vmware.com/
-COMMENT= VMware emulator 3.x
-LICENSE= vmware-license
-
-DEPENDS+= vmware-module>=3.2.1.8:../../emulators/vmware-module3
-
-EMUL_PLATFORMS= linux-i386
-EMUL_MODULES.linux= vmware
-EMUL_REQD= suse>=6.4nb1
-
-PKG_DESTDIR_SUPPORT= destdir
-
-WRKSRC= ${WRKDIR}/vmware-distrib
-
-# There is a kernel bug in NetBSD 3.0 for vmware.
-NOT_FOR_PLATFORM= NetBSD-3.0*-*
-
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-# We could install it into /etc/vmware, but that would mean we install
-# it somewhere out of ${PREFIX}, which is not a good idea, and the linux
-# emulation has a fallbackmode to look into ${PREFIX}/emul/linux/etc,
-# so use this way.
-VMWARE_CFG_DIR= ${PREFIX}/emul/linux/etc/vmware
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
- ${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
- cd ${WRKDIR}/${VMWARE_BIN_PATCH} && \
- ${RM} -f update && \
- ${CC} ${CFLAGS} -o update update.c && \
- ${CHMOD} u+w ${WRKSRC}/bin/vmware && \
- ./update vmware ${WRKSRC}/bin/vmware
-
-do-install: do-install-dirs do-install-binaries do-install-docs \
- do-install-share
-
-do-install-dirs:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware
- for dirs in bin configurator doc isoimages help licenses messages smb xkeymap; do \
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/$$dirs; \
- done
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/licenses/site
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/licenses/user
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/messages/chef
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/messages/ja
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/messages/jive
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/vmware/smb/codepages
- ${INSTALL_DATA_DIR} ${DESTDIR}${VMWARE_CFG_DIR}
-
-do-install-binaries:
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
- ${CHMOD} u+s ${DESTDIR}${PREFIX}/bin/vmware
-
-do-install-docs:
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/vmware/doc
-
-do-install-share:
- ${INSTALL_SCRIPT} ${WRKSRC}/lib/bin/* ${DESTDIR}${PREFIX}/share/vmware/bin
- ${INSTALL_DATA} ${WRKSRC}/lib/help/* ${DESTDIR}${PREFIX}/share/vmware/help
- ${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${DESTDIR}${PREFIX}/share/vmware/xkeymap
- ${INSTALL_DATA} ${WRKSRC}/lib/isoimages/* ${DESTDIR}${PREFIX}/share/vmware/isoimages
- ${INSTALL_DATA} ${WRKSRC}/lib/licenses/user/* ${DESTDIR}${PREFIX}/share/vmware/licenses/user
- ${INSTALL_DATA} ${WRKSRC}/lib/messages/chef/* ${DESTDIR}${PREFIX}/share/vmware/messages/chef
- ${INSTALL_DATA} ${WRKSRC}/lib/messages/ja/* ${DESTDIR}${PREFIX}/share/vmware/messages/ja
- ${INSTALL_DATA} ${WRKSRC}/lib/messages/jive/* ${DESTDIR}${PREFIX}/share/vmware/messages/jive
- ${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${DESTDIR}${PREFIX}/share/vmware/smb/codepages
- ${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${DESTDIR}${PREFIX}/share/vmware/configurator
- ${INSTALL_DATA} ${WRKSRC}/lib/config ${DESTDIR}${PREFIX}/share/vmware
- ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-post-install:
- @${RM} -f ${DESTDIR}${VMWARE_CFG_DIR}/config
- @( \
- ${ECHO} "vmware.fullpath = \"${PREFIX}/bin/vmware\""; \
- ${ECHO} "wizard.fullpath = \"${PREFIX}/bin/vmware-wizard\""; \
- ${ECHO} "dhcpd.fullpath = \"${PREFIX}/bin/vmware-dhcpd\""; \
- ${ECHO} "natd.fullpath = \"${PREFIX}/bin/vmware-natd\""; \
- ${ECHO} "smbpasswd.fullpath = \"${PREFIX}/bin/vmware-smbpasswd\""; \
- ${ECHO} "libdir = \"${PREFIX}/share/vmware\""; \
- ${ECHO} "vmnet1.HostOnlyAddress = \"172.16.212.1\""; \
- ${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\""; \
- ${ECHO} "host.FSSupportLocking1 = 0x1"; \
- ${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true"; \
- ) > ${DESTDIR}${VMWARE_CFG_DIR}/config
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware3/PLIST b/emulators/vmware3/PLIST
deleted file mode 100644
index 06835a95bc4..00000000000
--- a/emulators/vmware3/PLIST
+++ /dev/null
@@ -1,306 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:54:53 joerg Exp $
-bin/vmnet-bridge
-bin/vmnet-dhcpd
-bin/vmnet-natd
-bin/vmnet-netifup
-bin/vmnet-sniffer
-bin/vmware
-bin/vmware-config.pl
-bin/vmware-nmbd
-bin/vmware-ping
-bin/vmware-smbd
-bin/vmware-smbpasswd
-bin/vmware-smbpasswd.bin
-bin/vmware-uninstall.pl
-bin/vmware-wizard
-emul/linux/etc/vmware/config
-man/man1/vmware.1
-share/vmware/bin/vmware-mks
-share/vmware/bin/vmware-ui
-share/vmware/config
-share/vmware/configurator/vmnet-dhcpd.conf
-share/vmware/configurator/vmnet-nat.conf
-share/vmware/configurator/vmnet-smb.conf
-share/vmware/doc/EULA
-share/vmware/doc/INSTALL
-share/vmware/doc/README
-share/vmware/doc/open_source_licenses.txt
-share/vmware/help/CUSTOM-NETWORK.gif
-share/vmware/help/ConfigWiz.htm
-share/vmware/help/FullScreen.gif
-share/vmware/help/Help.gif
-share/vmware/help/PowerOff.gif
-share/vmware/help/PowerOn.gif
-share/vmware/help/PowerReset.gif
-share/vmware/help/Resume.gif
-share/vmware/help/Suspend.gif
-share/vmware/help/Wizcd.htm
-share/vmware/help/Wizcongrats.htm
-share/vmware/help/Wizdisk.htm
-share/vmware/help/Wizdisk3.htm
-share/vmware/help/WizdiskType.htm
-share/vmware/help/Wizfloppy.htm
-share/vmware/help/Wizguestkit.htm
-share/vmware/help/Wiznetwork.htm
-share/vmware/help/Wizos.htm
-share/vmware/help/Wizpath.htm
-share/vmware/help/about_this_help.htm
-share/vmware/help/commandref_linux.htm
-share/vmware/help/config_editor.htm
-share/vmware/help/config_editor_newvm.htm
-share/vmware/help/configvm.htm
-share/vmware/help/configvm_adv.htm
-share/vmware/help/configvm_automation.htm
-share/vmware/help/configvm_debug.htm
-share/vmware/help/configvm_disableaccel.htm
-share/vmware/help/configvm_display-problems.htm
-share/vmware/help/configvm_displayname.htm
-share/vmware/help/configvm_guestos.htm
-share/vmware/help/configvm_logs.htm
-share/vmware/help/configvm_memory.htm
-share/vmware/help/configvm_options.htm
-share/vmware/help/configvm_state.htm
-share/vmware/help/configvm_virtualdisk.htm
-share/vmware/help/configvmware-disablemem.htm
-share/vmware/help/configvmware-inputgrab.htm
-share/vmware/help/configvmware-maxmemory.htm
-share/vmware/help/configvmware-shift.htm
-share/vmware/help/configvmware.htm
-share/vmware/help/configvmware_copy_paste.htm
-share/vmware/help/devices.htm
-share/vmware/help/devices_autostart.htm
-share/vmware/help/devices_cdrom-changeconnect.htm
-share/vmware/help/devices_cdrom-disable.htm
-share/vmware/help/devices_cdrom-issues-linux.htm
-share/vmware/help/devices_cdrom-issues.htm
-share/vmware/help/devices_cdrom-removable.htm
-share/vmware/help/devices_cdrom-remove.htm
-share/vmware/help/devices_cdrom.htm
-share/vmware/help/devices_floppy.htm
-share/vmware/help/devices_floppy_changeconnect.htm
-share/vmware/help/devices_genscsi.htm
-share/vmware/help/devices_genscsi_linux.htm
-share/vmware/help/devices_modem.htm
-share/vmware/help/devices_mouse.htm
-share/vmware/help/devices_netadapter.htm
-share/vmware/help/devices_parallel-info.htm
-share/vmware/help/devices_parallel-onguestos.htm
-share/vmware/help/devices_parallel.htm
-share/vmware/help/devices_parallel_changeconnect.htm
-share/vmware/help/devices_pcmcia.htm
-share/vmware/help/devices_plaindisk-info.htm
-share/vmware/help/devices_plaindisk.htm
-share/vmware/help/devices_printer.htm
-share/vmware/help/devices_rawdisk.htm
-share/vmware/help/devices_remove_netadapter.htm
-share/vmware/help/devices_scanner.htm
-share/vmware/help/devices_scsi-bios.htm
-share/vmware/help/devices_scsi-guestos.htm
-share/vmware/help/devices_scsi.htm
-share/vmware/help/devices_scsi_info.htm
-share/vmware/help/devices_scsi_vs-ide.htm
-share/vmware/help/devices_serial.htm
-share/vmware/help/devices_sound-issues.htm
-share/vmware/help/devices_sound.htm
-share/vmware/help/devices_sound_changeconn.htm
-share/vmware/help/devices_usb-info.htm
-share/vmware/help/devices_usb.htm
-share/vmware/help/devices_video-linux-res.htm
-share/vmware/help/devices_video-linux.htm
-share/vmware/help/devices_video-win2000.htm
-share/vmware/help/devices_video-win95.htm
-share/vmware/help/devices_video-win98.htm
-share/vmware/help/devices_virtualdrive-consolidate.htm
-share/vmware/help/devices_virtualdrive-diskmode.htm
-share/vmware/help/devices_virtualdrive-virtualdisk-physical.htm
-share/vmware/help/devices_virtualdrive-virtualdisk-reuse.htm
-share/vmware/help/devices_virtualdrive-virtualdisk.htm
-share/vmware/help/devices_virtualdrive.htm
-share/vmware/help/devices_zipdrive.htm
-share/vmware/help/glossary.htm
-share/vmware/help/grab.htm
-share/vmware/help/guestos-corellinux.htm
-share/vmware/help/guestos-dos.htm
-share/vmware/help/guestos-freebsd.htm
-share/vmware/help/guestos-kit.htm
-share/vmware/help/guestos-mandrake-linux.htm
-share/vmware/help/guestos-mandrake-linux8081.htm
-share/vmware/help/guestos-mandrake-linux82.htm
-share/vmware/help/guestos-novell-4.htm
-share/vmware/help/guestos-novell-5.htm
-share/vmware/help/guestos-novell-6.htm
-share/vmware/help/guestos-novell-zenwrks.htm
-share/vmware/help/guestos-openlinux.htm
-share/vmware/help/guestos-rawdisk.htm
-share/vmware/help/guestos-redhat-linux.htm
-share/vmware/help/guestos-redhat-linux6.x.htm
-share/vmware/help/guestos-redhat-linux7.0.htm
-share/vmware/help/guestos-redhat-linux7.1.htm
-share/vmware/help/guestos-redhat-linux7.3.htm
-share/vmware/help/guestos-solaris7.htm
-share/vmware/help/guestos-suse-linux-6.x.htm
-share/vmware/help/guestos-suse-linux-7.0.htm
-share/vmware/help/guestos-suse-linux-7.1.htm
-share/vmware/help/guestos-suse-linux-8.0.htm
-share/vmware/help/guestos-suse-linux.htm
-share/vmware/help/guestos-turbolinux-6.0.htm
-share/vmware/help/guestos-turbolinux-7.0.htm
-share/vmware/help/guestos-turbolinux.htm
-share/vmware/help/guestos-win2000.htm
-share/vmware/help/guestos-win95.htm
-share/vmware/help/guestos-win98.htm
-share/vmware/help/guestos-winNETSvr.htm
-share/vmware/help/guestos-winXP.htm
-share/vmware/help/guestos-winme.htm
-share/vmware/help/guestos-winnt.htm
-share/vmware/help/guestos.htm
-share/vmware/help/hotkey.htm
-share/vmware/help/image001.gif
-share/vmware/help/index.htm
-share/vmware/help/install_apps.htm
-share/vmware/help/introduction.htm
-share/vmware/help/keyboard_issus.htm
-share/vmware/help/lock_files.htm
-share/vmware/help/memory.htm
-share/vmware/help/migratevm-toupgrade.htm
-share/vmware/help/migratevm-uninstall.htm
-share/vmware/help/migratevm-upgrade.htm
-share/vmware/help/migratevm.htm
-share/vmware/help/migratevm_buildno.htm
-share/vmware/help/migratevm_pc.htm
-share/vmware/help/migrating.htm
-share/vmware/help/movefiles.htm
-share/vmware/help/networking-components.htm
-share/vmware/help/networking-onguestos.htm
-share/vmware/help/networking-onhost.htm
-share/vmware/help/networking-promiscuous.htm
-share/vmware/help/networking.htm
-share/vmware/help/networking_assignip.htm
-share/vmware/help/networking_bridged-onguestos.htm
-share/vmware/help/networking_bridged-second.htm
-share/vmware/help/networking_bridged.htm
-share/vmware/help/networking_changing.htm
-share/vmware/help/networking_custom.htm
-share/vmware/help/networking_host-onguestos.htm
-share/vmware/help/networking_host-twointerfaces.htm
-share/vmware/help/networking_host.htm
-share/vmware/help/networking_host_ipleaks.htm
-share/vmware/help/networking_host_issues-linux.htm
-share/vmware/help/networking_host_routing.htm
-share/vmware/help/networking_host_samba.htm
-share/vmware/help/networking_ipmasqerade.htm
-share/vmware/help/networking_ipmasqerade_firewallrh.htm
-share/vmware/help/networking_ipmasqerade_fwconfig.htm
-share/vmware/help/networking_macaddr.htm
-share/vmware/help/networking_nat.htm
-share/vmware/help/networking_nat_intro.htm
-share/vmware/help/networking_proxy.htm
-share/vmware/help/networking_wireless.htm
-share/vmware/help/newvm-diskpartition.htm
-share/vmware/help/newvm-diskpartition_access.htm
-share/vmware/help/newvm-diskpartition_hide.htm
-share/vmware/help/newvm-dualboot-hdwr.htm
-share/vmware/help/newvm-dualboot-scsi.htm
-share/vmware/help/newvm-dualboot.htm
-share/vmware/help/newvm-virtualdisk.htm
-share/vmware/help/newvm.htm
-share/vmware/help/newvm_wizard.htm
-share/vmware/help/newvm_wizard_process_cdrom.htm
-share/vmware/help/newvm_wizard_process_directory.htm
-share/vmware/help/newvm_wizard_process_disksize.htm
-share/vmware/help/newvm_wizard_process_disktype.htm
-share/vmware/help/newvm_wizard_process_floppy.htm
-share/vmware/help/newvm_wizard_process_guestos.htm
-share/vmware/help/newvm_wizard_process_network.htm
-share/vmware/help/perform-guestos-linux.htm
-share/vmware/help/perform-guestos-win2000.htm
-share/vmware/help/perform-guestos-win95-98.htm
-share/vmware/help/perform-linuxhost.htm
-share/vmware/help/perform.htm
-share/vmware/help/screensavers.htm
-share/vmware/help/serialnumber.htm
-share/vmware/help/sharefiles_hos_gos.htm
-share/vmware/help/sharevm.htm
-share/vmware/help/sizewin.htm
-share/vmware/help/sizewin_fullscreen.htm
-share/vmware/help/startvm.htm
-share/vmware/help/startvmware.htm
-share/vmware/help/statevm.htm
-share/vmware/help/statevm_off.htm
-share/vmware/help/statevm_on.htm
-share/vmware/help/statevm_repeat_resume.htm
-share/vmware/help/statevm_reset.htm
-share/vmware/help/statevm_resume.htm
-share/vmware/help/statevm_suspend.htm
-share/vmware/help/support.htm
-share/vmware/help/switching.htm
-share/vmware/help/sysreqs.htm
-share/vmware/help/toc.htm
-share/vmware/help/user-permissions-linux.htm
-share/vmware/help/vm_common.htm
-share/vmware/help/vmtools-copypaste.htm
-share/vmware/help/vmtools-defrag.htm
-share/vmware/help/vmtools-shrink.htm
-share/vmware/help/vmtools.htm
-share/vmware/help/vmtools_install.htm
-share/vmware/help/vmtools_install_freebsd.htm
-share/vmware/help/vmtools_install_linux.htm
-share/vmware/help/vmtools_install_win.htm
-share/vmware/help/vmtools_prefs.htm
-share/vmware/help/whatsnew.htm
-share/vmware/isoimages/freebsd.iso
-share/vmware/isoimages/linux.iso
-share/vmware/isoimages/windows.iso
-share/vmware/licenses/user/license.ws.3.0
-share/vmware/messages/chef/vmware-mks.vmsg
-share/vmware/messages/chef/vmware-ui.vmsg
-share/vmware/messages/chef/vmware.vmsg
-share/vmware/messages/ja/vmware-mks.vmsg
-share/vmware/messages/ja/vmware-ui.vmsg
-share/vmware/messages/ja/vmware.vmsg
-share/vmware/messages/jive/vmware-mks.vmsg
-share/vmware/messages/jive/vmware-ui.vmsg
-share/vmware/messages/jive/vmware.vmsg
-share/vmware/smb/codepages/codepage.437
-share/vmware/smb/codepages/codepage.737
-share/vmware/smb/codepages/codepage.850
-share/vmware/smb/codepages/codepage.852
-share/vmware/smb/codepages/codepage.861
-share/vmware/smb/codepages/codepage.866
-share/vmware/smb/codepages/codepage.932
-share/vmware/smb/codepages/codepage.936
-share/vmware/smb/codepages/codepage.949
-share/vmware/smb/codepages/codepage.950
-share/vmware/xkeymap/be101
-share/vmware/xkeymap/be104
-share/vmware/xkeymap/chde101
-share/vmware/xkeymap/chde104
-share/vmware/xkeymap/chfr101
-share/vmware/xkeymap/chfr104
-share/vmware/xkeymap/de101
-share/vmware/xkeymap/de104
-share/vmware/xkeymap/dk101
-share/vmware/xkeymap/dk104
-share/vmware/xkeymap/es101
-share/vmware/xkeymap/es104
-share/vmware/xkeymap/fi101
-share/vmware/xkeymap/fi104
-share/vmware/xkeymap/fr101
-share/vmware/xkeymap/fr104
-share/vmware/xkeymap/gb101
-share/vmware/xkeymap/gb104
-share/vmware/xkeymap/is101
-share/vmware/xkeymap/is104
-share/vmware/xkeymap/it101
-share/vmware/xkeymap/it104
-share/vmware/xkeymap/jp106
-share/vmware/xkeymap/jp109
-share/vmware/xkeymap/no101
-share/vmware/xkeymap/no104
-share/vmware/xkeymap/pt101
-share/vmware/xkeymap/pt104
-share/vmware/xkeymap/se101
-share/vmware/xkeymap/se104
-share/vmware/xkeymap/us101
-share/vmware/xkeymap/us104
-@pkgdir share/vmware/licenses/site
diff --git a/emulators/vmware3/distinfo b/emulators/vmware3/distinfo
deleted file mode 100644
index 36623e2a59d..00000000000
--- a/emulators/vmware3/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/03/26 21:37:12 veego Exp $
-
-SHA1 (VMware-workstation-3.2.1-2242.tar.gz) = 3f3c8539270707087525e220264a38639bf17547
-RMD160 (VMware-workstation-3.2.1-2242.tar.gz) = f2a6c3cc38f3c3851446e8902237b958367293a1
-Size (VMware-workstation-3.2.1-2242.tar.gz) = 12577292 bytes
-SHA1 (vmware-any-any-update99.tar.gz) = ac2a6621fdaacfe40422d71fe27d567826635dd7
-RMD160 (vmware-any-any-update99.tar.gz) = e22e0530d248dde2922283683573eaa02cdbc567
-Size (vmware-any-any-update99.tar.gz) = 296093 bytes
-SHA1 (patch-aa) = 85d8d8da295c3cfb733b93f32bd2b6f6a25d13ac
diff --git a/emulators/vmware3/patches/patch-aa b/emulators/vmware3/patches/patch-aa
deleted file mode 100644
index 598cd9f1e9e..00000000000
--- a/emulators/vmware3/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/26 21:37:12 veego Exp $
-
---- ../vmware-any-any-update99/update.c.orig 2006-02-19 09:51:39.000000000 +0100
-+++ ../vmware-any-any-update99/update.c
-@@ -508,8 +508,10 @@ static int trypatch2242(struct file* fd,
- "\xEB\x26\xFF\x73\x14\xE8";
- return trypatch(fd, name, (off_t)0x12930, oldcodeNICE, newcodeNICE, sizeof(newcodeNICE) - 1,
- (off_t)0x1299A, oldcodeNICE2, newcodeNICE2, sizeof(newcodeNICE2) - 1,
-+/*
- (off_t)416460, oldcodeALLOCLOWMEM, newcodeALLOCLOWMEM, sizeof(newcodeALLOCLOWMEM) - 1,
- (off_t)0x65CE4, oldcodeFREELOWMEM, newcodeFREELOWMEM, sizeof(newcodeFREELOWMEM) - 1,
-+*/
- (off_t)0);
- }
-