memtest has been renamed to memtest86.

9 files changed, 2 insertions, 135 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index de372c82281..9fb6b6a6511 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2002/03/04 20:10:15 abs Exp $
+# $NetBSD: Makefile,v 1.123 2002/03/07 14:46:20 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -56,7 +56,7 @@ SUBDIR+=	lsof
 SUBDIR+=	mc
 SUBDIR+=	medusa
 SUBDIR+=	memconf
-SUBDIR+=	memtest
+SUBDIR+=	memtest86
 SUBDIR+=	mgm
 SUBDIR+=	mkhybrid
 #SUBDIR+=	mkisofs			# currently part of cdrecord
diff --git a/sysutils/memtest/DESCR b/sysutils/memtest/DESCR
deleted file mode 100644
index 10447372f18..00000000000
--- a/sysutils/memtest/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-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/memtest/MESSAGE b/sysutils/memtest/MESSAGE
deleted file mode 100644
index 8ae4b2a3be6..00000000000
--- a/sysutils/memtest/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:31 hubertf 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/memtest/Makefile b/sysutils/memtest/Makefile
deleted file mode 100644
index f9c9dc94b60..00000000000
--- a/sysutils/memtest/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/01/24 15:50:45 wiz Exp $
-#
-
-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/
-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/memtest/PLIST b/sysutils/memtest/PLIST
deleted file mode 100644
index 00c16146646..00000000000
--- a/sysutils/memtest/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:29 zuntum Exp $
-mdec/memtest.bin
-share/doc/memtest/README
-@dirrm mdec
-@dirrm share/doc/memtest
diff --git a/sysutils/memtest/distinfo b/sysutils/memtest/distinfo
deleted file mode 100644
index d35a57a1947..00000000000
--- a/sysutils/memtest/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/12/25 22:08:52 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/memtest/files/linkage.h b/sysutils/memtest/files/linkage.h
deleted file mode 100644
index 190202f0589..00000000000
--- a/sysutils/memtest/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/memtest/patches/patch-aa b/sysutils/memtest/patches/patch-aa
deleted file mode 100644
index 95b79d7565e..00000000000
--- a/sysutils/memtest/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/12/25 22:08:52 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/memtest/patches/patch-ab b/sysutils/memtest/patches/patch-ab
deleted file mode 100644
index 2db32afcdaf..00000000000
--- a/sysutils/memtest/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 11:28:32 agc 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"
-