Re-import memtest as memtest86 (more similar to its original name, and

who knows, a memtest package might come soon ;).

8 files changed, 133 insertions, 0 deletions

diff --git a/sysutils/memtest86/DESCR b/sysutils/memtest86/DESCR
new file mode 100644
index 00000000000..10447372f18
--- /dev/null
+++ b/sysutils/memtest86/DESCR
@@ -0,0 +1,3 @@
+Memtest86 is a thorough, stand alone memory test for i386 architecture
+systems.  BIOS-based memory tests are only a quick check and often miss
+failures that are detected by Memtest86.
diff --git a/sysutils/memtest86/MESSAGE b/sysutils/memtest86/MESSAGE
new file mode 100644
index 00000000000..6c221b3f9f5
--- /dev/null
+++ b/sysutils/memtest86/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+
+Memtest86 is a standalone program, it does not run within an operating
+system.  It has been designed to boot from a PC floppy disk.  To install
+Memtest86 on a floppy, insert a disk then type:
+	dd if=${PREFIX}/mdec/memtest.bin of=/dev/fd0a
+
+Please read the documentation at:
+	${PREFIX}/share/doc/memtest/README
+	http://www.memtest86.com
+
+===========================================================================
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
new file mode 100644
index 00000000000..bbc6cc32e51
--- /dev/null
+++ b/sysutils/memtest86/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+#
+
+DISTNAME=		memtest86-2.8a
+PKGNAME=		memtest86-2.8.1
+CATEGORIES=		sysutils
+MASTER_SITES=		http://www.memtest86.com/
+
+MAINTAINER=		collver@linuxfreemail.com
+HOMEPAGE=		http://www.memtest86.com/
+COMMENT=		thorough, stand alone memory test for x86 arch
+
+USE_GMAKE=		yes
+ONLY_FOR_PLATFORM=	NetBSD-1.5[Y-Z]*-i386 NetBSD-1.[6-9]*-i386
+WRKSRC=			${WRKDIR}/${DISTNAME:S/a$//}
+
+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 "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memtest86/PLIST b/sysutils/memtest86/PLIST
new file mode 100644
index 00000000000..9de6b627e8c
--- /dev/null
+++ b/sysutils/memtest86/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+mdec/memtest.bin
+share/doc/memtest/README
+@dirrm mdec
+@dirrm share/doc/memtest
diff --git a/sysutils/memtest86/distinfo b/sysutils/memtest86/distinfo
new file mode 100644
index 00000000000..2855850b385
--- /dev/null
+++ b/sysutils/memtest86/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+
+SHA1 (memtest86-2.8a.tar.gz) = caba12ced3a30f5a2058f2dcfcb4b7e9ebcf312d
+Size (memtest86-2.8a.tar.gz) = 77185 bytes
+SHA1 (patch-aa) = 871b7ea0ed70c8a1754f03bf6458c44e88bae353
+SHA1 (patch-ab) = 297a1b9bdf2c7c1fa38fb69f7f185b3c8f800754
diff --git a/sysutils/memtest86/files/linkage.h b/sysutils/memtest86/files/linkage.h
new file mode 100644
index 00000000000..190202f0589
--- /dev/null
+++ b/sysutils/memtest86/files/linkage.h
@@ -0,0 +1,54 @@
+#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
new file mode 100644
index 00000000000..60e3542841c
--- /dev/null
+++ b/sysutils/memtest86/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
+
+--- Makefile.orig	Wed Oct 24 16:57:16 2001
++++ Makefile
+@@ -6,7 +6,7 @@
+ #
+ # Path for the floppy disk device
+ #
+-FDISK=/dev/fd0
++FDISK=/dev/fd0a
+ 
+ CC=gcc
+ #
diff --git a/sysutils/memtest86/patches/patch-ab b/sysutils/memtest86/patches/patch-ab
new file mode 100644
index 00000000000..5dabab20320
--- /dev/null
+++ b/sysutils/memtest86/patches/patch-ab
@@ -0,0 +1,13 @@
+$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"
+