From 8e51d2d7b4c1d047bec262ed782b940bbd96aadc Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Mon, 16 Jun 2003 14:50:33 +0000
Subject: [PATCH] update to nsd 1.1.0

---
 net/nsd/Makefile            | 20 +++++++++++---------
 net/nsd/distinfo            |  6 +++---
 net/nsd/patches/patch-nsd_c | 26 --------------------------
 net/nsd/pkg/PLIST           |  2 +-
 4 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 net/nsd/patches/patch-nsd_c

diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index b61348428ab..b6594b869f8 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2003/04/10 10:34:04 jsyn Exp $
+# $OpenBSD: Makefile,v 1.8 2003/06/16 14:50:33 jakob Exp $
 
 COMMENT=	"authoritative-only name server daemon"
 
-VERSION=	1.0.2
+VERSION=	1.1.0
 DISTNAME=	nsd-${VERSION}
-PKGNAME=	nsd-${VERSION}p1
+PKGNAME=	nsd-${VERSION}
 CATEGORIES=	net
 
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
@@ -20,12 +20,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=	:named-xfer-*:net/named-xfer
 
-MAKE_FLAGS+=	PREFIX='${PREFIX}' \
-		NSDZONESDIR=/var/nsd \
-		NSDZONES=/var/nsd/nsd.zones \
-		NSDUSER=named \
-		NAMEDXFER=${PREFIX}/libexec/named-xfer \
-		CC='${CC}' CFLAGS='${CFLAGS}'
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--enable-ipv6 \
+			--enable-dnssec \
+			--enable-bind8-stats \
+			--with-namexfer=${LOCALBASE}/libexec/named-xfer \
+			--with-librap \
+			--with-user=named \
+			--with-pidfile=/var/run/nsd.pid
 
 NO_REGRESS=	Yes
 
diff --git a/net/nsd/distinfo b/net/nsd/distinfo
index 0f3c1303235..681a2a82317 100644
--- a/net/nsd/distinfo
+++ b/net/nsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (nsd-1.0.2.tar.gz) = 8c50f242ed4d71986fe8959f5db3be5d
-RMD160 (nsd-1.0.2.tar.gz) = 787da1d1f29bedeaf91a2759bb228f65e56defc6
-SHA1 (nsd-1.0.2.tar.gz) = fd3099aaae847750d54400b8368e48b209c11078
+MD5 (nsd-1.1.0.tar.gz) = 2ab5b05cdb3376387f621b05bc4ce69f
+RMD160 (nsd-1.1.0.tar.gz) = 4aac541ce83fbd29c44b3e5f5ce22715d21b963c
+SHA1 (nsd-1.1.0.tar.gz) = 545d79a226f8af163ef1314356d62034f1305cec
diff --git a/net/nsd/patches/patch-nsd_c b/net/nsd/patches/patch-nsd_c
deleted file mode 100644
index 0e7cf3e4b90..00000000000
--- a/net/nsd/patches/patch-nsd_c
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-nsd_c,v 1.4 2003/02/25 17:46:39 brad Exp $
-Index: nsd.c
-===================================================================
-RCS file: /cvs/nsd/nsd.c,v
-retrieving revision 1.56.2.10
-diff -u -r1.56.2.10 nsd.c
---- nsd.c	17 Dec 2002 14:42:06 -0000	1.56.2.10
-+++ nsd.c	12 Feb 2003 09:19:50 -0000
-@@ -159,6 +159,7 @@
- 	signal(SIGINT, &sig_handler);
- 	signal(SIGILL, &sig_handler);
- 	signal(SIGALRM, &sig_handler);
-+	signal(SIGPIPE, SIG_IGN);
- 
- 
- 	/* Are we a tcp child? */
-@@ -566,6 +567,8 @@
- 	signal(SIGINT, &sig_handler);
- 	signal(SIGILL, &sig_handler);
- 	signal(SIGALRM, &sig_handler);
-+	signal(SIGPIPE, SIG_IGN);
-+
- 
- 	/* Get our process id */
- 	nsd.pid[0] = getpid();
-
diff --git a/net/nsd/pkg/PLIST b/net/nsd/pkg/PLIST
index 81faeb73688..528a4eb873d 100644
--- a/net/nsd/pkg/PLIST
+++ b/net/nsd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/01/09 11:16:11 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.3 2003/06/16 14:50:33 jakob Exp $
 man/man8/nsd-notify.8
 man/man8/nsd.8
 man/man8/nsdc.8