dns/powerdns-recursor: update 3.5.3 -> 3.6.0

- Update to 3.6.0
- Mainteiner's timeout

PR:		191226
Submitted by:	Ralf van der Enden <tremere@cainites.net>
Reviewed by:	marino (mentor)
Approved by:	swills (mentor)

4 files changed, 41 insertions, 35 deletions

diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index d5e9363866f1..71679e9f693b 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns-recursor
-PORTVERSION=	3.5.3
+PORTVERSION=	3.6.0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
@@ -11,6 +11,8 @@ DISTNAME=	pdns-recursor-${PORTVERSION}
 MAINTAINER=	sten@blinkenlights.nl
 COMMENT=	Advanced DNS recursor
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
 		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
@@ -62,7 +64,7 @@ BROKEN=		requires setcontext()
 post-patch:
 	@${REINPLACE_CMD} -e 's;SBINDIR=/usr/sbin/;SBINDIR=${PREFIX}/sbin/;' \
 	   -e 's;BINDIR=/usr/bin/;BINDIR=${PREFIX}/bin/;' \
-	   -e 's;CONFIGDIR="/etc/powerdns/";CONFIGDIR=${PREFIX}/etc/pdns/;' \
+	   -e 's;SYSCONFDIR=/etc/powerdns/;SYSCONFDIR=${PREFIX}/etc/pdns/;' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's;"/etc/powerdns/";"${PREFIX}/etc/pdns/";' \
 		${WRKSRC}/config.h
diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo
index 8a2d9b784dfe..813b60a9a776 100644
--- a/dns/powerdns-recursor/distinfo
+++ b/dns/powerdns-recursor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-recursor-3.5.3.tar.bz2) = 192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa
-SIZE (pdns-recursor-3.5.3.tar.bz2) = 176298
+SHA256 (pdns-recursor-3.6.0.tar.bz2) = 345651705f04eb63ef6ea4573587907bc213879834e37f4b7e4c2e70bc952372
+SIZE (pdns-recursor-3.6.0.tar.bz2) = 196008
diff --git a/dns/powerdns-recursor/files/patch-makefile b/dns/powerdns-recursor/files/patch-makefile
index 0b97f625300f..9ca5146ac386 100644
--- a/dns/powerdns-recursor/files/patch-makefile
+++ b/dns/powerdns-recursor/files/patch-makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2010-02-10 20:46:15.000000000 +0100
-+++ Makefile	2010-02-11 13:22:25.000000000 +0100
-@@ -38,10 +38,10 @@
+--- ./Makefile.orig	2014-06-20 11:24:09.000000000 +0200
++++ ./Makefile	2014-06-20 13:59:23.858179424 +0200
+@@ -50,10 +50,10 @@
  ifeq ($(STATIC),semi)
  	STATICFLAGS=-Wl,-Bstatic -lstdc++ $(LUALIBS) -lgcc -Wl,-Bdynamic -static-libgcc -lm -lc
  	LINKCC=$(CC)
@@ -13,18 +13,22 @@
  	LINKCC=$(CC)
     else
  	LDFLAGS +=  $(LUALIBS)
-@@ -69,16 +69,14 @@
+@@ -101,20 +101,18 @@
  	 fi
  
- install: all
+ install: build-stamp
 -	-mkdir -p $(DESTDIR)/$(SBINDIR)
  	mv pdns_recursor $(DESTDIR)/$(SBINDIR)
+ ifeq ($(STRIP_BINARIES), 1)
  	strip $(DESTDIR)/$(SBINDIR)/pdns_recursor
+ endif
 -	mkdir -p $(DESTDIR)/$(BINDIR)
  	mv rec_control $(DESTDIR)/$(BINDIR)
+ ifeq ($(STRIP_BINARIES), 1)
  	strip $(DESTDIR)/$(BINDIR)/rec_control
- 	-mkdir -p $(DESTDIR)/$(CONFIGDIR)
- 	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist
+ endif
+ 	-mkdir -p $(DESTDIR)/$(SYSCONFDIR)
+ 	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(SYSCONFDIR)/recursor.conf-dist
 -	-mkdir -p $(DESTDIR)/usr/share/man/man1
 -	cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
 +	cp pdns_recursor.1 pdns_recursor.8
