Import of pkgsrc-2014Q1

sysutils/memtestplus/patches/patch-aa

@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
+$NetBSD: patch-aa,v 1.5 2013/12/08 00:35:28 jakllsch Exp $
 
---- Makefile.orig	2009-09-22 00:35:46.000000000 +0000
+--- Makefile.orig	2013-08-10 02:01:58.000000000 +0000
 +++ Makefile
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@
  #
  # Path for the floppy disk device
  #
@@ -11,11 +11,27 @@ $NetBSD: patch-aa,v 1.4 2009/11/24 17:20:40 jakllsch Exp $
  
  AS=as -32
  CC=gcc
-@@ -61,7 +61,6 @@ asm:
- iso:
- 	make all
- 	./makeiso.sh
--	rm -f *.o *.s memtest.bin memtest memtest_shared memtest_shared.bin
+@@ -20,8 +20,7 @@ OBJS= head.o reloc.o main.o test.o init.
+       smp.o vmem.o random.o
+       
  
- install: all
- 	dd <memtest.bin >$(FDISK) bs=8192
+-all: clean memtest.bin memtest 
+-		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
++all: memtest.bin memtest 
+ 
+ # Link it statically once so I know I don't have undefined
+ # symbols and then link it dynamically so I have full
+@@ -34,8 +33,11 @@ memtest_shared: $(OBJS) memtest_shared.l
+ memtest_shared.bin: memtest_shared
+ 	objcopy -O binary $< memtest_shared.bin
+ 
+-memtest: memtest_shared.bin memtest.lds
+-	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
++nbstart.s: nbstart.S config.h defs.h
++	$(CC) -E -traditional $< -o $@
++
++memtest: memtest_shared.bin memtest.lds nbstart.o
++	$(LD) -T memtest.lds -z max-page-size=0x1000 nbstart.o -b binary memtest_shared.bin -o $@
+ 
+ head.s: head.S config.h defs.h test.h
+ 	$(CC) -E -traditional $< -o $@