Update to 2.8. Changes since 2.6:

o Eric Biederman reworked the build process making it far simpler and also
  to produce a network bootable ELF image.
o Re-wrote the memory and cache speed detection code.  Previuosly the
  reported numbers were inaccurate for intel CPU's and completely wrong
  for Athlon/Duron CPU's.
o By default the serial console is disabled since this was slowing
  down testing.
o Added CPU detection for Pentium 4.
o Expanded workaround for errors caused by BIOS USB keyboard support to
  include test #5.
o Re-worked L1 / L2 cache detection code to provide clearer reporting.
o Fixed an obvious bug in the computation of cache and memory speeds.
o Changed on-line menu to stay in the menu between option selections.
o Fixed bugs in the test restart and redraw code.
o Adjusted code size to fix compilation problems with RedHat 7.1.
o Misc updates to the documentation.

4 files changed, 12 insertions, 76 deletions

diff --git a/sysutils/memtest/Makefile b/sysutils/memtest/Makefile
index c5da891adf2..3fb2311f6c0 100644
--- a/sysutils/memtest/Makefile
+++ b/sysutils/memtest/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2001/07/09 16:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/25 22:08:52 wiz Exp $
 #
 
-DISTNAME=		memtest86-2.6
-PKGNAME=		memtest-2.6
+DISTNAME=		memtest86-2.8a
+PKGNAME=		memtest-2.8
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.memtest86.com/
 
 MAINTAINER=		collver@linuxfreemail.com
-HOMEPAGE=		http://www.memtest86.com
+HOMEPAGE=		http://www.memtest86.com/
 COMMENT=		thorough, stand alone memory test for x86 arch
 
-BUILD_DEPENDS+=		bcc-95.3.12:../../devel/bcc
-
 USE_GMAKE=		yes
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
+WRKSRC=			${WRKDIR}/${DISTNAME:S/a$//}
 
 post-patch:
 	${CP} ${FILESDIR}/linkage.h ${WRKSRC}
diff --git a/sysutils/memtest/distinfo b/sysutils/memtest/distinfo
index a8f778f0bdc..d35a57a1947 100644
--- a/sysutils/memtest/distinfo
+++ b/sysutils/memtest/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/07/09 16:31:36 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/25 22:08:52 wiz Exp $
 
-SHA1 (memtest86-2.6.tar.gz) = 2932b0b60ee02e6ecc4b567d58b4fba6034400c6
-Size (memtest86-2.6.tar.gz) = 74051 bytes
-SHA1 (patch-aa) = 6f04b5932e01f4b534166dbd20e73ccb097f555d
+SHA1 (memtest86-2.8a.tar.gz) = caba12ced3a30f5a2058f2dcfcb4b7e9ebcf312d
+Size (memtest86-2.8a.tar.gz) = 77185 bytes
+SHA1 (patch-aa) = 871b7ea0ed70c8a1754f03bf6458c44e88bae353
 SHA1 (patch-ab) = 297a1b9bdf2c7c1fa38fb69f7f185b3c8f800754
-SHA1 (patch-ac) = cb34cf3b81920d792d88f51b9ebcfbfff7773d4a
diff --git a/sysutils/memtest/patches/patch-aa b/sysutils/memtest/patches/patch-aa
index bbc903030af..95b79d7565e 100644
--- a/sysutils/memtest/patches/patch-aa
+++ b/sysutils/memtest/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2001/07/09 16:31:36 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2001/12/25 22:08:52 wiz Exp $
 
---- Makefile.orig	Sat Jul  7 23:52:34 2001
-+++ Makefile	Sat Jul  7 23:54:30 2001
+--- Makefile.orig	Wed Oct 24 16:57:16 2001
++++ Makefile
 @@ -6,7 +6,7 @@
  #
  # Path for the floppy disk device
@@ -11,30 +11,3 @@ $NetBSD: patch-aa,v 1.2 2001/07/09 16:31:36 wiz Exp $
  
  CC=gcc
  #
-@@ -69,11 +69,8 @@
- 		$(REL_DAT_ADR) -Map mapfile.relo $(OBJS)
- 
- relo.out: relo
--	if hash encaps 2> /dev/null; then \
--	    $(OBJDUMP) -o $(REL_TXT_ADR) relo >relo.out; \
--	else \
--	    $(OBJCOPY) relo relo.out; \
--	fi
-+	$(OBJCOPY) relo relo.out
-+
- relo.obj: relo.out
- 	ld -r -o $@ -T relo.lds -b binary $^
-        
-@@ -85,11 +82,7 @@
- 		-Map mapfile $(OBJS)
- 
- head.out: head
--	if hash encaps 2> /dev/null; then \
--	    $(OBJDUMP) -o $(TXT_ADR) head >head.out; \
--	else \
--	    $(OBJCOPY) head head.out; \
--	fi
-+	$(OBJCOPY) head head.out
- 
- head.obj: head.out
- 	ld -r -o $@ -T head.lds -b binary $^
diff --git a/sysutils/memtest/patches/patch-ac b/sysutils/memtest/patches/patch-ac
deleted file mode 100644
index 36f64d360c4..00000000000
--- a/sysutils/memtest/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
-
---- build.c.orig	Mon Apr  9 19:02:15 2001
-+++ build.c	Mon Apr  9 19:02:43 2001
-@@ -23,7 +23,7 @@
- #include <stdio.h>	/* fprintf */
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <linux/a.out.h>
-+#include <a.out.h>
- #include "defs.h"
- 
- #define MINIX_HEADER 32
-@@ -89,10 +89,6 @@
- 		die("Unable to open 'boot'");
- 	if (read(id,buf,MINIX_HEADER) != MINIX_HEADER)
- 		die("Unable to read header of 'boot'");
--	if (((long *) buf)[0]!=intel_long(0x04100301))
--		die("Non-Minix header of 'boot'");
--	if (((long *) buf)[1]!=intel_long(MINIX_HEADER))
--		die("Non-Minix header of 'boot'");
- 	if (((long *) buf)[3] != 0)
- 		die("Illegal data segment in 'boot'");
- 	if (((long *) buf)[4] != 0)
-@@ -114,10 +110,6 @@
- 		die("Unable to open 'setup'");
- 	if (read(id,buf,MINIX_HEADER) != MINIX_HEADER)
- 		die("Unable to read header of 'setup'");
--	if (((long *) buf)[0]!=intel_long(0x04100301))
--		die("Non-Minix header of 'setup'");
--	if (((long *) buf)[1]!=intel_long(MINIX_HEADER))
--		die("Non-Minix header of 'setup'");
- 	if (((long *) buf)[3] != 0)
- 		die("Illegal data segment in 'setup'");
- 	if (((long *) buf)[4] != 0)