trying mandrake patch

3 files changed, 32 insertions, 26 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 54ef04a16c17..81c8c8ee95dd 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for sys-apps/memtest86
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.4 2002/09/22 04:28:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.5 2002/09/24 23:35:05 mkennedy Exp $
 
 *memtest86-3.0 (03 Jun 2002)
 
+  24 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org> :
+
+  Replace patch with mandrake patch. Still doesn't seem to work
+  properly though. Contacting upstream on this...
+
   22 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
   It looks like a patch was developed to fix a bug but then never actually
   added to the ebuild ... so i put in the patch line in src_compile #8203
diff --git a/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch b/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch
index 44980865fc13..902d4f415804 100644
--- a/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch
+++ b/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch
@@ -1,55 +1,55 @@
-diff -ur memtest86-3.0/config.c memtest86-3.0.m/config.c
---- memtest86-3.0/config.c	Tue May 21 13:27:11 2002
-+++ memtest86-3.0.m/config.c	Fri Jul 26 00:59:07 2002
-@@ -10,7 +10,6 @@
+--- memtest86-3.0/config.c~	2002-07-06 13:33:00.000000000 +0200
++++ memtest86-3.0/config.c	2002-07-06 13:33:00.000000000 +0200
+@@ -10,7 +10,7 @@
  
  extern int bail;
  extern struct tseq tseq[];
 -extern struct vars *v;
++//extern struct vars *v;
  extern short e820_nr;
  extern char memsz_mode;
  
-diff -ur memtest86-3.0/init.c memtest86-3.0.m/init.c
---- memtest86-3.0/init.c	Tue May 21 17:52:37 2002
-+++ memtest86-3.0.m/init.c	Fri Jul 26 00:58:42 2002
-@@ -11,7 +11,6 @@
+--- memtest86-3.0/init.c~	2002-07-06 13:32:18.000000000 +0200
++++ memtest86-3.0/init.c	2002-07-06 13:32:18.000000000 +0200
+@@ -11,7 +11,7 @@
  #include "pci.h"
  #include "io.h"
  
 -extern struct vars *v;
++//extern struct vars *v;
  extern short memsz_mode;
  extern short firmware;
  
-diff -ur memtest86-3.0/lib.c memtest86-3.0.m/lib.c
---- memtest86-3.0/lib.c	Tue May 21 18:12:07 2002
-+++ memtest86-3.0.m/lib.c	Fri Jul 26 00:58:49 2002
-@@ -9,7 +9,6 @@
+--- memtest86-3.0/lib.c~	2002-07-06 13:32:31.000000000 +0200
++++ memtest86-3.0/lib.c	2002-07-06 13:32:31.000000000 +0200
+@@ -9,7 +9,7 @@
  #include "config.h"
  #include "screen_buffer.h"
  
 -extern struct vars *v;
++//extern struct vars *v;
  
  int slock = 0, lsr = 0;
  short serial_cons = SERIAL_CONSOLE_DEFAULT;
-diff -ur memtest86-3.0/patn.c memtest86-3.0.m/patn.c
---- memtest86-3.0/patn.c	Wed Oct 17 18:30:32 2001
-+++ memtest86-3.0.m/patn.c	Fri Jul 26 00:58:58 2002
-@@ -18,7 +18,6 @@
+--- memtest86-3.0/patn.c~	2002-07-06 13:32:50.000000000 +0200
++++ memtest86-3.0/patn.c	2002-07-06 13:32:50.000000000 +0200
+@@ -18,7 +18,7 @@
  #define DEFAULT_MASK ((~0L) << 2)
  
  
 -extern struct vars *v;
++//extern struct vars *v;
  
  
  /* What it does:
-diff -ur memtest86-3.0/test.c memtest86-3.0.m/test.c
---- memtest86-3.0/test.c	Tue May 21 18:13:32 2002
-+++ memtest86-3.0.m/test.c	Fri Jul 26 00:58:33 2002
-@@ -9,7 +9,6 @@
+--- memtest86-3.0/test.c~	2002-07-06 13:32:05.000000000 +0200
++++ memtest86-3.0/test.c	2002-07-06 13:32:05.000000000 +0200
+@@ -9,7 +9,7 @@
  extern int segs, bail;
  extern volatile ulong *p;
  extern ulong p1, p2;
 -extern struct vars *v;
++//extern struct vars *v;
  extern int test_ticks, nticks;
  extern struct tseq tseq[];
  void poll_errors();
diff --git a/sys-apps/memtest86/memtest86-3.0.ebuild b/sys-apps/memtest86/memtest86-3.0.ebuild
index 1a841715b814..47516a7db7d4 100644
--- a/sys-apps/memtest86/memtest86-3.0.ebuild
+++ b/sys-apps/memtest86/memtest86-3.0.ebuild
@@ -31,20 +31,21 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1<${FILESDIR}/memtest86-3.0-gcc3-gentoo.patch || die
+}
 
 src_compile() {
-	cd ${S}
-	patch -p1<${FILESDIR}/memtest86-3.0-gcc3-gentoo.patch
-	emake || die
+	make CCFLAGS='-Wall -fomit-frame-pointer -fno-builtin' || die
 }
 
 src_install() {
-
 	dodir /boot/memtest86
 	cp memtest.bin ${D}/boot/memtest86
 
 	dodoc README README.build-process
-	
 }
 
 pkg_postinst() {