6 files changed, 36 insertions, 132 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index ee7704e780bd..5515bf40ac8c 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.10
+PORTVERSION=	2.9.11
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -62,17 +62,6 @@ MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
-post-install:
-.if !exists(${PREFIX}/etc/pdns.conf)
-	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
-	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
-.endfor
-.endif
-
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
@@ -86,6 +75,13 @@ describe:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
+CONFIGURE_ARGS+=	--enable-recursor
+PLIST_SUB+=		RECURSOR=""
+.else
+PLIST_SUB+=		RECURSOR="@comment "
+.endif
+
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/${LDAP_PORT}
 LIB_DEPENDS+=	lber.2:${PORTSDIR}/${LDAP_PORT}
@@ -100,11 +96,15 @@ post-patch:
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
-CONFIGURE_ARGS+=	--enable-recursor
-PLIST_SUB+=		RECURSOR=""
-.else
-PLIST_SUB+=		RECURSOR="@comment "
+post-install:
+.if !exists(${PREFIX}/etc/pdns.conf)
+	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
+.endif
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}
+.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
+	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index d49def71561d..b7b72f50a080 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
+MD5 (pdns-2.9.11.tar.gz) = a8aa0b47b3c4f05468b7e664caacb8d1
diff --git a/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc b/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
deleted file mode 100644
index 9457ac61f8a8..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_pdns_recursor.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- pdns/pdns_recursor.cc.orig	Thu Jul  3 10:30:03 2003
-+++ pdns/pdns_recursor.cc	Thu Jul 10 16:45:27 2003
-@@ -35,6 +35,10 @@
- #include "statbag.hh"
- #include "arguments.hh"
- #include "syncres.hh"
-+#include <fcntl.h>
-+#include <fstream>
-+
-+string s_programname="pdns_recursor";
- 
- #ifndef WIN32
- extern "C" {
-@@ -129,6 +133,17 @@
-   cache[toLower(qname)+"|"+qt.getName()]=content;
- }
- 
-+static void writePid(void)
-+{
-+  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
-+  ofstream of(fname.c_str());
-+  if(of)
-+    of<<getpid()<<endl;
-+  else
-+    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
-+failed: "<<strerror(errno)<<endl;
-+}
-+
- void init(void)
- {
-   // prime root cache
-@@ -394,6 +409,7 @@
-     arg().set("daemon","Operate as a daemon")="yes";
-     arg().set("quiet","Suppress logging of questions and answers")="off";
-     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
-+    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
-     arg().setCmd("help","Provide a helpful message");
-     L.toConsole(Logger::Warning);
-     arg().laxParse(argc,argv); // do a lax parse
-@@ -433,6 +449,8 @@
-       daemonize();
-     }
-     signal(SIGUSR1,usr1Handler);
-+
-+    writePid();
- #endif
- 
-     vector<TCPConnection> tcpconnections;
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index ee7704e780bd..5515bf40ac8c 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.10
+PORTVERSION=	2.9.11
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -62,17 +62,6 @@ MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
-post-install:
-.if !exists(${PREFIX}/etc/pdns.conf)
-	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
-	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
-.endfor
-.endif
-
 post-clean:
 	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
@@ -86,6 +75,13 @@ describe:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
+CONFIGURE_ARGS+=	--enable-recursor
+PLIST_SUB+=		RECURSOR=""
+.else
+PLIST_SUB+=		RECURSOR="@comment "
+.endif
+
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/${LDAP_PORT}
 LIB_DEPENDS+=	lber.2:${PORTSDIR}/${LDAP_PORT}
@@ -100,11 +96,15 @@ post-patch:
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if ${OSVERSION} >= 500000 && defined(POWERDNS_WITH_RECURSOR)
-CONFIGURE_ARGS+=	--enable-recursor
-PLIST_SUB+=		RECURSOR=""
-.else
-PLIST_SUB+=		RECURSOR="@comment "
+post-install:
+.if !exists(${PREFIX}/etc/pdns.conf)
+	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
+.endif
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}
+.for i in pdns.conf pdns_mysql.sql pdns_postgresql.sql
+	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index d49def71561d..b7b72f50a080 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.10.tar.gz) = a91f15c90f6551fb817cb708e29d5a37
+MD5 (pdns-2.9.11.tar.gz) = a8aa0b47b3c4f05468b7e664caacb8d1
diff --git a/dns/powerdns/files/patch-pdns_pdns_recursor.cc b/dns/powerdns/files/patch-pdns_pdns_recursor.cc
deleted file mode 100644
index 9457ac61f8a8..000000000000
--- a/dns/powerdns/files/patch-pdns_pdns_recursor.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- pdns/pdns_recursor.cc.orig	Thu Jul  3 10:30:03 2003
-+++ pdns/pdns_recursor.cc	Thu Jul 10 16:45:27 2003
-@@ -35,6 +35,10 @@
- #include "statbag.hh"
- #include "arguments.hh"
- #include "syncres.hh"
-+#include <fcntl.h>
-+#include <fstream>
-+
-+string s_programname="pdns_recursor";
- 
- #ifndef WIN32
- extern "C" {
-@@ -129,6 +133,17 @@
-   cache[toLower(qname)+"|"+qt.getName()]=content;
- }
- 
-+static void writePid(void)
-+{
-+  string fname=arg()["socket-dir"]+"/"+s_programname+".pid";
-+  ofstream of(fname.c_str());
-+  if(of)
-+    of<<getpid()<<endl;
-+  else
-+    L<<Logger::Error<<"Requested to write pid for "<<getpid()<<" to "<<fname<<"
-+failed: "<<strerror(errno)<<endl;
-+}
-+
- void init(void)
- {
-   // prime root cache
-@@ -394,6 +409,7 @@
-     arg().set("daemon","Operate as a daemon")="yes";
-     arg().set("quiet","Suppress logging of questions and answers")="off";
-     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
-+    arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
-     arg().setCmd("help","Provide a helpful message");
-     L.toConsole(Logger::Warning);
-     arg().laxParse(argc,argv); // do a lax parse
-@@ -433,6 +449,8 @@
-       daemonize();
-     }
-     signal(SIGUSR1,usr1Handler);
-+
-+    writePid();
- #endif
- 
-     vector<TCPConnection> tcpconnections;