8 files changed, 171 insertions, 99 deletions
diff --git a/net/maradns/patches/patch-aa b/net/maradns/patches/patch-aa
index 3c0956d3c61..a49513ec445 100644
--- a/net/maradns/patches/patch-aa
+++ b/net/maradns/patches/patch-aa
@@ -1,20 +1,45 @@
-$NetBSD: patch-aa,v 1.3 2005/05/13 13:25:55 salo Exp $
+$NetBSD: patch-aa,v 1.4 2007/08/12 01:14:31 joerg Exp $
 
---- 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 = -g -O2 -Wall $(DEBUG) $(DEFINES)
-+FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES) $(CFLAGS)
- 
- all: $(EXECS)
- 
-@@ -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)
+--- build/install.locations.orig	2007-08-12 02:02:22.000000000 +0200
++++ build/install.locations
+@@ -23,34 +23,14 @@ if [ ! -d doc/$LANGUAGE/man ]; then
+ fi
  
+ # The location of programs that the end user may wish to use
+-BIN="$PREFIX/bin/"
++BIN="${DESTDIR}$PREFIX/bin/"
+ # The location of the server programs
+-SBIN="$PREFIX/sbin/"
++SBIN="${DESTDIR}$PREFIX/sbin/"
+ # The directory to put man pages which describe the end-user programs
+-MAN1="$PREFIX/man/man1/"
++MAN1="${DESTDIR}$PREFIX/${PKGMANDIR}/man1/"
+ # The directory to put man pages which describe configuration file formats
+-MAN5="$PREFIX/man/man5/"
++MAN5="${DESTDIR}$PREFIX/${PKGMANDIR}/man5/"
+ # The directory to put man pages which describe the server programs
+-MAN8="$PREFIX/man/man8/"
++MAN8="${DESTDIR}$PREFIX/${PKGMANDIR}/man8/"
+ # The directory to put a copy of the MaraDNS documents on the system
+-DOCS="$PREFIX/doc/maradns-$VERSION"
+-
+-# Mandrake does not have a /usr/local/man.  Ugh.
+-# As a result, we need the following kludge to get this to
+-# install correctly on Mandrake
+-# Thanks to Ole Tange for pointing this out to me.
+-# Ignore or erase the following lines if editing this by hand.
+-
+-# If the directory that MAN1 points to does not exist
+-if [ ! -d $MAN1 ] ; then
+-        # Then try this location instead
+-	MAN1="/usr/local/share/man/man1"
+-fi
+-# Do the same with the MAN5 and MAN8 directories
+-if [ ! -d $MAN5 ] ; then
+-	MAN5="/usr/local/share/man/man5"
+-fi
+-if [ ! -d $MAN8 ] ; then
+-	MAN8="/usr/local/share/man/man8"
+-fi
+-
++DOCS="${DESTDIR}$PREFIX/share/doc/maradns"
diff --git a/net/maradns/patches/patch-ab b/net/maradns/patches/patch-ab
index 34a3e2b450e..9994cadc711 100644
--- a/net/maradns/patches/patch-ab
+++ b/net/maradns/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2003/11/14 21:19:03 cube Exp $
+$NetBSD: patch-ab,v 1.2 2007/08/12 01:14:31 joerg Exp $
 
---- configure.orig	2002-01-24 07:43:44.000000000 +0100
-+++ configure
-@@ -72,6 +72,9 @@ elif echo $UNAME | grep -i cygwin > /dev
- 	cat $BUILDDIR/Makefile.noflock >> Makefile
- 	echo It looks like you are using Cygwin\; this should compile file
- 	echo by typing in \'make\'.
-+elif echo $UNAME | grep -i netbsd > /dev/null ; then
-+	cat $BUILDDIR/Makefile.linux >> Makefile
-+	echo It looks like you are using NetBSD\; just type in \'make\'
- else
- 	cat $BUILDDIR/Makefile.noflock >> Makefile
- 	echo I am not familiar with the OS you are running.  Please email
+--- build/install.sh.orig	2007-08-12 02:07:37.000000000 +0200
++++ build/install.sh
+@@ -136,6 +136,8 @@ else
+ 	cd doc/en/examples
+ fi
+ 
++exit 0
++
+ # $RPM_BUILD_ROOT was added at the request of one of my users
+ if [ ! -f $RPM_BUILD_ROOT/etc/mararc ] ; then
+ 	cp example_mararc $RPM_BUILD_ROOT/etc/mararc
diff --git a/net/maradns/patches/patch-ac b/net/maradns/patches/patch-ac
index e0db1ffccd1..80a2313e020 100644
--- a/net/maradns/patches/patch-ac
+++ b/net/maradns/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2003/11/14 21:19:03 cube Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/12 01:14:31 joerg Exp $
 
