Update to 2.6 by the maintainer Ben Collver via pkg/13408.

Changes since 2.5:
* Added workaround for errors caused by BIOS USB keyboard support.
* Fixed problems with reporting of 1 GHZ + processor speeds.
* Fixed Duron cache detection.
* Added screen buffer so that menus will work correctly from a serial
  console.
* The Memtest86 image is now built in ELF format.

4 files changed, 22 insertions, 21 deletions

diff --git a/sysutils/memtest/Makefile b/sysutils/memtest/Makefile
index ba35dff8520..c5da891adf2 100644
--- a/sysutils/memtest/Makefile
+++ b/sysutils/memtest/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/07/09 16:31:36 wiz Exp $
 #
 
-DISTNAME=		memtest86-2.5
-PKGNAME=		memtest-2.5
+DISTNAME=		memtest86-2.6
+PKGNAME=		memtest-2.6
 CATEGORIES=		sysutils
-MASTER_SITES=		http://reality.sgi.com/cbrady_denver/memtest86/
+MASTER_SITES=		http://www.memtest86.com/
 
 MAINTAINER=		collver@linuxfreemail.com
-HOMEPAGE=		http://reality.sgi.com/cbrady_denver/memtest86/
+HOMEPAGE=		http://www.memtest86.com
 COMMENT=		thorough, stand alone memory test for x86 arch
 
 BUILD_DEPENDS+=		bcc-95.3.12:../../devel/bcc
diff --git a/sysutils/memtest/distinfo b/sysutils/memtest/distinfo
index abe68005a82..a8f778f0bdc 100644
--- a/sysutils/memtest/distinfo
+++ b/sysutils/memtest/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/07/09 16:31:36 wiz Exp $
 
-SHA1 (memtest86-2.5.tar.gz) = af453d155a1610fc51e03238aa5785b491a8985f
-Size (memtest86-2.5.tar.gz) = 69926 bytes
-SHA1 (patch-aa) = e5ce3801bf4e6bdeb2c1a9364130efb8e497fe86
+SHA1 (memtest86-2.6.tar.gz) = 2932b0b60ee02e6ecc4b567d58b4fba6034400c6
+Size (memtest86-2.6.tar.gz) = 74051 bytes
+SHA1 (patch-aa) = 6f04b5932e01f4b534166dbd20e73ccb097f555d
 SHA1 (patch-ab) = 297a1b9bdf2c7c1fa38fb69f7f185b3c8f800754
 SHA1 (patch-ac) = cb34cf3b81920d792d88f51b9ebcfbfff7773d4a
diff --git a/sysutils/memtest/patches/patch-aa b/sysutils/memtest/patches/patch-aa
index f50b5e65a4d..bbc903030af 100644
--- a/sysutils/memtest/patches/patch-aa
+++ b/sysutils/memtest/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/09 16:31:36 wiz Exp $
 
---- Makefile.orig	Sun Apr  8 22:21:04 2001
-+++ Makefile	Mon Apr  9 18:41:18 2001
+--- Makefile.orig	Sat Jul  7 23:52:34 2001
++++ Makefile	Sat Jul  7 23:54:30 2001
 @@ -6,7 +6,7 @@
  #
  # Path for the floppy disk device
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
  
  CC=gcc
  #
-@@ -63,11 +63,7 @@
+@@ -69,11 +69,8 @@
  		$(REL_DAT_ADR) -Map mapfile.relo $(OBJS)
  
  relo.out: relo
@@ -21,12 +21,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
 -	    $(OBJCOPY) relo relo.out; \
 -	fi
 +	$(OBJCOPY) relo relo.out
- 
- head.o: head.s
- 	as -o $@ $<
-@@ -76,11 +72,7 @@
- 	ld -m elf_i386 -o $@ -e do_test -Ttext $(TXT_ADR) -Tdata $(DAT_ADR) \
++
+ 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; \
@@ -35,5 +36,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/04/27 11:28:32 agc Exp $
 -	fi
 +	$(OBJCOPY) head head.out
  
- head.s: head.S test.h
- 	$(CC) -E -traditional $< -o $@
+ head.obj: head.out
+ 	ld -r -o $@ -T head.lds -b binary $^
diff --git a/sysutils/memtest/pkg/MESSAGE b/sysutils/memtest/pkg/MESSAGE
index 9b9c1a06c95..72a4d6ab83c 100644
--- a/sysutils/memtest/pkg/MESSAGE
+++ b/sysutils/memtest/pkg/MESSAGE
@@ -5,4 +5,4 @@ Memtest86 on a floppy, insert a disk then type:
 
 Please read the documentation at:
 	${PREFIX}/share/doc/memtest/README
-	http://reality.sgi.com/cbrady_denver/memtest86/
+	http://www.memtest86.com