Update to Version 1.70. Also rename the package option

from memtesplus-* (sic!) to just iso and serialconsole.

changes for the new version:

- Added new DMI polling feature
- Added Support for Core/Core2 Solo/Duo/Quad CPU
- Added Support for AMD K8 with DDR2 Memory
- Added Support for Intel CPU with 192/384 KB L2 Cache
- Added Support for FB-DIMM based memory (DMI)
- Added Detection for ALI CyberAladdin-T (M1644)
- Added Detection for Turion 64 X2
- Added Detection for AMD K8 with unknown chipsets
- Added Support for ATi Radeon xPress 3200
- Added Support for Intel i975X
- Added Support for Intel Q965/P965
- Added Support for Intel Q963/Q965

4 files changed, 22 insertions, 23 deletions

diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile
index 6fa1edab61d..ccd53d3cc18 100644
--- a/sysutils/memtestplus/Makefile
+++ b/sysutils/memtestplus/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/30 18:40:52 mlelstv Exp $
 #
 
-DISTNAME=		memtest86+-1.65
-PKGNAME=		memtestplus-1.65
-PKGREVISION=		3
+DISTNAME=		memtest86+-1.70
+PKGNAME=		memtestplus-1.70
+PKGREVISION=
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.memtest.org/download/1.65/
+MASTER_SITES=		http://www.memtest.org/download/1.70/
 
 MAINTAINER=		smb@NetBSD.org
 HOMEPAGE=		http://www.memtest.org/
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/memtestplus
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/memtestplus
 	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/memtestplus
-.if !empty(PKG_OPTIONS:Mmemtesplus-iso)
+.if !empty(PKG_OPTIONS:Miso)
 	${INSTALL_DATA} ${WRKSRC}/memtest.iso ${PREFIX}/mdec/memtestplus.iso
 .endif
 
diff --git a/sysutils/memtestplus/distinfo b/sysutils/memtestplus/distinfo
index 1810b09d97d..3debe41a6ee 100644
--- a/sysutils/memtestplus/distinfo
+++ b/sysutils/memtestplus/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2007/01/06 22:26:55 smb Exp $
+$NetBSD: distinfo,v 1.4 2007/12/30 18:40:52 mlelstv Exp $
 
-SHA1 (memtest86+-1.65.tar.gz) = f9c27f813cc9ada7efe98e6dc587ab6d2c496ba1
-RMD160 (memtest86+-1.65.tar.gz) = 629379f7660dbc6ab071a9d9839ce0528752dda8
-Size (memtest86+-1.65.tar.gz) = 146203 bytes
+SHA1 (memtest86+-1.70.tar.gz) = d090699df558fc7f48604955c91fba1d06754661
+RMD160 (memtest86+-1.70.tar.gz) = 2320f50eb20d31f110103fd14136f92ade627df2
+Size (memtest86+-1.70.tar.gz) = 150198 bytes
 SHA1 (patch-aa) = 89cd60ebfa986ff03a23f751e80524c2a8f8e3de
-SHA1 (patch-ab) = defa256b698c32a40e4274597f3de79c1ea8eb10
+SHA1 (patch-ab) = 353ad29222c68dfb9b9150061b4f965389257ccc
 SHA1 (patch-ac) = 8aea1db5be861ba894ce677b2a0252d81bf62504
 SHA1 (patch-ad) = ec86b73981ffbd412e0bc1ec3af12306a98af549
diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk
index c98a0249c80..9e892e7c8ce 100644
--- a/sysutils/memtestplus/options.mk
+++ b/sysutils/memtestplus/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2007/01/06 22:26:55 smb Exp $
+# $NetBSD: options.mk,v 1.3 2007/12/30 18:40:52 mlelstv Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.memtestplus
-PKG_SUPPORTED_OPTIONS=	memtesplus-iso memtesplus-serialconsole
+PKG_SUPPORTED_OPTIONS=	iso serialconsole
 PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mmemtesplus-iso)
+.if !empty(PKG_OPTIONS:Miso)
 BUILD_TARGET=		memtest.iso
 BUILD_DEPENDS+=		{cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools
 PLIST_SUBST+=		HAVE_ISO=""
@@ -14,7 +14,7 @@ PLIST_SUBST+=		HAVE_ISO=""
 PLIST_SUBST+=		HAVE_ISO="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mmemtesplus-serialconsole)
+.if !empty(PKG_OPTIONS:Mserialconsole)
 SUBST_CLASSES+=		serialopt
 SUBST_STAGE.serialopt=	post-patch
 SUBST_MESSAGE.serialopt=	Setting serial console option
diff --git a/sysutils/memtestplus/patches/patch-ab b/sysutils/memtestplus/patches/patch-ab
index 64da2da0e43..a7f412cfba9 100644
--- a/sysutils/memtestplus/patches/patch-ab
+++ b/sysutils/memtestplus/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2006/10/24 18:00:06 smb Exp $
-
---- test.c.orig	2005-09-11 14:17:15.000000000 -0400
-+++ test.c	2006-10-21 15:35:25.000000000 -0400
-@@ -11,7 +11,29 @@
+--- test.c.orig	2007-01-04 06:43:54.000000000 +0000
++++ test.c	2007-12-08 13:08:18.000000000 +0000
+@@ -11,9 +11,30 @@
  
  #include "test.h"
  #include "config.h"
 -#include <sys/io.h>
-+
+ #include "dmi.h"
+ 
 +static __inline void
 +pkg_outb (unsigned char value, unsigned short int port)
 +{
@@ -31,9 +30,9 @@ $NetBSD: patch-ab,v 1.1 2006/10/24 18:00:06 smb Exp $
 +}
 +
  
- 
  extern int segs, bail, beepmode;
-@@ -1741,18 +1763,18 @@
+ extern volatile ulong *p;
+@@ -1753,18 +1774,18 @@
  	unsigned int count = 1193180 / frequency;
  
  	// Switch on the speaker