o Better handling of pthreads dependency

o Fixes to make building and installing more easy
o Make MaraDNS actually look into ${PKG_SYSCONFDIR} for its configuration
  file, thus bumping PKGREVISION.

6 files changed, 67 insertions, 8 deletions

diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 2a5237ddaab..1ddc355b54e 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/09/27 02:29:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/14 21:19:03 cube Exp $
 
 DISTNAME=	maradns-1.0.18
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,15 +13,23 @@ COMMENT=	Secure DNS server for *NIX systems
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		maradns
+HAS_CONFIGURE=		yes
+PTHREAD_OPTS+=		require
+MAKE_ENV+=		LANGUAGE="en"
 
 EGDIR=		${PREFIX}/share/examples/maradns
 CONF_FILES=	${EGDIR}/example_mararc ${PKG_SYSCONFDIR}/mararc
 
+post-patch:
+	${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},			\
+	    ${WRKSRC}/parse/ParseMaraRc.c > ${WRKSRC}/parse/ParseMaraRc.sed
+	${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c
+
 post-install:
-	${MV} ${PREFIX}/doc/${DISTNAME} ${PREFIX}/share/doc/maradns
-	${RMDIR} ${PREFIX}/doc
 	${MV} ${PREFIX}/share/doc/maradns/examples \
 		${PREFIX}/share/examples/maradns
 
 .include "../../mk/pthread.buildlink2.mk"
+LDFLAGS+=	${PTHREAD_LDFLAGS}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/maradns/distinfo b/net/maradns/distinfo
index 47ea3882a23..adc700c9c9c 100644
--- a/net/maradns/distinfo
+++ b/net/maradns/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/11/14 09:34:42 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/11/14 21:19:03 cube Exp $
 
 SHA1 (maradns-1.0.18.tar.bz2) = 788b875bed781f11dea8f4d38209e4bd49dc42d8
 Size (maradns-1.0.18.tar.bz2) = 414047 bytes
-SHA1 (patch-aa) = 1de334b76fd83573a67d2deb46c1abd0a925b908
+SHA1 (patch-aa) = c33101aacf39c6cf4fe361d82c7e48882a33e37c
+SHA1 (patch-ab) = 664188f15cc8068fb8d7572d2fef7870cd998ab7
+SHA1 (patch-ac) = 62bc0b967a16cf4a452b3132e11851078ee73af1
+SHA1 (patch-ad) = c824827384ab30aafb6a110daabb3f38f58b9599
diff --git a/net/maradns/patches/patch-aa b/net/maradns/patches/patch-aa
index d27a0ad999a..cb304d7ca8e 100644
--- a/net/maradns/patches/patch-aa
+++ b/net/maradns/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2003/11/14 09:34:42 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/11/14 21:19:03 cube Exp $
 
---- server/Makefile.orig	Tue Aug 27 05:11:46 2002
+--- server/Makefile.orig	2002-08-27 05:11:46.000000000 +0200
 +++ server/Makefile
 @@ -15,7 +15,7 @@ EXECS=maradns
  #FLAGS = -g $(DEBUG) -DNOTHREAD -DDEBUG
  #FLAGS = -g -DDEBUG_MEMORY $(DEBUG) 
  #FLAGS = -g $(DEBUG) 
 -FLAGS = -O2 -Wall $(DEBUG)
-+FLAGS = -O2 -Wall $(DEBUG) ${CFLAGS} ${LDFLAGS}
++FLAGS = -O2 -Wall $(DEBUG) ${CFLAGS}
  
  all: $(EXECS)
  
+@@ -35,5 +35,5 @@ timestamp.o: timestamp.c MaraDNS_locale.
+ 	$(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}
+ 
diff --git a/net/maradns/patches/patch-ab b/net/maradns/patches/patch-ab
new file mode 100644
index 00000000000..34a3e2b450e
--- /dev/null
+++ b/net/maradns/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2003/11/14 21:19:03 cube 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
diff --git a/net/maradns/patches/patch-ac b/net/maradns/patches/patch-ac
new file mode 100644
index 00000000000..e0db1ffccd1
--- /dev/null
+++ b/net/maradns/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/11/14 21:19:03 cube 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"
+ 
+ # Mandrake does not have a /usr/local/man.  Ugh.
+ # As a result, we need the following kludge to get this to
diff --git a/net/maradns/patches/patch-ad b/net/maradns/patches/patch-ad
new file mode 100644
index 00000000000..a4bc801e2bf
--- /dev/null
+++ b/net/maradns/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/11/14 21:19:03 cube Exp $
+
+--- parse/ParseMaraRc.c.orig	2002-05-23 00:05:11.000000000 +0200
++++ parse/ParseMaraRc.c
+@@ -815,7 +815,7 @@ int find_mararc(js_string *out) {
+         return JS_ERROR;
+ 
+     /* Simple and secure: We look for it in /etc/mararc */
+-    return js_qstr2js(out,"/etc/mararc");
++    return js_qstr2js(out,"@@PKGSYSCONFDIR@@/mararc");
+ 
+     }
+