From 5c1f7d35199bbcbb337de47b58561efabec0fabc Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 10 Nov 2010 08:29:01 +0000
Subject: [PATCH] update unbound to 1.4.7, from Brad. "please commit" jakob@
 (maintainer).

---
 net/unbound/Makefile                  | 11 ++++++-----
 net/unbound/distinfo                  | 10 +++++-----
 net/unbound/patches/patch-Makefile_in | 11 +++++------
 net/unbound/pkg/PLIST                 |  4 +++-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/net/unbound/Makefile b/net/unbound/Makefile
index 793fa2b3b71..aae803fa4a3 100644
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/18 21:50:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/10 08:29:01 sthen Exp $
 
 COMMENT=	validating DNS resolver
 
-DISTNAME=	unbound-1.4.6
+DISTNAME=	unbound-1.4.7
 CATEGORIES=	net
 
 MASTER_SITES=	http://www.unbound.net/downloads/
@@ -22,13 +22,14 @@ USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 NO_REGRESS=		Yes
 
-SHARED_LIBS+=		unbound 2.5
+SHARED_LIBS+=		unbound 2.6
 
-WANTLIB=		c crypto event ldns.>=4.4 ssl
-LIB_DEPENDS+=		:libldns->=1.6.5:net/ldns/libldns
+WANTLIB=		c crypto event expat ldns.>=4.5 ssl
+LIB_DEPENDS+=		:libldns->=1.6.7:net/ldns/libldns
 
 CONFIGURE_ARGS+=	--with-ssl=/usr \
 			--with-libevent=/usr \
+			--with-libexpat=/usr \
 			--with-ldns=${LOCALBASE} \
 			--without-pthreads \
 			--with-chroot-dir=/var/unbound \
diff --git a/net/unbound/distinfo b/net/unbound/distinfo
index 8c24ea15fd7..9a3ebb0ae5d 100644
--- a/net/unbound/distinfo
+++ b/net/unbound/distinfo
@@ -1,5 +1,5 @@
-MD5 (unbound-1.4.6.tar.gz) = LNz+DKRTc8ayLidFYK6ZQw==
-RMD160 (unbound-1.4.6.tar.gz) = 1djNGQlqqMBiTs+49XzgJ2q1wdQ=
-SHA1 (unbound-1.4.6.tar.gz) = sNfFjxc8XIDMgTRfZ2ZVX5a94g0=
-SHA256 (unbound-1.4.6.tar.gz) = nCzhB7VR29ZdAHVJyuoT7Lp90w1pCCHyuvqdotBHud4=
-SIZE (unbound-1.4.6.tar.gz) = 4384085
+MD5 (unbound-1.4.7.tar.gz) = l+48Sph3/3JfrSPjHsrf4A==
+RMD160 (unbound-1.4.7.tar.gz) = hO6p3EVSG9NGq7rTRsHDskQfpW8=
+SHA1 (unbound-1.4.7.tar.gz) = bp1mO0FLy7x9t10Pw7kXTkXsCVE=
+SHA256 (unbound-1.4.7.tar.gz) = /hfvRjn5Zcvwhk0OSewA1WfXxKufGZ8qbwCEK25IAWw=
+SIZE (unbound-1.4.7.tar.gz) = 4455592
diff --git a/net/unbound/patches/patch-Makefile_in b/net/unbound/patches/patch-Makefile_in
index fd90bdc7cd9..565fd6493ff 100644
--- a/net/unbound/patches/patch-Makefile_in
+++ b/net/unbound/patches/patch-Makefile_in
@@ -1,12 +1,11 @@
-$OpenBSD: patch-Makefile_in,v 1.10 2010/04/23 07:05:02 jakob Exp $
---- Makefile.in.orig	Fri Mar 19 16:26:25 2010
-+++ Makefile.in	Fri Apr 23 09:00:59 2010
-@@ -405,7 +405,7 @@ endif
+$OpenBSD: patch-Makefile_in,v 1.11 2010/11/10 08:29:01 sthen Exp $
+--- Makefile.in.orig	Wed Oct 13 08:22:46 2010
++++ Makefile.in	Mon Nov  8 20:40:28 2010
+@@ -430,7 +430,6 @@ endif
  	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
  	$(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(DESTDIR)$(includedir)/unbound.h
  	$(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
 -	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
-+#	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
  
  uninstall:
- 	rm -f -- $(DESTDIR)$(sbindir)/unbound$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-checkconf$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-host$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control-setup
+ 	rm -f -- $(DESTDIR)$(sbindir)/unbound$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-checkconf$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-host$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-anchor$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control-setup
diff --git a/net/unbound/pkg/PLIST b/net/unbound/pkg/PLIST
index d78207bf36f..74bad92e195 100644
--- a/net/unbound/pkg/PLIST
+++ b/net/unbound/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/08/22 09:03:11 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.7 2010/11/10 08:29:01 sthen Exp $
 @newgroup _unbound:601
 @newuser _unbound:601:601:daemon:Unbound Daemon:/var/unbound:/sbin/nologin
 %%SHARED%%
@@ -8,10 +8,12 @@ lib/libunbound.la
 @man man/man1/unbound-host.1
 @man man/man3/libunbound.3
 @man man/man5/unbound.conf.5
+@man man/man8/unbound-anchor.8
 @man man/man8/unbound-checkconf.8
 @man man/man8/unbound-control.8
 @man man/man8/unbound.8
 @bin sbin/unbound
+@bin sbin/unbound-anchor
 @bin sbin/unbound-checkconf
 @bin sbin/unbound-control
 sbin/unbound-control-setup