- update to 2.9.8

- recursor defaults off, Option POWERDNS_WITH_RECURSOR

21 files changed, 30 insertions, 105 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 4176ffac5787..c5bb4d4c00de 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.6
+PORTVERSION=	2.9.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -99,7 +99,7 @@ post-patch:
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if ${OSVERSION} >= 500043 && ${MACHINE_ARCH} == "i386"
+.if defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index 454cccf61e77..3f877859d87c 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.6.tar.gz) = 5c954197a8918d1701f8fb2e34654ed9
+MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
diff --git a/dns/powerdns-devel/files/patch-modules_gmysqlbackend_gmysqlbackend_cc b/dns/powerdns-devel/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
index 300ff8a3b445..bdee751a913b 100644
--- a/dns/powerdns-devel/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
+++ b/dns/powerdns-devel/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
@@ -1,6 +1,6 @@
---- modules/gmysqlbackend/gmysqlbackend.cc.orig	Tue Dec 17 10:56:43 2002
-+++ modules/gmysqlbackend/gmysqlbackend.cc	Tue Dec 17 11:01:33 2002
-@@ -20,13 +20,14 @@
+--- modules/gmysqlbackend/gmysqlbackend.cc.orig	Thu Feb 27 13:49:37 2003
++++ modules/gmysqlbackend/gmysqlbackend.cc	Sun May 11 08:49:16 2003
+@@ -20,14 +20,14 @@
  
  gMySQLBackend::gMySQLBackend(const string &mode, const string &suffix)  : GSQLBackend(mode,suffix)
  {
@@ -13,6 +13,7 @@
    try {
 -    setDB(new SMySQL(getArg("dbname"),
 -		  getArg("host"),
+-		  getArg("port"),
 -		  getArg("socket"),
 -		  getArg("user"),
 -		  getArg("password")));
diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
index 4cc027918def..27faef6f3c45 100644
--- a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
+++ b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
@@ -5,7 +5,7 @@
   
   #include <map>
   #include <vector>
-- #include <crypt.h>
+- // #include <crypt.h>
   #include <exception>
   #include <stdexcept>
   #include <string>
diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh
deleted file mode 100644
index b73538245123..000000000000
--- a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.hh.orig	Thu Mar 13 20:49:33 2003
---- modules/ldapbackend/powerldap.hh	Thu Mar 13 20:49:50 2003
-***************
-*** 2,8 ****
-  #define POWERLDAP_HH
-  #include <map>
-  #include <vector>
-- #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 2,7 ----
diff --git a/dns/powerdns-devel/files/patch-pdns_common_startup_cc b/dns/powerdns-devel/files/patch-pdns_common_startup_cc
deleted file mode 100644
index 939539a58a66..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_common_startup_cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- pdns/common_startup.cc.orig	Tue Dec 17 08:18:41 2002
-+++ pdns/common_startup.cc	Tue Dec 17 08:19:58 2002
-@@ -270,8 +270,10 @@
-     TN->go(); // tcp nameserver launch
-     
-   //  fork(); (this worked :-))
--  for(int n=0;n<arg().asNum("receiver-threads");++n) {
--    DNSDistributor *D= new DNSDistributor(arg().asNum("distributor-threads")); // the big dispatcher!
-+  int foo1 = arg().asNum("receiver-threads");
-+  for(int n=0;n<foo1;++n) {
-+    int foo2 = arg().asNum("distributor-threads");
-+    DNSDistributor *D= new DNSDistributor(foo2); // the big dispatcher!
-     pthread_create(&qtid,0,qthread,static_cast<void *>(D)); // receives packets
-   }
- 
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 59a25e744fe5..9c102b6dc03b 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -1,7 +1,8 @@
 bin/pdns_control
+bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
-%%RECURSOR%%bin/pdns_recursor
+%%RECURSOR%%sbin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 4176ffac5787..c5bb4d4c00de 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.6
+PORTVERSION=	2.9.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -99,7 +99,7 @@ post-patch:
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if ${OSVERSION} >= 500043 && ${MACHINE_ARCH} == "i386"
+.if defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 454cccf61e77..3f877859d87c 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.6.tar.gz) = 5c954197a8918d1701f8fb2e34654ed9
+MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
diff --git a/dns/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc b/dns/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
index 300ff8a3b445..bdee751a913b 100644
--- a/dns/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
+++ b/dns/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
@@ -1,6 +1,6 @@
---- modules/gmysqlbackend/gmysqlbackend.cc.orig	Tue Dec 17 10:56:43 2002
-+++ modules/gmysqlbackend/gmysqlbackend.cc	Tue Dec 17 11:01:33 2002
-@@ -20,13 +20,14 @@
+--- modules/gmysqlbackend/gmysqlbackend.cc.orig	Thu Feb 27 13:49:37 2003
++++ modules/gmysqlbackend/gmysqlbackend.cc	Sun May 11 08:49:16 2003
+@@ -20,14 +20,14 @@
  
  gMySQLBackend::gMySQLBackend(const string &mode, const string &suffix)  : GSQLBackend(mode,suffix)
  {
@@ -13,6 +13,7 @@
    try {
 -    setDB(new SMySQL(getArg("dbname"),
 -		  getArg("host"),
+-		  getArg("port"),
 -		  getArg("socket"),
 -		  getArg("user"),
 -		  getArg("password")));
diff --git a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
index 4cc027918def..27faef6f3c45 100644
--- a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
+++ b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
@@ -5,7 +5,7 @@
   
   #include <map>
   #include <vector>
-- #include <crypt.h>
+- // #include <crypt.h>
   #include <exception>
   #include <stdexcept>
   #include <string>
diff --git a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh
deleted file mode 100644
index b73538245123..000000000000
--- a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.hh.orig	Thu Mar 13 20:49:33 2003
---- modules/ldapbackend/powerldap.hh	Thu Mar 13 20:49:50 2003
-***************
-*** 2,8 ****
-  #define POWERLDAP_HH
-  #include <map>
-  #include <vector>
-- #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 2,7 ----
diff --git a/dns/powerdns/files/patch-pdns_common_startup_cc b/dns/powerdns/files/patch-pdns_common_startup_cc
deleted file mode 100644
index 939539a58a66..000000000000
--- a/dns/powerdns/files/patch-pdns_common_startup_cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- pdns/common_startup.cc.orig	Tue Dec 17 08:18:41 2002
-+++ pdns/common_startup.cc	Tue Dec 17 08:19:58 2002
-@@ -270,8 +270,10 @@
-     TN->go(); // tcp nameserver launch
-     
-   //  fork(); (this worked :-))
--  for(int n=0;n<arg().asNum("receiver-threads");++n) {
--    DNSDistributor *D= new DNSDistributor(arg().asNum("distributor-threads")); // the big dispatcher!
-+  int foo1 = arg().asNum("receiver-threads");
-+  for(int n=0;n<foo1;++n) {
-+    int foo2 = arg().asNum("distributor-threads");
-+    DNSDistributor *D= new DNSDistributor(foo2); // the big dispatcher!
-     pthread_create(&qtid,0,qthread,static_cast<void *>(D)); // receives packets
-   }
- 
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index 59a25e744fe5..9c102b6dc03b 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -1,7 +1,8 @@
 bin/pdns_control
+bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
-%%RECURSOR%%bin/pdns_recursor
+%%RECURSOR%%sbin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 4176ffac5787..c5bb4d4c00de 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.6
+PORTVERSION=	2.9.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -99,7 +99,7 @@ post-patch:
 		${WRKSRC}/pdns/Makefile.in
 .endif
 
-.if ${OSVERSION} >= 500043 && ${MACHINE_ARCH} == "i386"
+.if defined(POWERDNS_WITH_RECURSOR)
 CONFIGURE_ARGS+=	--enable-recursor
 PLIST_SUB+=		RECURSOR=""
 .else
diff --git a/net/powerdns/distinfo b/net/powerdns/distinfo
index 454cccf61e77..3f877859d87c 100644
--- a/net/powerdns/distinfo
+++ b/net/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.6.tar.gz) = 5c954197a8918d1701f8fb2e34654ed9
+MD5 (pdns-2.9.8.tar.gz) = fdd443276f50520efbe2e2b608499a11
diff --git a/net/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc b/net/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
index 300ff8a3b445..bdee751a913b 100644
--- a/net/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
+++ b/net/powerdns/files/patch-modules_gmysqlbackend_gmysqlbackend_cc
@@ -1,6 +1,6 @@
---- modules/gmysqlbackend/gmysqlbackend.cc.orig	Tue Dec 17 10:56:43 2002
-+++ modules/gmysqlbackend/gmysqlbackend.cc	Tue Dec 17 11:01:33 2002
-@@ -20,13 +20,14 @@
+--- modules/gmysqlbackend/gmysqlbackend.cc.orig	Thu Feb 27 13:49:37 2003
++++ modules/gmysqlbackend/gmysqlbackend.cc	Sun May 11 08:49:16 2003
+@@ -20,14 +20,14 @@
  
  gMySQLBackend::gMySQLBackend(const string &mode, const string &suffix)  : GSQLBackend(mode,suffix)
  {
@@ -13,6 +13,7 @@
    try {
 -    setDB(new SMySQL(getArg("dbname"),
 -		  getArg("host"),
+-		  getArg("port"),
 -		  getArg("socket"),
 -		  getArg("user"),
 -		  getArg("password")));
diff --git a/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc b/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
index 4cc027918def..27faef6f3c45 100644
--- a/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
+++ b/net/powerdns/files/patch-modules_ldapbackend_powerldap.cc
@@ -5,7 +5,7 @@
   
   #include <map>
   #include <vector>
-- #include <crypt.h>
+- // #include <crypt.h>
   #include <exception>
   #include <stdexcept>
   #include <string>
diff --git a/net/powerdns/files/patch-modules_ldapbackend_powerldap.hh b/net/powerdns/files/patch-modules_ldapbackend_powerldap.hh
deleted file mode 100644
index b73538245123..000000000000
--- a/net/powerdns/files/patch-modules_ldapbackend_powerldap.hh
+++ /dev/null
@@ -1,12 +0,0 @@
-*** modules/ldapbackend/powerldap.hh.orig	Thu Mar 13 20:49:33 2003
---- modules/ldapbackend/powerldap.hh	Thu Mar 13 20:49:50 2003
-***************
-*** 2,8 ****
-  #define POWERLDAP_HH
-  #include <map>
-  #include <vector>
-- #include <crypt.h>
-  #include <exception>
-  #include <stdexcept>
-  #include <string>
---- 2,7 ----
diff --git a/net/powerdns/files/patch-pdns_common_startup_cc b/net/powerdns/files/patch-pdns_common_startup_cc
deleted file mode 100644
index 939539a58a66..000000000000
--- a/net/powerdns/files/patch-pdns_common_startup_cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- pdns/common_startup.cc.orig	Tue Dec 17 08:18:41 2002
-+++ pdns/common_startup.cc	Tue Dec 17 08:19:58 2002
-@@ -270,8 +270,10 @@
-     TN->go(); // tcp nameserver launch
-     
-   //  fork(); (this worked :-))
--  for(int n=0;n<arg().asNum("receiver-threads");++n) {
--    DNSDistributor *D= new DNSDistributor(arg().asNum("distributor-threads")); // the big dispatcher!
-+  int foo1 = arg().asNum("receiver-threads");
-+  for(int n=0;n<foo1;++n) {
-+    int foo2 = arg().asNum("distributor-threads");
-+    DNSDistributor *D= new DNSDistributor(foo2); // the big dispatcher!
-     pthread_create(&qtid,0,qthread,static_cast<void *>(D)); // receives packets
-   }
- 
diff --git a/net/powerdns/pkg-plist b/net/powerdns/pkg-plist
index 59a25e744fe5..9c102b6dc03b 100644
--- a/net/powerdns/pkg-plist
+++ b/net/powerdns/pkg-plist
@@ -1,7 +1,8 @@
 bin/pdns_control
+bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
-%%RECURSOR%%bin/pdns_recursor
+%%RECURSOR%%sbin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf