diff options
author | smb <smb@pkgsrc.org> | 2007-01-06 22:26:55 +0000 |
---|---|---|
committer | smb <smb@pkgsrc.org> | 2007-01-06 22:26:55 +0000 |
commit | 038a629f3236ef12808f7fda526403224af8f1fa (patch) | |
tree | 92e4278a01bb6aa8b21bae7c9f02814d14a4f6dd | |
parent | 786f517922862669c4f784242cd924bdf8f28978 (diff) | |
download | pkgsrc-038a629f3236ef12808f7fda526403224af8f1fa.tar.gz |
Several fixes:
a) 'make install' was broken if option memtestplus-iso was
specified
b) patch-ac wouldn't pass pkglint
c) correct document for the BadRAM link
d) add compilation support for 64-bit i386 ports
-rw-r--r-- | sysutils/memtestplus/Makefile | 4 | ||||
-rw-r--r-- | sysutils/memtestplus/distinfo | 7 | ||||
-rw-r--r-- | sysutils/memtestplus/options.mk | 4 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-aa | 4 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-ac | 4 | ||||
-rw-r--r-- | sysutils/memtestplus/patches/patch-ad | 13 |
6 files changed, 25 insertions, 11 deletions
diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile index 46600adcccb..41ddaf7bbd0 100644 --- a/sysutils/memtestplus/Makefile +++ b/sysutils/memtestplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/11/01 15:38:15 mlelstv Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/06 22:26:55 smb Exp $ # DISTNAME= memtest86+-1.65 @@ -11,7 +11,7 @@ MAINTAINER= smb@NetBSD.org HOMEPAGE= http://www.memtest.org/ COMMENT= Thorough, stand alone memory test for x86 arch -ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 +ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 NetBSD-*-x86_64 Linux-*-x86_64 USE_TOOLS+= gmake diff --git a/sysutils/memtestplus/distinfo b/sysutils/memtestplus/distinfo index e690afb3d7b..1810b09d97d 100644 --- a/sysutils/memtestplus/distinfo +++ b/sysutils/memtestplus/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.2 2006/11/01 15:38:15 mlelstv Exp $ +$NetBSD: distinfo,v 1.3 2007/01/06 22:26:55 smb Exp $ SHA1 (memtest86+-1.65.tar.gz) = f9c27f813cc9ada7efe98e6dc587ab6d2c496ba1 RMD160 (memtest86+-1.65.tar.gz) = 629379f7660dbc6ab071a9d9839ce0528752dda8 Size (memtest86+-1.65.tar.gz) = 146203 bytes -SHA1 (patch-aa) = db53250c1c2cef5b3dd369f55ea91981272d8530 +SHA1 (patch-aa) = 89cd60ebfa986ff03a23f751e80524c2a8f8e3de SHA1 (patch-ab) = defa256b698c32a40e4274597f3de79c1ea8eb10 -SHA1 (patch-ac) = 9bc3afa1bc7fe59cc2875fcdc90c6660593d8b89 +SHA1 (patch-ac) = 8aea1db5be861ba894ce677b2a0252d81bf62504 +SHA1 (patch-ad) = ec86b73981ffbd412e0bc1ec3af12306a98af549 diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk index 3b635e55502..c98a0249c80 100644 --- a/sysutils/memtestplus/options.mk +++ b/sysutils/memtestplus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2006/10/24 18:00:05 smb Exp $ +# $NetBSD: options.mk,v 1.2 2007/01/06 22:26:55 smb Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus PKG_SUPPORTED_OPTIONS= memtesplus-iso memtesplus-serialconsole @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= .if !empty(PKG_OPTIONS:Mmemtesplus-iso) BUILD_TARGET= memtest.iso -BUILD_DEPENDS+= cdrtools>=2.01:../../sysutils/cdrtools +BUILD_DEPENDS+= {cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools PLIST_SUBST+= HAVE_ISO="" .else PLIST_SUBST+= HAVE_ISO="@comment " diff --git a/sysutils/memtestplus/patches/patch-aa b/sysutils/memtestplus/patches/patch-aa index 77ed7538ec3..1240d9619d6 100644 --- a/sysutils/memtestplus/patches/patch-aa +++ b/sysutils/memtestplus/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2006/10/24 18:00:06 smb Exp $ +$NetBSD: patch-aa,v 1.2 2007/01/06 22:26:55 smb Exp $ --- Makefile.orig 2005-09-11 14:17:15.000000000 -0400 +++ Makefile 2006-10-21 15:38:58.000000000 -0400 @@ -18,5 +18,5 @@ $NetBSD: patch-aa,v 1.1 2006/10/24 18:00:06 smb Exp $ + +iso: memtest.iso + -+memtest.iso: memtest.bin ++memtest.iso: memtest.bin memtest + ./makeiso.sh diff --git a/sysutils/memtestplus/patches/patch-ac b/sysutils/memtestplus/patches/patch-ac index 52a86d21dfb..ec70b24be75 100644 --- a/sysutils/memtestplus/patches/patch-ac +++ b/sysutils/memtestplus/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2006/11/01 15:38:15 mlelstv Exp $ +$NetBSD: patch-ac,v 1.2 2007/01/06 22:26:55 smb Exp $ --- memtest.lds.orig 2005-09-11 20:17:15.000000000 +0200 +++ 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 new file mode 100644 index 00000000000..4c2b965ab27 --- /dev/null +++ b/sysutils/memtestplus/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2007/01/06 22:26:55 smb Exp $ + +--- README.orig 2007-01-06 13:34:46.000000000 -0500 ++++ README 2007-01-06 13:35:15.000000000 -0500 +@@ -180,7 +180,7 @@ + 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:
+
+- http://home.zonnet.nl/vanrein/badram
++ http://rick.vanrein.org/linux/badram/
+
+ For individual errors the following information is displayed when a memory
+ error is detected. An error message is only displayed for errors with a
|