- Update to 1.4.22

4 files changed, 12 insertions, 25 deletions

diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 6c4d9e13ddea..53cbdc9e4e09 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	unbound
-PORTVERSION=	1.4.21
-PORTREVISION=	2
+PORTVERSION=	1.4.22
+PORTREVISION=	0
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo
index 60faa6e257ba..9486892e8d27 100644
--- a/dns/unbound/distinfo
+++ b/dns/unbound/distinfo
@@ -1,2 +1,2 @@
-SHA256 (unbound-1.4.21.tar.gz) = 502f817a72721f78243923eb1d6187029639f7a8bdcc33a6ce0819bbb2a80970
-SIZE (unbound-1.4.21.tar.gz) = 3624553
+SHA256 (unbound-1.4.22.tar.gz) = 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f
+SIZE (unbound-1.4.22.tar.gz) = 4735801
diff --git a/dns/unbound/files/patch-Makefile.in b/dns/unbound/files/patch-Makefile.in
index d74d71c042b5..583bbaa36180 100644
--- a/dns/unbound/files/patch-Makefile.in
+++ b/dns/unbound/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2013-03-22 16:41:13.000000000 +0400
-+++ Makefile.in	2013-09-23 06:08:58.535408755 +0400
-@@ -488,7 +488,7 @@
- 		echo ".so man3/libunbound.3" > $(DESTDIR)$(mandir)/man3/$$mpage.3 ; \
- 	done
+--- Makefile.in.orig	2014-01-31 14:19:01.000000000 +0400
++++ Makefile.in	2014-03-13 14:27:03.613703943 +0400
+@@ -497,7 +497,7 @@
+ 	$(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
+ 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
  	$(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup
 -	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
 +	$(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile).sample
- 	$(LIBTOOL) --mode=install cp unbound.h $(DESTDIR)$(includedir)/unbound.h
- 	$(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
+ 
+ pythonmod-uninstall:
+ 	rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py
diff --git a/dns/unbound/files/patch-configure b/dns/unbound/files/patch-configure
deleted file mode 100644
index 3350acd979ee..000000000000
--- a/dns/unbound/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2012-05-24 12:37:55.000000000 +0400
-+++ configure	2012-05-24 16:48:58.593092754 +0400
-@@ -17949,9 +17949,7 @@
-     -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
-     -a $ac_cv_func_ldns_get_random = yes \
-     -a $ac_cv_header_ldns_ldns_h = yes \
--    -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \
--    -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes \
--    -a $ac_cv_have_decl_LDNS_ECDSAP384SHA384 = yes; then
-+    -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes; then
-         :
- else
-     as_fn_error $? "ldns library is not recent, update the ldns library, install it into system lib dir or use --with-ldns=path to other location.  The --with-ldns can point to the make-dir of ldns.  Package libldns or download source http://www.nlnetlabs.nl/projects/ldns" "$LINENO" 5