bring a bit further on -current

4 files changed, 14 insertions, 39 deletions

diff --git a/emulators/plex86/files/patch-sum b/emulators/plex86/files/patch-sum
index 5330877fb99..b5ae99a655e 100644
--- a/emulators/plex86/files/patch-sum
+++ b/emulators/plex86/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/14 04:25:52 hubertf Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/14 06:03:54 hubertf Exp $
 
-MD5 (patch-aa) = a3c72b3b53f35e40de60f21493f5a2f0
-MD5 (patch-ab) = c289ee7def1b937c554b9b02022a8b0a
-MD5 (patch-ac) = 61debdcad5c960fcc1dadf24c7f02b04
+MD5 (patch-aa) = 9e2e655fdd86d51c0c078b512f589898
diff --git a/emulators/plex86/patches/patch-aa b/emulators/plex86/patches/patch-aa
index a6f44763342..0391a23104a 100644
--- a/emulators/plex86/patches/patch-aa
+++ b/emulators/plex86/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/14 04:25:52 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/14 06:03:54 hubertf Exp $
 
---- configure.in.orig	Sun Dec 10 23:29:39 2000
-+++ configure.in
-@@ -20,6 +20,7 @@
- AC_CHECK_SIZEOF(unsigned int, 0)
- AC_CHECK_SIZEOF(unsigned long, 0)
- AC_CHECK_SIZEOF(unsigned long long, 0)
-+AC_CHECK_HEADER(uvm/uvm_param.h, HAVE_UVM_PARAM_H=1)
- AC_CHECK_FUNCS(select, AC_DEFINE(HAVE_SELECT))
- AC_CHECK_LIB(dl, dlopen,
-   LIBDL='-ldl',
+--- host-netbsd.c.orig	Thu Dec 14 05:49:45 2000
++++ host-netbsd.c
+@@ -25,7 +25,7 @@
+ 
+ #undef NETBSD_PLEX86_DEBUG
+ 
+-#if __NetBSD_Version__ > 105000000
++#if __NetBSD_Version__ > 105000100
+ #include <uvm/uvm_extern.h>
+ #include <uvm/uvm_param.h>
+ #else
diff --git a/emulators/plex86/patches/patch-ab b/emulators/plex86/patches/patch-ab
deleted file mode 100644
index b8a4c1dbb2c..00000000000
--- a/emulators/plex86/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/14 04:25:52 hubertf Exp $
-
---- config.h.in.orig	Thu Dec 14 04:28:34 2000
-+++ config.h.in
-@@ -138,3 +138,6 @@
- #define BX_WITH_SDL 0
- 
- #define USE_LOADER 0
-+
-+/* This is only present on post-1.5 NetBSD-current systems: */
-+/* #undef HAVE_UVM_PARAM_H */
diff --git a/emulators/plex86/patches/patch-ac b/emulators/plex86/patches/patch-ac
deleted file mode 100644
index 706094a5967..00000000000
--- a/emulators/plex86/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/14 04:25:52 hubertf Exp $
-
---- kernel/host-netbsd.c.orig	Thu Dec 14 04:29:42 2000
-+++ kernel/host-netbsd.c
-@@ -25,7 +25,7 @@
- 
- #undef NETBSD_PLEX86_DEBUG
- 
--#if __NetBSD_Version__ > 105000000
-+#if __NetBSD_Version__ > 105000000 && defined(HAVE_UVM_PARAM_H)
- #include <uvm/uvm_extern.h>
- #include <uvm/uvm_param.h>
- #else