---- build/install.locations.orig	2002-05-05 14:11:47.000000000 +0200
-+++ build/install.locations
-@@ -33,7 +33,7 @@ MAN5="$PREFIX/man/man5/"
- # The directory to put man pages which describe the server programs
- MAN8="$PREFIX/man/man8/"
- # The directory to put a copy of the MaraDNS documents on the system
--DOCS="$PREFIX/doc/maradns-$VERSION"
-+DOCS="$PREFIX/share/doc/maradns"
+--- configure.orig	2007-08-12 02:10:48.000000000 +0200
++++ configure
+@@ -150,7 +150,7 @@ else
+ 	echo \(if you typed in \"make\" before, just type it again\)
+ 	echo
+ 	echo THIS PORT HAS NOT BEEN TESTED\; USE AT YOUR OWN RISK
+-	EXITCODE=1
++	EXITCODE=0
+ fi
  
- # Mandrake does not have a /usr/local/man.  Ugh.
- # As a result, we need the following kludge to get this to
+ # Set up recursive and authoritative name serving
diff --git a/net/maradns/patches/patch-ae b/net/maradns/patches/patch-ae
index a285ea42d81..4bc27f23656 100644
--- a/net/maradns/patches/patch-ae
+++ b/net/maradns/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2005/05/13 13:25:55 salo Exp $
+$NetBSD: patch-ae,v 1.2 2007/08/12 01:14:31 joerg 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
+--- tcp/zoneserver.c.orig	2007-08-12 00:49:01.000000000 +0000
++++ tcp/zoneserver.c
+@@ -34,7 +34,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/time.h>
+ #endif
+ #include <sys/types.h>
diff --git a/net/maradns/patches/patch-ai b/net/maradns/patches/patch-ai
index b1d2b86dfd5..4465a7a13b8 100644
--- a/net/maradns/patches/patch-ai
+++ b/net/maradns/patches/patch-ai
@@ -1,13 +1,23 @@
-$NetBSD: patch-ai,v 1.1 2005/05/13 13:25:55 salo Exp $
+$NetBSD: patch-ai,v 1.2 2007/08/12 01:14:31 joerg 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
+--- dns/Makefile.recursive.orig	2007-08-12 00:46:35.000000000 +0000
++++ dns/Makefile.recursive
+@@ -12,14 +12,14 @@ clean:
+ 	rm -f Queries.o Compress.o bobbit.o Decompress.o
  
--FLAGS = -g -O2 -Wall $(DEBUG)
-+FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) $(LDFLAGS)
- #FLAGS = -g $(DEBUG)
+ Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o Compress.o Compress.c 
+ 
+ Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Decompress.o Decompress.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o Decompress.o Decompress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o bobbit.o bobbit.c 
  
- all: $(EXECS)
diff --git a/net/maradns/patches/patch-aj b/net/maradns/patches/patch-aj
index 6b26645c15e..1de0f64c300 100644
--- a/net/maradns/patches/patch-aj
+++ b/net/maradns/patches/patch-aj
@@ -1,30 +1,27 @@
-$NetBSD: patch-aj,v 1.1 2005/05/13 13:25:55 salo Exp $
+$NetBSD: patch-aj,v 1.2 2007/08/12 01:14:31 joerg 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
+--- tools/Makefile.orig	2006-01-02 16:59:33.000000000 +0000
++++ tools/Makefile
+@@ -18,17 +18,17 @@ clean:
+ 	rm -f core $(EXECS) *.exe
  
--FLAGS = -g -O2 -Wall $(DEBUG)
-+FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS)
- #FLAGS = -g $(DEBUG)
+ askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
+-	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
++	$(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
  
--all: $(EXECS)
-+all: $(POBJECTS)
-+
-+test: $(EXECS)
+ askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
++	$(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
  
- clean:
- 	rm -f $(POBJECTS) core $(EXECS) 
-@@ -26,8 +28,8 @@
- 	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
++	$(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
  
- parsetest: parsetest.c $(OBJECTS) 
--	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) $(LDFLAGS)
+ duende: duende.c 
+-	$(CC) $(FLAGS) -o duende duende.c
++	$(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o duende duende.c
  
- parsetest2: parsetest2.c $(OBJECTS) 
--	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) $(LDFLAGS)
+ strip.control: strip.control.c
+-	$(CC) $(FLAGS) -o strip.control strip.control.c
++	$(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o strip.control strip.control.c
  
diff --git a/net/maradns/patches/patch-ak b/net/maradns/patches/patch-ak
index a21c65755f0..0b17d90f7d0 100644
--- a/net/maradns/patches/patch-ak
+++ b/net/maradns/patches/patch-ak
@@ -1,13 +1,19 @@
-$NetBSD: patch-ak,v 1.1 2006/01/25 17:48:54 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2007/08/12 01:14:31 joerg Exp $
 
---- tuzona/zoneserver.c.orig	2006-01-25 17:47:18.000000000 +0000
-+++ tuzona/zoneserver.c
-@@ -15,7 +15,7 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/time.h>
- #endif
- #include <sys/types.h>
+--- tcp/Makefile.recursive.orig	2006-07-18 03:50:44.000000000 +0000
++++ tcp/Makefile.recursive
+@@ -26,11 +26,11 @@ clean:
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
+ 
diff --git a/net/maradns/patches/patch-al b/net/maradns/patches/patch-al
new file mode 100644
index 00000000000..7e461f6e37c
--- /dev/null
+++ b/net/maradns/patches/patch-al
@@ -0,0 +1,35 @@
+$NetBSD: patch-al,v 1.1 2007/08/12 01:14:31 joerg Exp $
+
+--- server/Makefile.recursive.orig	2006-07-18 03:50:44.000000000 +0000
++++ server/Makefile.recursive
+@@ -33,23 +33,23 @@ libs/tests:
+ 	cd libs ; make
+ 
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++	$(CC) ${CFLAGS} -c $(FLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) ${CFLAGS} -c $(FLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++	$(CC) ${CFLAGS} -c $(FLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++	$(CC) ${CFLAGS} -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+ 
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) ${LDFLAGS} $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS)
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) ${CFLAGS} $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
+