Update memtest86 to 4.0.

Based on PR 45754 by Radoslaw Kujawa.

Enhancements in v4.0 (28/Mar/2011)
* Support for testing with multiple CPUs. All tests except for #11 (Bit Fade)
  have been multi-threaded. A maximum of 16 CPUs will be used for testing.
* CPU detection has been completely re-written to use the brand ID string rather
  than the cumbersome, difficult to maintain and often out of date CPUID family
  information. All new processors will now be correctly identified without
  requiring code support.
* All code related to controller identification, PCI and DMI has been removed.
  This may be a controversial decision and was not made lightly. The following
  are justifications for the decision:
    1. Controller identification has nothing to do with actual testing of memory,
     the core purpose of Memtest86.
    2. This code needed to be updated with every new chipset. With the ever
       growing number of chipsets it is not possible to keep up with the changes.
       The result is that new chipsets were more often than not reported
       in-correctly. In the authors opinion incorrect information is worse
       than no information.
    3. Probing for chipset information carries the risk of making the program
       crash.
    4. The amount of code involved with controller identification was quite
       large, making support more difficult.

  Removing this code also had the unfortunate effect of removing reporting of
  correctable ECC errors. The code to support ECC was hopelessly intertwined the
  controller identification code. A fresh, streamlined implementation of ECC
  reporting is planned for a future release.
* A surprising number of conditions existed that potentially cause problems when
  testing more than 4 GB of memory. Most if not all of these conditions have
  been identified and corrected.
* A number of cases were corrected where not all of memory was being tested. For
  most tests the last word of each test block was not tested. In addition an
  error in the paging code was fixed that omitted from testing the last 256
  bytes of each block above 2 GB.
* The information display has been simplified and a number of details that were
  not relevant to testing were removed.
* Memory speed measurement has been parallelized for more accurate reporting for
  multi channel memory controllers.
* This is a major re-write of the Memtest86 with a large number of minor
  bug-fixes and substantial cleanup and re-organization of the code.

3 files changed, 8 insertions, 25 deletions

diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index 130d4990c4e..c0b7bee99d0 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2009/12/12 19:34:46 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/02/19 11:14:32 obache Exp $
 #
 
-DISTNAME=		memtest86-3.4
-PKGREVISION=		1
+DISTNAME=		memtest86-4.0
 CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_FREEBSD} \
-					${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES=		${MASTER_SITE_FREEBSD}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.memtest86.com/
 COMMENT=		Thorough, stand alone memory test for x86 arch
+LICENSE=		gnu-gpl-v2
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
 
@@ -17,8 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 
-DIST_SUBDIR=		${PKGNAME}
-
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/mdec
 	${INSTALL_DATA} ${WRKSRC}/memtest ${DESTDIR}${PREFIX}/mdec
diff --git a/sysutils/memtest86/distinfo b/sysutils/memtest86/distinfo
index 24416a45a4e..f506f6a10e5 100644
--- a/sysutils/memtest86/distinfo
+++ b/sysutils/memtest86/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/03/25 16:47:00 tnn Exp $
+$NetBSD: distinfo,v 1.8 2012/02/19 11:14:32 obache Exp $
 
-SHA1 (memtest86-3.4nb1/memtest86-3.4.tar.gz) = 3af9e20888401e9d0eb3eab4e793a48f0520c436
-RMD160 (memtest86-3.4nb1/memtest86-3.4.tar.gz) = 8a4e2bddfd75e7d07a0448dc8b94dd29e67800d5
-Size (memtest86-3.4nb1/memtest86-3.4.tar.gz) = 201204 bytes
-SHA1 (patch-aa) = 5b5b6dbf98527d541a4a54857352286e4d853275
+SHA1 (memtest86-4.0.tar.gz) = 1cf38d24c7a9f9560459534687e26d3c4eeb07cc
+RMD160 (memtest86-4.0.tar.gz) = 84cc12957741950ff8d26b8847875b77eeceb6ae
+Size (memtest86-4.0.tar.gz) = 134766 bytes
diff --git a/sysutils/memtest86/patches/patch-aa b/sysutils/memtest86/patches/patch-aa
deleted file mode 100644
index c93772f06ff..00000000000
--- a/sysutils/memtest86/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/12/30 18:16:16 mlelstv Exp $
-
---- Makefile.orig	Thu Mar 11 08:56:32 2004
-+++ Makefile
-@@ -6,7 +6,7 @@
- #
- # Path for the floppy disk device
- #
--FDISK=/dev/fd0
-+FDISK=/dev/fd0a
- 
- CC=gcc
-