6 files changed, 8 insertions, 56 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index d8e5cfbf3e64..1832faa8c6f4 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.19
-PORTREVISION=	2
+PORTVERSION=	2.9.20
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index 68b5882b7228..8d9a4a9444cf 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdns-2.9.19.tar.gz) = 30c96878b56845329cca5b8a351277b4
-SHA256 (pdns-2.9.19.tar.gz) = e6af0f7d83d48c72cb9d21524ce7f31a521f45aad1f82970bed31a52fe5bfac0
-SIZE (pdns-2.9.19.tar.gz) = 855801
+MD5 (pdns-2.9.20.tar.gz) = 33b20ef1b767f93297101f2aa09e99ed
+SHA256 (pdns-2.9.20.tar.gz) = 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d
+SIZE (pdns-2.9.20.tar.gz) = 867520
diff --git a/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc b/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc
deleted file mode 100644
index 61b4e288c4c3..000000000000
--- a/dns/powerdns-devel/files/patch-pdns__recursos_cache.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- pdns/recursor_cache.cc	(revision 533)
-+++ pdns/recursor_cache.cc	(revision 534)
-@@ -61,7 +61,12 @@
- void MemRecursorCache::replace(const string &qname, const QType& qt,  const set<DNSResourceRecord>& content)
- {
-   set<StoredRecord>& stored=d_cache[toLowerCanonic(qname)+"|"+qt.getName()];
-+
-+  for(set<StoredRecord>::iterator k=stored.begin();k!=stored.end();++k) 
-+    k->d_string.prune();
-+
-   stored.clear();
-+
-   for(set<DNSResourceRecord>::const_iterator i=content.begin(); i != content.end(); ++i) {
-     StoredRecord dr;
-     dr.d_ttd=i->ttl;
-@@ -88,7 +93,6 @@
-     if(j->second.empty()) { // everything is gone
-       d_cache.erase(j++);
-       names++;
--      
-     }
-     else {
-       ++j;
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index d8e5cfbf3e64..1832faa8c6f4 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.19
-PORTREVISION=	2
+PORTVERSION=	2.9.20
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 68b5882b7228..8d9a4a9444cf 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdns-2.9.19.tar.gz) = 30c96878b56845329cca5b8a351277b4
-SHA256 (pdns-2.9.19.tar.gz) = e6af0f7d83d48c72cb9d21524ce7f31a521f45aad1f82970bed31a52fe5bfac0
-SIZE (pdns-2.9.19.tar.gz) = 855801
+MD5 (pdns-2.9.20.tar.gz) = 33b20ef1b767f93297101f2aa09e99ed
+SHA256 (pdns-2.9.20.tar.gz) = 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d
+SIZE (pdns-2.9.20.tar.gz) = 867520
diff --git a/dns/powerdns/files/patch-pdns__recursos_cache.cc b/dns/powerdns/files/patch-pdns__recursos_cache.cc
deleted file mode 100644
index 61b4e288c4c3..000000000000
--- a/dns/powerdns/files/patch-pdns__recursos_cache.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- pdns/recursor_cache.cc	(revision 533)
-+++ pdns/recursor_cache.cc	(revision 534)
-@@ -61,7 +61,12 @@
- void MemRecursorCache::replace(const string &qname, const QType& qt,  const set<DNSResourceRecord>& content)
- {
-   set<StoredRecord>& stored=d_cache[toLowerCanonic(qname)+"|"+qt.getName()];
-+
-+  for(set<StoredRecord>::iterator k=stored.begin();k!=stored.end();++k) 
-+    k->d_string.prune();
-+
-   stored.clear();
-+
-   for(set<DNSResourceRecord>::const_iterator i=content.begin(); i != content.end(); ++i) {
-     StoredRecord dr;
-     dr.d_ttd=i->ttl;
-@@ -88,7 +93,6 @@
-     if(j->second.empty()) { // everything is gone
-       d_cache.erase(j++);
-       names++;
--      
-     }
-     else {
-       ++j;