diff --git a/dns/powerdns-recursor/files/patch-manpages b/dns/powerdns-recursor/files/patch-manpages
index 560f10e86c5e..5f8b8f31bf84 100644
--- a/dns/powerdns-recursor/files/patch-manpages
+++ b/dns/powerdns-recursor/files/patch-manpages
@@ -1,58 +1,58 @@
---- rec_control.1.orig	2013-04-15 09:40:40.000000000 +0200
-+++ rec_control.1	2013-04-16 20:20:23.142475518 +0200
+--- ./pdns_recursor.1.orig	2014-06-20 11:24:09.000000000 +0200
++++ ./pdns_recursor.1	2014-06-20 14:08:11.302142421 +0200
 @@ -7,7 +7,7 @@
  .\"    Source: \ \& 3.0
  .\"  Language: English
  .\"
--.TH "REC_CONTROL" "1" "09/17/2013" "\ \& 3\&.0" "\ \&"
-+.TH "REC_CONTROL" "8" "09/17/2013" "\ \& 3\&.0" "\ \&"
+-.TH "PDNS_RECURSOR" "1" "22 March 2008" "\ \& 3\&.0" "\ \&"
++.TH "PDNS_RECURSOR" "8" "22 March 2008" "\ \& 3\&.0" "\ \&"
  .\" -----------------------------------------------------------------
  .\" * Define some portability stuff
  .\" -----------------------------------------------------------------
 @@ -34,7 +34,7 @@
- \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&.
+ \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
  .SH "DESCRIPTION"
  .sp
--rec_control(1) allows the operator to control a running instance of the pdns_recursor\&.
-+rec_control(8) allows the operator to control a running instance of the pdns_recursor\&.
+-pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
++pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
  .sp
- The commands that can be passed to the recursor are described on \m[blue]\fBhttp://doc\&.powerdns\&.com/rec\-control\&.html\fR\m[]
- .SH "EXAMPLES"
-@@ -142,7 +142,7 @@
+ The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&.
+ .sp
+@@ -273,7 +273,7 @@
  Website: \m[blue]\fBhttp://wiki\&.powerdns\&.com\fR\m[], \m[blue]\fBhttp://www\&.powerdns\&.com\fR\m[]
  .SH "SEE ALSO"
  .sp
--pdns_recursor(1)
-+pdns_recursor(8)
+-rec_control(1)
++rec_control(8)
  .SH "COPYING"
  .sp
  Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.
---- pdns_recursor.1.orig	2013-05-03 10:17:59.000000000 +0200
-+++ pdns_recursor.1	2013-05-03 18:41:34.355622682 +0200
+--- ./rec_control.1.orig	2014-06-20 11:24:09.000000000 +0200
++++ ./rec_control.1	2014-06-20 14:08:32.670140885 +0200
 @@ -7,7 +7,7 @@
  .\"    Source: \ \& 3.0
  .\"  Language: English
  .\"
--.TH "PDNS_RECURSOR" "1" "09/17/2013" "\ \& 3\&.0" "\ \&"
-+.TH "PDNS_RECURSOR" "8" "09/17/2013" "\ \& 3\&.0" "\ \&"
+-.TH "REC_CONTROL" "1" "19 April 2006" "\ \& 3\&.0" "\ \&"
++.TH "REC_CONTROL" "8" "19 April 2006" "\ \& 3\&.0" "\ \&"
  .\" -----------------------------------------------------------------
  .\" * Define some portability stuff
  .\" -----------------------------------------------------------------
 @@ -34,7 +34,7 @@
- \fIpdns_recursor\fR [\-\-daemon] [\-\-local\-address] [\-\-help, \-h] [\-\-allow\-from]
+ \fIrec_control\fR [\-\-help] [\-\-socket\-dir] [\-\-socket\-pid] command \&.\&.
  .SH "DESCRIPTION"
  .sp
--pdns_recursor(1) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
-+pdns_recursor(8) is a high performance, simple and secure recursing nameserver\&. It currently powers over two million internet connections\&.
- .sp
- The recursor is configured via a configuration file, but each item in that file can be overridden on the command line\&.
+-rec_control(1) allows the operator to control a running instance of the pdns_recursor\&.
++rec_control(8) allows the operator to control a running instance of the pdns_recursor\&.
  .sp
-@@ -273,7 +273,7 @@
+ The commands that can be passed to the recursor are described on \m[blue]\fBhttp://doc\&.powerdns\&.com/rec\-control\&.html\fR\m[]
+ .SH "EXAMPLES"
+@@ -142,7 +142,7 @@
  Website: \m[blue]\fBhttp://wiki\&.powerdns\&.com\fR\m[], \m[blue]\fBhttp://www\&.powerdns\&.com\fR\m[]
  .SH "SEE ALSO"
  .sp
--rec_control(1)
-+rec_control(8)
+-pdns_recursor(1)
++pdns_recursor(8)
  .SH "COPYING"
  .sp
  Copyright \(co 2006 PowerDNS\&.COM BV\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 2\&.