Index: head/dns/powerdns/Makefile
===================================================================
--- head/dns/powerdns/Makefile
+++ head/dns/powerdns/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	4.0.4
-PORTREVISION=	6
+DISTVERSION=	4.1.0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
-DISTNAME=	pdns-${PORTVERSION}
+DISTNAME=	pdns-${DISTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	Advanced DNS server with multiple backends including SQL
@@ -78,9 +77,9 @@
 OPENLDAP_USE=		OPENLDAP=YES
 OPENLDAP_VARS=		MODULES+=ldap
 
-OPTALGO_CONFIGURE_ON=	--enable-botan1.10 \
+OPTALGO_CONFIGURE_ON=	--enable-botan \
 			--enable-libsodium
-OPTALGO_LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+OPTALGO_LIB_DEPENDS=	libbotan-2.so:security/botan2 \
 			libsodium.so:security/libsodium
 
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
Index: head/dns/powerdns/distinfo
===================================================================
--- head/dns/powerdns/distinfo
+++ head/dns/powerdns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498217242
-SHA256 (pdns-4.0.4.tar.bz2) = d974ab89de69477c7f581a3233bc731eacbb43d479291e472b2c531c83b6d763
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+TIMESTAMP = 1512047293
+SHA256 (pdns-4.1.0.tar.bz2) = db9193b0f0255c24dfbfc31ecff8bd39e21fec05ff7526e5aea963abc517f0f3
+SIZE (pdns-4.1.0.tar.bz2) = 1116905
Index: head/dns/powerdns/files/patch-ext_json11_json11.cpp
===================================================================
--- head/dns/powerdns/files/patch-ext_json11_json11.cpp
+++ head/dns/powerdns/files/patch-ext_json11_json11.cpp
@@ -1,37 +0,0 @@
---- ext/json11/json11.cpp.orig	2017-01-18 18:06:37 UTC
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ using std::make_shared;
- using std::initializer_list;
- using std::move;
- 
-+/* Helper for representing null - just a do-nothing struct, plus comparison
-+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
-+ * it may not be orderable.
-+*/
-+
-+struct NullStruct {
-+    bool operator==(NullStruct) const { return true; }
-+    bool operator<(NullStruct) const { return false; }
-+};
-+
- /* * * * * * * * * * * * * * * * * * * *
-  * Serialization
-  */
- 
--static void dump(std::nullptr_t, string &out) {
-+static void dump(NullStruct, string &out) {
-     out += "null";
- }
- 
-@@ -204,9 +214,9 @@ public:
-     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
- };
- 
--class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
-+class JsonNull final : public Value<Json::NUL, NullStruct> {
- public:
--    JsonNull() : Value(nullptr) {}
-+    JsonNull() : Value({}) {}
- };
- 
- /* * * * * * * * * * * * * * * * * * * *
Index: head/dns/powerdns/files/patch-pdns_botan110signers.cc
===================================================================
--- head/dns/powerdns/files/patch-pdns_botan110signers.cc
+++ head/dns/powerdns/files/patch-pdns_botan110signers.cc
@@ -1,15 +0,0 @@
-https://github.com/PowerDNS/pdns/pull/5498/commits/0f8f34997afc2c3609b2f3df72ca808940d2a778#diff-a69f1deeeb9a0d7ebabc200a4c24c9f9L184
---- pdns/botan110signers.cc.orig	2017-08-31 08:52:49 UTC
-+++ pdns/botan110signers.cc
-@@ -181,8 +181,9 @@ std::string GOSTDNSCryptoKeyEngine::getP
- 
- std::string GOSTDNSCryptoKeyEngine::getPublicKeyString() const
- {
--  const BigInt&x =d_key->public_point().get_affine_x();
--  const BigInt&y =d_key->public_point().get_affine_y();
-+  std::shared_ptr<GOST_3410_PublicKey> pk = d_pubkey ? d_pubkey : d_key;
-+  const BigInt&x =pk->public_point().get_affine_x();
-+  const BigInt&y =pk->public_point().get_affine_y();
-   
-   size_t part_size = std::max(x.bytes(), y.bytes());
-  
Index: head/dns/powerdns/pkg-plist
===================================================================
--- head/dns/powerdns/pkg-plist
+++ head/dns/powerdns/pkg-plist
@@ -33,18 +33,18 @@
 %%SQLITE3%%lib/pdns/libgsqlite3backend.so
 %%TINYDNS%%lib/pdns/libtinydnsbackend.so
 %%UNIXODBC%%lib/pdns/libgodbcbackend.so
-man/man1/calidns.1.gz
-man/man1/dnsbulktest.1.gz
-man/man1/dnsgram.1.gz
-man/man1/dnsscan.1.gz
-man/man1/dumresp.1.gz
-man/man1/ixplore.1.gz
-man/man1/nproxy.1.gz
-man/man1/nsec3dig.1.gz
-man/man1/pdns_notify.1.gz
+%%TOOLS%%man/man1/calidns.1.gz
+%%TOOLS%%man/man1/dnsbulktest.1.gz
+%%TOOLS%%man/man1/dnsgram.1.gz
+%%TOOLS%%man/man1/dnsscan.1.gz
+%%TOOLS%%man/man1/dumresp.1.gz
+%%TOOLS%%man/man1/ixplore.1.gz
+%%TOOLS%%man/man1/nproxy.1.gz
+%%TOOLS%%man/man1/nsec3dig.1.gz
+%%TOOLS%%man/man1/pdns_notify.1.gz
 man/man1/pdnsutil.1.gz
-man/man1/saxfr.1.gz
-man/man1/sdig.1.gz
+%%TOOLS%%man/man1/saxfr.1.gz
+%%TOOLS%%man/man1/sdig.1.gz
 man/man1/pdns_control.1.gz
 man/man1/pdns_server.1.gz
 man/man1/zone2json.1.gz
@@ -58,6 +58,8 @@
 @sample etc/pdns/pdns.conf-dist etc/pdns/pdns.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf
 %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.mysql.sql
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.pgsql.sql
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.sqlite3.sql