diff options
| -rw-r--r-- | emulators/Makefile | 3 | ||||
| -rw-r--r-- | emulators/plex86/DESCR | 18 | ||||
| -rw-r--r-- | emulators/plex86/MESSAGE | 18 | ||||
| -rw-r--r-- | emulators/plex86/Makefile | 80 | ||||
| -rw-r--r-- | emulators/plex86/PLIST | 25 | ||||
| -rw-r--r-- | emulators/plex86/distinfo | 7 | ||||
| -rw-r--r-- | emulators/plex86/patches/patch-aa | 22 | ||||
| -rw-r--r-- | emulators/plex86/patches/patch-ab | 53 | ||||
| -rw-r--r-- | emulators/plex86/patches/patch-ac | 13 |
9 files changed, 1 insertions, 238 deletions
diff --git a/emulators/Makefile b/emulators/Makefile index fea0e6a27eb..699ee65bbdb 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2003/12/03 23:35:23 xtraeme Exp $ +# $NetBSD: Makefile,v 1.90 2003/12/06 17:24:15 tron Exp $ # COMMENT= Emulators for other operating systems @@ -43,7 +43,6 @@ SUBDIR+= p11 SUBDIR+= palmosemulator SUBDIR+= pcemu SUBDIR+= peace -SUBDIR+= plex86 SUBDIR+= rewind SUBDIR+= simh SUBDIR+= snes9x diff --git a/emulators/plex86/DESCR b/emulators/plex86/DESCR deleted file mode 100644 index 4a671de699a..00000000000 --- a/emulators/plex86/DESCR +++ /dev/null @@ -1,18 +0,0 @@ - The goal of the Plex86 project is to create an extensible open source - PC virtualization software program which will allow PC and workstation - users to run multiple operating systems concurrently on the same - machine. - - Plex86 will run as much of the operating system and application - software natively as possible, the rest being emulated by the PC - virtualization monitor. - - A highly visible and often requested use, would be to allow for - Windows software to be run inside of GNU/Linux or other UNIX like - operating system. This gives users a migration path towards UNIX, - allowing them to run legacy software until native ports or - alternatives are available. It also provides a transitionary step for - software vendors who plan to port their product to UNIX, but have not - yet done so. Users could buy the Windows version product and run it at - near native speeds on UNIX, using Plex86, until a UNIX native version - is ready. diff --git a/emulators/plex86/MESSAGE b/emulators/plex86/MESSAGE deleted file mode 100644 index 6f86f76559a..00000000000 --- a/emulators/plex86/MESSAGE +++ /dev/null @@ -1,18 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2001/10/31 23:53:17 zuntum Exp $ - -NOTE: Because plex86 contains a kernel module, it must be run with a -kernel built from the same sources as the plex86 binaries. If you are -running a system with changing kernel sources (such as NetBSD-current), -you must recompile and reinstall plex86 after compiling your kernel from -updated sources. (Be sure to disable the LKM while doing this!) - -In order to enable loading of the plex86 kernel module at boot time, -edit /etc/lkm.conf and add the following line: - -${PREFIX}/lkm/plex86.o - - ${PREFIX}/lib/plex86/netbsd_post.sh - AFTERMOUNT - -The module will be loaded after reboot, and the netbsd_post.sh script will -automatically create the needed /dev/plex86 device. - -=========================================================================== diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile deleted file mode 100644 index c491899399b..00000000000 --- a/emulators/plex86/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2003/09/22 11:56:19 jmmv Exp $ - -DISTNAME= plex86-20010106 -PKGNAME= ${DISTNAME:S/-/-0./} -WRKSRC= ${WRKDIR}/plex86 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_LOCAL} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= tron@NetBSD.org -HOMEPAGE= http://www.plex86.org/ -COMMENT= Extensible open source PC virtualization software (free VMware) - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-NetBSD \ - --with-netbsd-source=${BSDSRCDIR}/sys -USE_GMAKE= yes -USE_X11BASE= yes # for VGA font - -ONLY_FOR_PLATFORM= NetBSD-*-i386 - -RESTRICTED= CPU-specific binary code -NO_BIN_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} - -.include "../../mk/bsd.prefs.mk" - -pre-extract: -.if !defined(BSDSRCDIR) - @${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/sys/param.h) - @${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys." - @${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)" - @${FALSE} -.endif - -post-build: - ${TEST} -f ${WRKSRC}/misc/vga.pcf.gz || \ - ${GZIP_CMD} -9 ${WRKSRC}/misc/vga.pcf - -do-install: do-install-dirs do-install-binaries do-install-bios \ - do-install-font do-install-conf - -do-install-dirs: - ${INSTALL_DATA_DIR} ${PREFIX}/lkm - ${INSTALL_DATA_DIR} ${PREFIX}/lib/plex86 - ${INSTALL_DATA_DIR} ${PREFIX}/lib/plex86/bios - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/plex86 - -do-install-binaries: - ${INSTALL_PROGRAM} ${WRKSRC}/user/plex86 ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/user/resetmod ${PREFIX}/bin/plex86_reset - ${INSTALL_DATA} ${WRKSRC}/user/plugins/bochs/plugin-bochs.so ${PREFIX}/lib/plex86 - ${INSTALL_DATA} ${WRKSRC}/kernel/plex86.o ${PREFIX}/lkm - ${INSTALL_SCRIPT} ${WRKSRC}/misc/netbsd_post.sh ${PREFIX}/lib/plex86 - -do-install-bios: - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS* \ - ${WRKSRC}/bios/VGABIOS-elpin-2.40 \ - ${PREFIX}/lib/plex86/bios - -do-install-font: - ${INSTALL_DATA} ${WRKSRC}/misc/vga.pcf.gz ${PREFIX}/lib/X11/fonts/local - ${X11BASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/local - -do-install-conf: - @cd ${WRKSRC}/conf && for f in freedos linuxhd msdos qnx win95 winnt; do \ - ${SED} -e 's,\.\./\.\./,/PATH/TO/,' \ - -e 's,\.\./bios/,${PREFIX}/lib/plex86/bios/,' \ - -e 's,\./plugins/bochs/,${PREFIX}/lib/plex86/,' \ - $$f >${WRKDIR}/$$f.conf; \ - done - ${INSTALL_DATA} ${WRKDIR}/*.conf ${PREFIX}/share/examples/plex86 - -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/plex86/PLIST b/emulators/plex86/PLIST deleted file mode 100644 index d203421d11f..00000000000 --- a/emulators/plex86/PLIST +++ /dev/null @@ -1,25 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:20 tron Exp $ -bin/plex86 -bin/plex86_reset -lib/X11/fonts/local/vga.pcf.gz -@exec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local -@unexec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local -lib/plex86/bios/BIOS-plex86-2000_0802a -lib/plex86/bios/BIOS-plex86-2000_0817a -lib/plex86/bios/BIOS-plex86-2000_1228a -lib/plex86/bios/BIOS-plex86-current -lib/plex86/bios/VGABIOS-elpin-2.40 -lib/plex86/netbsd_post.sh -lib/plex86/plugin-bochs.so -lkm/plex86.o -@unexec ${RM} -f %D/lkm/plex86 2>/dev/null || ${TRUE} -share/examples/plex86/freedos.conf -share/examples/plex86/linuxhd.conf -share/examples/plex86/msdos.conf -share/examples/plex86/qnx.conf -share/examples/plex86/win95.conf -share/examples/plex86/winnt.conf -@dirrm lib/plex86/bios -@dirrm lib/plex86 -@dirrm share/examples/plex86 -@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE} diff --git a/emulators/plex86/distinfo b/emulators/plex86/distinfo deleted file mode 100644 index b98dcb4aded..00000000000 --- a/emulators/plex86/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 10:49:56 agc Exp $ - -SHA1 (plex86-20010106.tar.bz2) = 8a06a506c7546e032c4a247c32df25b54deb7776 -Size (plex86-20010106.tar.bz2) = 608108 bytes -SHA1 (patch-aa) = 0f485291d0ba95970cf97bb86c81f050b19bcfc0 -SHA1 (patch-ab) = 2e1c5f6df9bdb18d6c0491839ef2e38207d75e49 -SHA1 (patch-ac) = 254f2037ec60ed96f15dde31410c8828b97c7a23 diff --git a/emulators/plex86/patches/patch-aa b/emulators/plex86/patches/patch-aa deleted file mode 100644 index b80bf907928..00000000000 --- a/emulators/plex86/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2001/01/07 14:44:19 tron Exp $ - ---- user/plugins/bochs/iodev/harddrv.h.orig Wed Jan 3 13:50:13 2001 -+++ user/plugins/bochs/iodev/harddrv.h Sun Jan 7 12:10:34 2001 -@@ -45,7 +45,7 @@ - - // Position ourselves. Return the resulting offset from the - // beginning of the file. -- virtual loff_t lseek (loff_t offset, int whence) = 0; -+ virtual off_t lseek (off_t offset, int whence) = 0; - - // Read count bytes to the buffer buf. Return the number of - // bytes read (count). -@@ -71,7 +71,7 @@ - - // Position ourselves. Return the resulting offset from the - // beginning of the file. -- loff_t lseek (loff_t offset, int whence); -+ off_t lseek (off_t offset, int whence); - - // Read count bytes to the buffer buf. Return the number of - // bytes read (count). diff --git a/emulators/plex86/patches/patch-ab b/emulators/plex86/patches/patch-ab deleted file mode 100644 index 16187405afe..00000000000 --- a/emulators/plex86/patches/patch-ab +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/01/07 14:44:19 tron Exp $ - ---- user/plugins/bochs/iodev/harddrv.cc.orig Wed Jan 3 13:50:13 2001 -+++ user/plugins/bochs/iodev/harddrv.cc Sun Jan 7 12:11:02 2001 -@@ -313,14 +313,14 @@ - } - else { /* read next one into controller buffer */ - unsigned long logical_sector; -- loff_t ret; -+ off_t ret; - - BX_SELECTED_CONTROLLER.status.drq = 1; - BX_SELECTED_CONTROLLER.status.seek_complete = 1; - - logical_sector = calculate_logical_address(); - -- ret = BX_SELECTED_HD.hard_drive->lseek((loff_t)logical_sector * 512, SEEK_SET); -+ ret = BX_SELECTED_HD.hard_drive->lseek((off_t)logical_sector * 512, SEEK_SET); - - if (ret == -1) - bx_panic("disk: could lseek() hard drive image file\n"); -@@ -668,11 +668,11 @@ - /* if buffer completely writtten */ - if (BX_SELECTED_CONTROLLER.buffer_index >= 512) { - unsigned long logical_sector; -- loff_t ret; -+ off_t ret; - - logical_sector = calculate_logical_address(); - -- ret = BX_SELECTED_HD.hard_drive->lseek((loff_t)logical_sector * 512, SEEK_SET); -+ ret = BX_SELECTED_HD.hard_drive->lseek((off_t)logical_sector * 512, SEEK_SET); - if (ret == -1) - bx_panic("disk: could lseek() hard drive image file\n"); - -@@ -1293,7 +1293,7 @@ - - logical_sector = calculate_logical_address(); - -- ret = BX_SELECTED_HD.hard_drive->lseek((loff_t)logical_sector * 512, SEEK_SET); -+ ret = BX_SELECTED_HD.hard_drive->lseek((off_t)logical_sector * 512, SEEK_SET); - - if (ret == -1) { - bx_panic("disk: could not lseek() hard drive image file\n"); -@@ -2307,7 +2307,7 @@ - } - } - --loff_t default_image_t::lseek (loff_t offset, int whence) -+off_t default_image_t::lseek (off_t offset, int whence) - { - return pluginWCLSeek(fd, offset, whence); - } diff --git a/emulators/plex86/patches/patch-ac b/emulators/plex86/patches/patch-ac deleted file mode 100644 index 0d84e49ae04..00000000000 --- a/emulators/plex86/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2001/01/07 14:44:19 tron Exp $ - ---- user/plugins/write-cache/write-cache.cc.orig Sun Jan 7 12:04:45 2001 -+++ user/plugins/write-cache/write-cache.cc Sun Jan 7 12:12:48 2001 -@@ -167,7 +167,7 @@ - - void WriteCache::DoSeek() - { -- loff_t result; -+ off_t result; - - #if 1 - if (!mustseek) |