Update memtestplus to 4.00. (With permission from smb@.)

Changes since 2.10:

Enhancements in v4.00:

* New Features
- Major Architectural changes
- First pass twice faster (reduced iterations)
- Detect DDR2/3 brands and part numbers on Intel DDR2/3 chipsets
- Added detection for Intel "Clarkdale" CPU
- Added detection for Intel "Gulftown" CPU
- Added detection for AMD "Magny-Cours" CPU
- Added detection for Intel XMP Memory
- Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3
- Added "clean" DMI detection for DDR3/FBDIMM2
- Better detection of Integrated Memory Controllers

* Bug Fixes
- Corrected detection for Intel "Lynnfield" CPU
- Corrected detection for AMD 45nm K10 CPU
- Solved crash with AMD Geode LX
- Complies with SMBIOS 2.6.1 specs
- Fixed compilation issues with gcc 4.2+
- Many others bug fixes

Memtest86+ "3.00" was skipped and renamed 4.00 in order to avoid confusion with the original Memtest.

Enhancements in v2.11 :
- Added support for Intel Core i5 (Lynnfield) CPU
- Added support for Intel P55 Southbridge
- Added support for Intel PM45/GM45/GM47 Mobile chipset
- Added support for Intel GL40/GS45 Mobile chipset
- Corrected DDR2/DDR3 detection on Intel x35/x45
- Corrected detection on some Core i7 CPU
- Fixed a bug with some AMI BIOS (freeze at startup)
- Various bug fixes

7 files changed, 34 insertions, 32 deletions

diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile
index e06f9feedd6..f366c9b3c41 100644
--- a/sysutils/memtestplus/Makefile
+++ b/sysutils/memtestplus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/05/19 22:26:13 abs Exp $
+# $NetBSD: Makefile,v 1.11 2009/11/24 17:20:40 jakllsch Exp $
 #
 
 # Note -- version number also in the do-install rule
-MAJVER=2
-MINVER=10
+MAJVER=4
+MINVER=00
 
 DISTNAME=		memtest86+-${MAJVER}.${MINVER}
 PKGNAME=		memtestplus-${MAJVER}.${MINVER}
@@ -13,6 +13,7 @@ MASTER_SITES=		http://www.memtest.org/download/${MAJVER}.${MINVER}/
 MAINTAINER=		smb@NetBSD.org
 HOMEPAGE=		http://www.memtest.org/
 COMMENT=		Thorough, stand alone memory test for x86 arch
+LICENSE=		gnu-gpl-v2
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64
 
diff --git a/sysutils/memtestplus/distinfo b/sysutils/memtestplus/distinfo
index 964a2dceea1..9f618ee2e1f 100644
--- a/sysutils/memtestplus/distinfo
+++ b/sysutils/memtestplus/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/11/24 04:06:00 smb Exp $
+$NetBSD: distinfo,v 1.6 2009/11/24 17:20:40 jakllsch Exp $
 
-SHA1 (memtest86+-2.10.tar.gz) = a687513b118fc3d43c2b83d9baed835eb2380786
-RMD160 (memtest86+-2.10.tar.gz) = e782d067899361bbf931206742318c136467c432
-Size (memtest86+-2.10.tar.gz) = 165987 bytes
-SHA1 (patch-aa) = 014c2f295b90d4d3c589d7a46555eff9cf5912ef
-SHA1 (patch-ab) = 4c837309e7825e9bb189e5cab8725485601851d4
-SHA1 (patch-ac) = 8aea1db5be861ba894ce677b2a0252d81bf62504
-SHA1 (patch-ad) = ec86b73981ffbd412e0bc1ec3af12306a98af549
-SHA1 (patch-ae) = ae69eff0bb556b0a87e418ad7ddadefbf48032b0
+SHA1 (memtest86+-4.00.tar.gz) = 15e77d79fe528e64e5803bff24048dd642f87c46
+RMD160 (memtest86+-4.00.tar.gz) = df039946c829fae3123336fbee0005afc2360e14
+Size (memtest86+-4.00.tar.gz) = 270327 bytes
+SHA1 (patch-aa) = d6d193813985ec996495c010a5733ade83d0811c
+SHA1 (patch-ab) = 8e5ce60b904763c030931a532f3b438968fca434
+SHA1 (patch-ac) = bd22ce71ddd2c3ce94cb45b51066535f86122292
+SHA1 (patch-ad) = aecaa5cee6a27d4e5beb9e3fc0c7efacf21eddf4
+SHA1 (patch-ae) = 64931515368b099a23c76468c837fae569cb3cc1
diff --git a/sysutils/memtestplus/patches/patch-aa b/sysutils/memtestplus/patches/patch-aa
index ef75209f241..84059e3ebf1 100644
--- a/sysutils/memtestplus/patches/patch-aa
+++ b/sysutils/memtestplus/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2008/11/24 04:06:00 smb Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
 
