7 files changed, 101 insertions, 8 deletions
diff --git a/net/maradns/patches/patch-aa b/net/maradns/patches/patch-aa
index cb304d7ca8e..3c0956d3c61 100644
--- a/net/maradns/patches/patch-aa
+++ b/net/maradns/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2003/11/14 21:19:03 cube Exp $
+$NetBSD: patch-aa,v 1.3 2005/05/13 13:25:55 salo Exp $
 
---- server/Makefile.orig	2002-08-27 05:11:46.000000000 +0200
-+++ server/Makefile
-@@ -15,7 +15,7 @@ EXECS=maradns
+--- server/Makefile.orig	2005-05-07 04:52:38.000000000 +0200
++++ server/Makefile	2005-05-13 14:46:01.000000000 +0200
+@@ -15,7 +15,7 @@
  #FLAGS = -g $(DEBUG) -DNOTHREAD -DDEBUG
  #FLAGS = -g -DDEBUG_MEMORY $(DEBUG) 
  #FLAGS = -g $(DEBUG) 
--FLAGS = -O2 -Wall $(DEBUG)
-+FLAGS = -O2 -Wall $(DEBUG) ${CFLAGS}
+-FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES)
++FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES) $(CFLAGS)
  
  all: $(EXECS)
  
-@@ -35,5 +35,5 @@ timestamp.o: timestamp.c MaraDNS_locale.
+@@ -35,5 +35,5 @@
  	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
  
  maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
 -	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
-+	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) ${LDFLAGS}
++	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) $(LDFLAGS)
  
diff --git a/net/maradns/patches/patch-ae b/net/maradns/patches/patch-ae
new file mode 100644
index 00000000000..a285ea42d81
--- /dev/null
+++ b/net/maradns/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- dns/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ dns/Makefile	2005-05-13 14:52:40.000000000 +0200
+@@ -3,7 +3,7 @@
+ MJOBJS=../libs/MaraHash.o
+ OBJECTS=$(DOBJECTS) $(JOBJS) $(MJOBJS)
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: Queries.o Compress.o bobbit.o Decompress.o
diff --git a/net/maradns/patches/patch-af b/net/maradns/patches/patch-af
new file mode 100644
index 00000000000..83a9aa6c691
--- /dev/null
+++ b/net/maradns/patches/patch-af
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- libs/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ libs/Makefile	2005-05-13 14:53:39.000000000 +0200
+@@ -1,5 +1,5 @@
+ OBJECTS = JsStr.o JsStrOS.o JsStrCP.o MaraHash.o
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g -DDEBUG -DTHREADS
+ #FLAGS = -g $(DEBUG)
+ 
diff --git a/net/maradns/patches/patch-ag b/net/maradns/patches/patch-ag
new file mode 100644
index 00000000000..8e791dcff79
--- /dev/null
+++ b/net/maradns/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- rng/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ rng/Makefile	2005-05-13 14:54:31.000000000 +0200
+@@ -5,7 +5,7 @@
+ OBJECTS=$(ROBJECTS)
+ TABLES=rng-32bit-tables.h
+ 
+-FLAGS = -g -O2 -Wall
++FLAGS = -g -O2 -Wall $(CFLAGS)
+ #FLAGS = -g
+ 
+ all: $(ROBJECTS) 
diff --git a/net/maradns/patches/patch-ah b/net/maradns/patches/patch-ah
new file mode 100644
index 00000000000..49687de65cc
--- /dev/null
+++ b/net/maradns/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- tools/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ tools/Makefile	2005-05-13 14:56:09.000000000 +0200
+@@ -7,7 +7,7 @@
+ POBJECTS=../parse/ParseCsv1.o ../parse/ParseMaraRc.o
+ EXECS=askmara strip.control benchmark 
+ 
+-FLAGS = -g -O2 $(DEBUG)
++FLAGS = -g -O2 $(DEBUG) $(CFLAGS) $(LDFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: $(EXECS)
diff --git a/net/maradns/patches/patch-ai b/net/maradns/patches/patch-ai
new file mode 100644
index 00000000000..b1d2b86dfd5
--- /dev/null
+++ b/net/maradns/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- tuzona/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ tuzona/Makefile	2005-05-13 14:57:53.000000000 +0200
+@@ -6,7 +6,7 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(DOBJECTS) $(POBJECTS) $(SOBJECTS)
+ EXECS=getzone zoneserver
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) $(LDFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: $(EXECS)
diff --git a/net/maradns/patches/patch-aj b/net/maradns/patches/patch-aj
new file mode 100644
index 00000000000..6b26645c15e
--- /dev/null
+++ b/net/maradns/patches/patch-aj
@@ -0,0 +1,30 @@
+$NetBSD: patch-aj,v 1.1 2005/05/13 13:25:55 salo Exp $
+
+--- parse/Makefile.orig	2003-08-02 21:39:36.000000000 +0200
++++ parse/Makefile	2005-05-13 15:02:44.000000000 +0200
+@@ -5,10 +5,12 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
+ EXECS=parsetest parsetest2
+ 
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
+ #FLAGS = -g $(DEBUG)
+ 
+-all: $(EXECS)
++all: $(POBJECTS)
++
++test: $(EXECS)
+ 
+ clean:
+ 	rm -f $(POBJECTS) core $(EXECS) 
+@@ -26,8 +28,8 @@
+ 	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ 
+ parsetest: parsetest.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) $(LDFLAGS)
+ 
+ parsetest2: parsetest2.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) $(LDFLAGS)
+