Update memtest86 to version 3.1a. Notable changes since 2.9:

* testing more than 2gb of memory
* support for some ECC error reporting chipsets
* serial console improvements
* netbooting is fixed
* LinuxBIOS support
* add new "bit fade" extended test
* use dynamic relocation information records to become PIC, instead of
  requiring 2 copies of memtest86 in the binary
* many bugfixes

5 files changed, 10 insertions, 81 deletions

diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index 45fdead6266..383bf12979a 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 15:06:58 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/08 13:01:18 ben Exp $
 #
 
-DISTNAME=		memtest86-2.9
+DISTNAME=		memtest86-3.1a
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.memtest86.com/
 
@@ -11,17 +11,14 @@ COMMENT=		Thorough, stand alone memory test for x86 arch
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
-post-patch:
-	${CP} ${FILESDIR}/linkage.h ${WRKSRC}
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/mdec
 	${CP} ${WRKSRC}/memtest.bin ${PREFIX}/mdec
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/memtest
 	${CP} ${WRKSRC}/README ${PREFIX}/share/doc/memtest
 
-.include "../../devel/binutils/buildlink2.mk"
+.include "../../devel/binutils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memtest86/distinfo b/sysutils/memtest86/distinfo
index 147399dde2b..2c0faa27ba2 100644
--- a/sysutils/memtest86/distinfo
+++ b/sysutils/memtest86/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/03/07 15:05:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/08 13:01:18 ben Exp $
 
-SHA1 (memtest86-2.9.tar.gz) = fdddc9549e429cbef55e0d88f0e0807f98359b9b
-Size (memtest86-2.9.tar.gz) = 94658 bytes
-SHA1 (patch-aa) = 871b7ea0ed70c8a1754f03bf6458c44e88bae353
-SHA1 (patch-ab) = 297a1b9bdf2c7c1fa38fb69f7f185b3c8f800754
+SHA1 (memtest86-3.1a.tar.gz) = 819bc8eab29b049db3a25c7efab86e1af1c8a236
+Size (memtest86-3.1a.tar.gz) = 142729 bytes
+SHA1 (patch-aa) = 17feab87ad3a9755f19b8eda1b9eb3696721b34e
diff --git a/sysutils/memtest86/files/linkage.h b/sysutils/memtest86/files/linkage.h
deleted file mode 100644
index 190202f0589..00000000000
--- a/sysutils/memtest86/files/linkage.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LINUX_LINKAGE_H
-#define _LINUX_LINKAGE_H
-
-#ifdef __cplusplus
-#define CPP_ASMLINKAGE extern "C"
-#else
-#define CPP_ASMLINKAGE
-#endif
-
-#if defined __i386__ && (__GNUC__ > 2 || __GNUC_MINOR__ > 7)
-#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
-#else
-#define asmlinkage CPP_ASMLINKAGE
-#endif
-
-#define SYMBOL_NAME_STR(X) #X
-#define SYMBOL_NAME(X) X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X) X##:
-#else
-#define SYMBOL_NAME_LABEL(X) X/**/:
-#endif
-
-#ifdef __arm__
-#define __ALIGN .align 0
-#define __ALIGN_STR ".align 0"
-#else
-#ifdef __mc68000__
-#define __ALIGN .align 4
-#define __ALIGN_STR ".align 4"
-#else
-#if !defined(__i486__) && !defined(__i586__)
-#define __ALIGN .align 4,0x90
-#define __ALIGN_STR ".align 4,0x90"
-#else  /* __i486__/__i586__ */
-#define __ALIGN .align 16,0x90
-#define __ALIGN_STR ".align 16,0x90"
-#endif /* __i486__/__i586__ */
-#endif /* __mc68000__ */
-#endif /* __arm__ */
-
-#ifdef __ASSEMBLY__
-
-#define ALIGN __ALIGN
-#define ALIGN_STR __ALIGN_STR
-
-#define ENTRY(name) \
-  .globl SYMBOL_NAME(name); \
-  ALIGN; \
-  SYMBOL_NAME_LABEL(name)
-
-#endif
-
-#endif
diff --git a/sysutils/memtest86/patches/patch-aa b/sysutils/memtest86/patches/patch-aa
index 60e3542841c..f74cd5abbcf 100644
--- a/sysutils/memtest86/patches/patch-aa
+++ b/sysutils/memtest86/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/08 13:01:18 ben Exp $
 
---- Makefile.orig	Wed Oct 24 16:57:16 2001
+--- Makefile.orig	Thu Mar 11 08:56:32 2004
 +++ Makefile
 @@ -6,7 +6,7 @@
  #
diff --git a/sysutils/memtest86/patches/patch-ab b/sysutils/memtest86/patches/patch-ab
deleted file mode 100644
index 5dabab20320..00000000000
--- a/sysutils/memtest86/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
-
---- head.S.orig	Sun Apr  8 22:37:53 2001
-+++ head.S	Sun Apr  8 22:56:59 2001
-@@ -15,7 +15,7 @@
- .global idt_descr
- .global trap_regs
- 
--#include <linux/linkage.h>
-+#include "linkage.h"
- #include "defs.h"
- #include "config.h"
-