diff options
-rw-r--r-- | sysutils/memtestplus/Makefile | 16 | ||||
-rw-r--r-- | sysutils/memtestplus/distinfo | 13 | ||||
-rw-r--r-- | sysutils/memtestplus/options.mk | 4 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-aa | 23 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-ab | 15 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-ae | 12 |
6 files changed, 50 insertions, 33 deletions
diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile index 6dff1afff5c..688fe5407dc 100644 --- a/sysutils/memtestplus/Makefile +++ b/sysutils/memtestplus/Makefile @@ -1,11 +1,14 @@ -# $NetBSD: Makefile,v 1.7 2008/03/25 16:48:45 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2008/11/24 04:06:00 smb Exp $ # -DISTNAME= memtest86+-1.70 -PKGNAME= memtestplus-1.70 -PKGREVISION= +# Note -- version number also in the do-install rule +MAJVER=2 +MINVER=10 + +DISTNAME= memtest86+-${MAJVER}.${MINVER} +PKGNAME= memtestplus-${MAJVER}.${MINVER} CATEGORIES= sysutils -MASTER_SITES= http://www.memtest.org/download/1.70/ +MASTER_SITES= http://www.memtest.org/download/${MAJVER}.${MINVER}/ MAINTAINER= smb@NetBSD.org HOMEPAGE= http://www.memtest.org/ @@ -14,7 +17,6 @@ COMMENT= Thorough, stand alone memory test for x86 arch ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64 USE_TOOLS+= gmake - SUBST_CLASSES+= delcr SUBST_STAGE.delcr= post-build SUBST_MESSAGE.delcr= Deleting CRs @@ -31,7 +33,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/memtestplus ${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/memtestplus .if !empty(PKG_OPTIONS:Miso) - ${INSTALL_DATA} ${WRKSRC}/memtest.iso ${PREFIX}/mdec/memtestplus.iso + ${INSTALL_DATA} ${WRKSRC}/mt${MAJVER}${MINVER}.iso ${PREFIX}/mdec/memtestplus.iso .endif .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/memtestplus/distinfo b/sysutils/memtestplus/distinfo index 3debe41a6ee..964a2dceea1 100644 --- a/sysutils/memtestplus/distinfo +++ b/sysutils/memtestplus/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.4 2007/12/30 18:40:52 mlelstv Exp $ +$NetBSD: distinfo,v 1.5 2008/11/24 04:06:00 smb Exp $ -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) = 353ad29222c68dfb9b9150061b4f965389257ccc +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 diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk index 7b8f3b59b16..fd54d147ace 100644 --- a/sysutils/memtestplus/options.mk +++ b/sysutils/memtestplus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:13 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2008/11/24 04:06:00 smb Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus PKG_SUPPORTED_OPTIONS= iso serialconsole @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= PLIST_VARS+= iso .if !empty(PKG_OPTIONS:Miso) -BUILD_TARGET= memtest.iso +BUILD_TARGET= iso BUILD_DEPENDS+= {cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools PLIST.iso= yes .endif diff --git a/sysutils/memtestplus/patches/patch-aa b/sysutils/memtestplus/patches/patch-aa index 1240d9619d6..ef75209f241 100644 --- a/sysutils/memtestplus/patches/patch-aa +++ b/sysutils/memtestplus/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2007/01/06 22:26:55 smb Exp $ +$NetBSD: patch-aa,v 1.3 2008/11/24 04:06:00 smb Exp $ ---- Makefile.orig 2005-09-11 14:17:15.000000000 -0400 -+++ Makefile 2006-10-21 15:38:58.000000000 -0400 +--- Makefile.orig 2008-10-24 22:43:43.000000000 -0400 ++++ Makefile 2008-11-23 21:31:38.000000000 -0500 @@ -6,7 +6,7 @@ # # Path for the floppy disk device @@ -9,14 +9,13 @@ $NetBSD: patch-aa,v 1.2 2007/01/06 22:26:55 smb Exp $ -FDISK=/dev/fd0 +FDISK=/dev/fd0a + AS=as -32 CC=gcc - # -@@ -119,3 +119,8 @@ +@@ -58,7 +58,6 @@ + iso: + make all + ./makeiso.sh +- rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin - install-bin: - dd <precomp.bin >$(FDISK) bs=8192 -+ -+iso: memtest.iso -+ -+memtest.iso: memtest.bin memtest -+ ./makeiso.sh + install: all + dd <memtest.bin >$(FDISK) bs=8192 diff --git a/sysutils/memtestplus/patches/patch-ab b/sysutils/memtestplus/patches/patch-ab index a7f412cfba9..5bc55e97778 100644 --- a/sysutils/memtestplus/patches/patch-ab +++ b/sysutils/memtestplus/patches/patch-ab @@ -1,6 +1,8 @@ ---- 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 @@ +$NetBSD: patch-ab,v 1.3 2008/11/24 04:06:00 smb 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 @@ #include "test.h" #include "config.h" @@ -29,10 +31,11 @@ + return _v; +} + - - extern int segs, bail, beepmode; ++ + extern int segs, bail; extern volatile ulong *p; -@@ -1753,18 +1774,18 @@ + extern ulong p1, p2; +@@ -1407,18 +1429,18 @@ unsigned int count = 1193180 / frequency; // Switch on the speaker diff --git a/sysutils/memtestplus/patches/patch-ae b/sysutils/memtestplus/patches/patch-ae new file mode 100644 index 00000000000..559d7637816 --- /dev/null +++ b/sysutils/memtestplus/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 2008/11/24 04:06:00 smb Exp $ + +--- error.c.orig 2008-11-23 21:23:53.000000000 -0500 ++++ error.c 2008-11-23 21:23:59.000000000 -0500 +@@ -11,7 +11,6 @@ + + #include "test.h" + #include "config.h" +-#include <sys/io.h> + #include "dmi.h" + + extern int test_ticks, nticks, beepmode; |