summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/plex86/Makefile18
-rw-r--r--emulators/plex86/files/md54
-rw-r--r--emulators/plex86/files/patch-sum9
-rw-r--r--emulators/plex86/patches/patch-aa22
-rw-r--r--emulators/plex86/patches/patch-ab53
-rw-r--r--emulators/plex86/patches/patch-ac13
-rw-r--r--emulators/plex86/pkg/PLIST26
7 files changed, 104 insertions, 41 deletions
diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile
index 39d44a59bc3..b01add52cff 100644
--- a/emulators/plex86/Makefile
+++ b/emulators/plex86/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2001/01/03 16:21:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/01/07 14:44:18 tron Exp $
-DISTNAME= plex86-20001225
+DISTNAME= plex86-20010106
PKGNAME= ${DISTNAME:S/-/-0./}
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_LOCAL}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= hubertf@netbsd.org
+MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.plex86.org/
WRKSRC= ${WRKDIR}/plex86
@@ -49,15 +50,14 @@ post-build:
${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-docs
+ do-install-font do-install-conf
${SED} -e 's,@PREFIX@,${PREFIX},g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
do-install-dirs:
${INSTALL_DATA_DIR} ${PREFIX}/lkm \
${PREFIX}/lib/plex86 \
${PREFIX}/lib/plex86/bios \
- ${PREFIX}/share/examples/plex86 \
- ${PREFIX}/share/doc/html/plex86
+ ${PREFIX}/share/examples/plex86
do-install-binaries:
${INSTALL_PROGRAM} ${WRKSRC}/user/plex86 ${PREFIX}/bin/
@@ -82,10 +82,6 @@ do-install-conf:
-e 's,\./plugins/bochs/,${PREFIX}/lib/plex86/,' \
$$f >${WRKDIR}/$$f.conf; \
done
- ${INSTALL_DATA} ${WRKDIR}/*.conf ${PREFIX}/share/examples/plex86/
-
-do-install-docs:
- @${INSTALL_DATA} ${WRKSRC}/output/html/* ${WRKSRC}/docs/html/*.* \
- ${PREFIX}/share/doc/html/plex86/
+ ${INSTALL_DATA} ${WRKDIR}/*.conf ${PREFIX}/share/examples/plex86
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/plex86/files/md5 b/emulators/plex86/files/md5
index 58eaf2bdb5e..5f6f9a35ea8 100644
--- a/emulators/plex86/files/md5
+++ b/emulators/plex86/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/12/25 23:50:52 tron Exp $
+$NetBSD: md5,v 1.5 2001/01/07 14:44:18 tron Exp $
-MD5 (plex86-20001225.tar.gz) = bd3c538da6da7ce82202dba63a3ec151
+MD5 (plex86-20010106.tar.bz2) = 2d9ee664991a5b605fc202ee61f71b0e
diff --git a/emulators/plex86/files/patch-sum b/emulators/plex86/files/patch-sum
index a76988effad..d169d2c84ba 100644
--- a/emulators/plex86/files/patch-sum
+++ b/emulators/plex86/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/12/21 12:36:08 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/07 14:44:19 tron Exp $
-This placeholder file is generated by the ``makepatchsum'' target
-whenever the patches directory is empty or missing. Its purpose
-is to ensure that the presence of any obsolete patches will cause
-the proper error to be emitted at build time.
+MD5 (patch-aa) = a16b9a7e43dfe79472f08b1ba0f65d7c
+MD5 (patch-ab) = 962073b5d392d0bdeb65bc8f0e2f756f
+MD5 (patch-ac) = 637b784bd27d73d08f940d1c496b87e0
diff --git a/emulators/plex86/patches/patch-aa b/emulators/plex86/patches/patch-aa
new file mode 100644
index 00000000000..b80bf907928
--- /dev/null
+++ b/emulators/plex86/patches/patch-aa
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..16187405afe
--- /dev/null
+++ b/emulators/plex86/patches/patch-ab
@@ -0,0 +1,53 @@
+$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
new file mode 100644
index 00000000000..0d84e49ae04
--- /dev/null
+++ b/emulators/plex86/patches/patch-ac
@@ -0,0 +1,13 @@
+$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)
diff --git a/emulators/plex86/pkg/PLIST b/emulators/plex86/pkg/PLIST
index 5cfa47f7306..7c98a50b3d1 100644
--- a/emulators/plex86/pkg/PLIST
+++ b/emulators/plex86/pkg/PLIST
@@ -1,34 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/25 23:50:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/07 14:44:20 tron Exp $
bin/plex86
bin/plex86_reset
lib/X11/fonts/local/vga.pcf.gz
+@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
+@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
lib/plex86/bios/BIOS-plex86-2000_0817a
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/doc/html/plex86/address_space.html
-share/doc/html/plex86/book1.htm
-share/doc/html/plex86/c10.htm
-share/doc/html/plex86/c102.htm
-share/doc/html/plex86/c13.htm
-share/doc/html/plex86/c18.htm
-share/doc/html/plex86/c21.htm
-share/doc/html/plex86/c24.htm
-share/doc/html/plex86/c31.htm
-share/doc/html/plex86/c34.htm
-share/doc/html/plex86/c74.htm
-share/doc/html/plex86/c77.htm
-share/doc/html/plex86/c80.htm
-share/doc/html/plex86/c86.htm
-share/doc/html/plex86/c89.htm
-share/doc/html/plex86/c92.htm
-share/doc/html/plex86/c96.htm
-share/doc/html/plex86/c99.htm
-share/doc/html/plex86/dt.gif
-share/doc/html/plex86/nopaging.gif
-share/doc/html/plex86/x68.htm
share/examples/plex86/freedos.conf
share/examples/plex86/linuxhd.conf
share/examples/plex86/msdos.conf
@@ -37,6 +18,5 @@ share/examples/plex86/win95.conf
share/examples/plex86/winnt.conf
@dirrm lib/plex86/bios
@dirrm lib/plex86
-@dirrm share/doc/html/plex86
@dirrm share/examples/plex86
@unexec rmdir %D/lkm 2>/dev/null || true
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 18:10:35 +0000