---- Makefile.orig	2008-10-24 22:43:43.000000000 -0400
-+++ Makefile	2008-11-23 21:31:38.000000000 -0500
+--- Makefile.orig	2009-09-22 00:35:46.000000000 +0000
++++ Makefile
 @@ -6,7 +6,7 @@
  #
  # Path for the floppy disk device
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2008/11/24 04:06:00 smb Exp $
  
  AS=as -32
  CC=gcc
-@@ -58,7 +58,6 @@
+@@ -61,7 +61,6 @@ asm:
  iso:
  	make all
  	./makeiso.sh
diff --git a/sysutils/memtestplus/patches/patch-ab b/sysutils/memtestplus/patches/patch-ab
index 5bc55e97778..07192eb3a92 100644
--- a/sysutils/memtestplus/patches/patch-ab
+++ b/sysutils/memtestplus/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.3 2008/11/24 04:06:00 smb Exp $
+$NetBSD: patch-ab,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
 
---- test.c.orig	2008-11-23 21:19:09.000000000 -0500
-+++ test.c	2008-11-23 21:22:18.000000000 -0500
-@@ -11,9 +11,31 @@
+--- test.c.orig	2009-09-22 00:35:46.000000000 +0000
++++ test.c
+@@ -11,10 +11,32 @@
  
  #include "test.h"
  #include "config.h"
 -#include <sys/io.h>
  #include "dmi.h"
+ #include <inttypes.h>
  
 +static __inline void
 +pkg_outb (unsigned char value, unsigned short int port)
@@ -35,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2008/11/24 04:06:00 smb Exp $
  extern int segs, bail;
  extern volatile ulong *p;
  extern ulong p1, p2;
-@@ -1407,18 +1429,18 @@
+@@ -1414,18 +1436,18 @@ void beep(unsigned int frequency)
  	unsigned int count = 1193180 / frequency;
  
  	// Switch on the speaker
diff --git a/sysutils/memtestplus/patches/patch-ac b/sysutils/memtestplus/patches/patch-ac
index ec70b24be75..4cf2f451077 100644
--- a/sysutils/memtestplus/patches/patch-ac
+++ b/sysutils/memtestplus/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2007/01/06 22:26:55 smb Exp $
+$NetBSD: patch-ac,v 1.3 2009/11/24 17:20:40 jakllsch Exp $
 
---- memtest.lds.orig	2005-09-11 20:17:15.000000000 +0200
+--- memtest.lds.orig	2009-09-22 00:35:46.000000000 +0000
 +++ memtest.lds
-@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);
+@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);

  

  ENTRY(_start); 

  SECTIONS {

diff --git a/sysutils/memtestplus/patches/patch-ad b/sysutils/memtestplus/patches/patch-ad
index 4c2b965ab27..ff9a136f3fc 100644
--- a/sysutils/memtestplus/patches/patch-ad
+++ b/sysutils/memtestplus/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2007/01/06 22:26:55 smb Exp $
+$NetBSD: patch-ad,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
 
---- README.orig	2007-01-06 13:34:46.000000000 -0500
-+++ README	2007-01-06 13:35:15.000000000 -0500
-@@ -180,7 +180,7 @@
+--- README.orig	2009-09-22 00:35:46.000000000 +0000
++++ README
+@@ -174,7 +174,7 @@ individual errors.  In BadRAM Patterns m
  use with the Linux BadRAM feature.  This slick feature allows Linux to

  avoid bad memory pages.  Details about the BadRAM feature can be found at:

  

diff --git a/sysutils/memtestplus/patches/patch-ae b/sysutils/memtestplus/patches/patch-ae
index 559d7637816..fd6afc844a1 100644
--- a/sysutils/memtestplus/patches/patch-ae
+++ b/sysutils/memtestplus/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2008/11/24 04:06:00 smb Exp $
+$NetBSD: patch-ae,v 1.2 2009/11/24 17:20:40 jakllsch Exp $
 
---- error.c.orig	2008-11-23 21:23:53.000000000 -0500
-+++ error.c	2008-11-23 21:23:59.000000000 -0500
+--- error.c.orig	2009-09-22 00:35:46.000000000 +0000
++++ error.c
 @@ -11,7 +11,6 @@
   
  #include "test.h"
  #include "config.h"
 -#include <sys/io.h>
  #include "dmi.h"
+ #define NULL 0
  
- extern int test_ticks, nticks, beepmode;