Index: head/dns/powerdns/pkg-install
===================================================================
--- head/dns/powerdns/pkg-install	(revision 535230)
+++ head/dns/powerdns/pkg-install	(nonexistent)
@@ -1,42 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-securitywarning() {
-cat <<EOF
-
-  === IMPORTANT FOR GPGSQL BACKEND USERS! ===
-  The following only impacts anyone using the
-  gpgsql (PostgreSQL) backend:
-
-  An issue has been found in PowerDNS
-  Authoritative Server allowing an authorized
-  user to cause the server to exit by
-  inserting a crafted record in a MASTER type
-  zone under their control. The issue is due
-  to the fact that the Authoritative Server
-  will exit when it tries to store the
-  notified serial in the PostgreSQL database,
-  if this serial cannot be represented in 31
-  bits.
-
-  To fix the issue, run the following command
-  against your PostgreSQL pdns database:
-
-  ALTER TABLE domains ALTER notified_serial
-  TYPE bigint USING CASE WHEN notified_serial
-  >= 0 THEN notified_serial::bigint END;
-
-  No software changes are required.
-  ===========================================
-EOF
-}
-
-case $2 in
-PRE-INSTALL)
-        securitywarning
-        sleep 5
-        ;;
-esac

Property changes on: head/dns/powerdns/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/dns/powerdns/Makefile
===================================================================
--- head/dns/powerdns/Makefile	(revision 535230)
+++ head/dns/powerdns/Makefile	(revision 535231)
@@ -1,128 +1,132 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
 DISTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${DISTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	Advanced DNS server with multiple backends including SQL
 
 LICENSE=	GPLv2
 
-BROKEN_sparc64=		Does not compile: error: to_string is not a member of std
+BROKEN_sparc64=	Does not compile: error: to_string is not a member of std
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libcurl.so:ftp/curl
 
 USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \
 		pkgconfig ssl tar:bzip2
 USE_LDCONFIG=	YES
 USE_RC_SUBR=	pdns
 USE_SUBMAKE=	YES
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--disable-static \
 		--docdir="${PREFIX}/share/doc/powerdns" \
 		--sysconfdir="${PREFIX}/etc/pdns" \
 		--with-boost="${LOCALBASE}" \
 		--with-dynmodules="pipe bind ${MODULES}" \
 		--with-modules=""
 
 INSTALL_TARGET=	install-strip
 SCRIPTS_ENV=	CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME}" MKDIR="${MKDIR}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" \
 		WRKDIRPREFIX="${WRKDIRPREFIX}"
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP LMDB LUABACKEND LUAJIT \
-				MYSQL OPENLDAP PGSQL PROTOBUF REMOTE \
+OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP IXFRDIST LMDB LUABACKEND \
+				LUAJIT MYSQL OPENLDAP PGSQL PROTOBUF REMOTE \
 				SQLITE3 TINYDNS TOOLS UNIXODBC
 OPTIONS_DEFAULT=		LMDB MYSQL PGSQL SQLITE3
 OPTIONS_GROUP=			GEOIPOPT REMOTEOPT
 OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
 
 OPTIONS_SUB=	yes
 
 GEOIPOPT_DESC=		GeoIP DB options
 GEOIP_DESC=		GeoIP backend (GeoIP2 DB)
+IXFRDIST_DESC=		Build ixfrdist
 LMDB_DESC=		LMDB backend
 LUABACKEND_DESC=	Lua2 backend
 LUAJIT_DESC=		Use LuaJIT instead of Lua
 MYSQL_DESC=		MySQL backend
 OPENLDAP_DESC=		OpenLDAP backend
 PGSQL_DESC=		PostgreSQL backend
 PROTOBUF_DESC=		Protobuf support
 REMOTEOPT_DESC=		Remote backend connectors
 REMOTE_DESC=		Remote backend
 SQLITE3_DESC=		SQLite 3 backend
 TINYDNS_DESC=		TinyDNS backend
 TOOLS_DESC=		Build extra tools
 ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)
 
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb \
 			libyaml-cpp.so:devel/yaml-cpp
 GEOIP_VARS=		MODULES+=geoip
 
+IXFRDIST_CONFIGURE_ENABLE=	ixfrdist
+
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-LMDB_CONFIGURE_OFF=	--without-lmdb
 LMDB_CONFIGURE_ON=	--with-lmdb=${LOCALBASE}
+LMDB_CONFIGURE_OFF=	--without-lmdb
 LMDB_VARS=		MODULES+=lmdb
 
 LUABACKEND_VARS=	MODULES+=lua2
 
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit-openresty
 LUAJIT_USES_OFF=	lua
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 
 MYSQL_USES=		mysql
-MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_VARS=		MODULES+=gmysql
 
 OPENLDAP_USE=		OPENLDAP=YES
 OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
 OPENLDAP_VARS=		MODULES+=ldap
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
 PGSQL_VARS=		MODULES+=gpgsql
 
 PROTOBUF_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 PROTOBUF_CONFIGURE_WITH=	protobuf
 
 REMOTE_VARS=	MODULES+=remote
 
 SQLITE3_USES=	sqlite:3
 SQLITE3_VARS=	MODULES+=gsqlite3
 
 TINYDNS_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 TINYDNS_CONFIGURE_ON=	CDB_CFLAGS="-I${LOCALBASE}/include" \
 			CDB_LIBS="-L${LOCALBASE}/lib -lcdb"
 TINYDNS_VARS=		MODULES+=tinydns
 
 TOOLS_CONFIGURE_ENABLE=	tools
 
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_VARS=		MODULES+=godbc
 
 ZEROMQ_IMPLIES=		REMOTE
 ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZEROMQ_CONFIGURE_ON=	--enable-remotebackend-zeromq
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl
 CONFIGURE_ARGS+=	--with-libdecaf \
 			--with-libsodium
 LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
 			libsodium.so:security/libsodium
 .endif
 
 post-install::
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}/var/run/pdns
 	@${STAGEDIR}${PREFIX}/sbin/pdns_server --module-dir=${STAGEDIR}${PREFIX}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
 	@${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
 
 .include <bsd.port.post.mk>
Index: head/dns/powerdns/files/patch-dns_random.cc
===================================================================
--- head/dns/powerdns/files/patch-dns_random.cc	(revision 535230)
+++ head/dns/powerdns/files/patch-dns_random.cc	(nonexistent)
@@ -1,12 +0,0 @@
---- pdns/dns_random.cc.orig	2018-11-29 12:53:42 UTC
-+++ pdns/dns_random.cc
-@@ -40,7 +40,9 @@
- #include <openssl/rand.h>
- #endif
- #if defined(HAVE_GETRANDOM)
-+extern "C" {
- #include <sys/random.h>
-+}
- #endif
- 
- static enum DNS_RNG {

Property changes on: head/dns/powerdns/files/patch-dns_random.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-ON
\ No newline at end of property
Index: head/dns/powerdns/files/patch-configure
===================================================================
--- head/dns/powerdns/files/patch-configure	(revision 535230)
+++ head/dns/powerdns/files/patch-configure	(revision 535231)
@@ -1,15 +1,15 @@
---- configure.orig	2020-02-18 21:26:30.000000000 -0500
-+++ configure	2020-02-18 21:26:30.000000000 -0500
-@@ -19774,8 +19774,10 @@
+--- configure.orig	2020-04-06 12:51:03 UTC
++++ configure
+@@ -19774,8 +19774,10 @@ fi
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5
  $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; }
              if test -f "$ssldir/include/openssl/crypto.h"; then
 -                LIBCRYPTO_INCLUDES="-I$ssldir/include"
 -                LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
 +                if test $ssldir != /usr; then
 +                    LIBCRYPTO_INCLUDES="-I$ssldir/include"
 +                    LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
 +                fi
                  LIBCRYPTO_LIBS="-lcrypto"
                  found=true
                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
Index: head/dns/powerdns/files/pdns.in
===================================================================
--- head/dns/powerdns/files/pdns.in	(revision 535230)
+++ head/dns/powerdns/files/pdns.in	(revision 535231)
@@ -1,39 +1,39 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: pdns_server
 # REQUIRE: DAEMON SERVERS mysql postgresql slapd
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable powerdns:
 #
 # pdns_enable="YES"
 # pdns_flags="<set as needed>"
 #
 # See pdns_server(8) for flags.
 #
 
 . /etc/rc.subr
 
 name=pdns
 rcvar=pdns_enable
 
 load_rc_config ${name}
 
 pdns_enable=${pdns_enable:-"NO"}
 pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"}
 
 required_files=${pdns_conf}
 
-pidfile=/var/run/pdns/pdns_server.pid
+pidfile=/var/run/pdns/${name}.pid
 
 command=%%PREFIX%%/sbin/pdns_server
 command_args="--daemon --guardian"
 
 monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
 extra_commands="monitor"
 
 run_rc_command "$1"
Index: head/dns/powerdns/files/pkg-message.in
===================================================================
--- head/dns/powerdns/files/pkg-message.in	(revision 535230)
+++ head/dns/powerdns/files/pkg-message.in	(revision 535231)
@@ -1,32 +1,54 @@
 [
 { type: install
   message: <<EOM
- Enable PowerDNS in /etc/rc.conf(.local) or in
- /etc/rc.conf.d/pdns with the following line:
+Enable PowerDNS in /etc/rc.conf(.local) or in /etc/rc.conf.d/pdns with the following line:
 
     pdns_enable="YES"
 
- A configuration template is available in %%PREFIX%%/etc/pdns
- as pdns.conf-dist.
+A configuration template is available in %%PREFIX%%/etc/pdns as pdns.conf-dist.
 
- A pdns.conf with all possible options is available in
- %%EXAMPLESDIR%%
+A pdns.conf with all possible options is available in %%EXAMPLESDIR%%
+
+Initialization file(s) for your database backend(s) are available in %%DOCSDIR%% as "schema.X.sql"
 EOM
 }
 { type: upgrade
-  maximum_versio: 3.4
+  maximum_version: "3.4.0"
   message: <<EOM
- -----------------------------------------------
- IMPORTANT: PowerDNS Authoritative Server 3.4.0+:
- -----------------------------------------------
- This version needs a mandatory schema change for the gmsyql,
- gpgsql and gsqlite3 backends. SQL statements are available in
- %%DOCSDIR%% or http://Doc.PowerDNS.com
- -----------------------------------------------
- IMPORTANT: PowerDNS Authoritative Server 4.3.0+:
- -----------------------------------------------
- MyDNS and OpenDBX backends removed 
- https://Blog.PowerDNS.com/2019/10/17/backend-removals-in-the-upcoming-authoritative-server-release/
+This version needs a mandatory schema change for the gmsyql, gpgsql and gsqlite3 backends. SQL 
+statements are available in %%DOCSDIR%% or https://doc.powerdns.com
+EOM
+}
+{ type: upgrade
+  maximum_version: "4.2.0"
+  mimimum_version: "4.0.0"
+  message: <<EOM
+Autoserial support has been removed. The change_date column has been removed from the records table 
+in all gsql backends, but leaving it in is harmless.
+The Generic PostgreSQL backend schema has changed: the notified_serial column type in the domains 
+table has been changed from INT DEFAULT NULL to BIGINT
+DEFAULT NULL:
+ALTER TABLE domains ALTER notified_serial TYPE bigint USING CASE WHEN notified_serial >= 0 THEN 
+notified_serial::bigint END;
+
+This version needs a mandatory schema change for the gmsyql, godbc (mssql), gpgsql and gsqlite3 
+backends. SQL statements are available in %%DOCSDIR%% or https://doc.powerdns.com
+EOM
+}
+{ type: upgrade
+  minimum_version: "4.2.0"
+  message: <<EOM
+MyDNS and OpenDBX backends removed
+https://Blog.PowerDNS.com/2019/10/17/backend-removals-in-the-upcoming-authoritative-server-release/
+
+The new ‘unpublished DNSSEC keys’ feature' comes with a mandatory schema change for all database 
+backends (including BIND with a DNSSEC database).
+
+This version needs a mandatory schema change for the gmsyql, godbc(mssql), gpgsql and gsqlite3 
+backends. SQL statements are available in %%DOCSDIR%% or https://doc.powerdns.com
+
+For the LMDB backend, please review lmdb-schema-version
+(https://doc.powerdns.com/authoritative/backends/lmdb.html#setting-lmdb-schema-version)
 EOM
 }
 ]
Index: head/dns/powerdns/pkg-plist
===================================================================
--- head/dns/powerdns/pkg-plist	(revision 535230)
+++ head/dns/powerdns/pkg-plist	(revision 535231)
@@ -1,82 +1,91 @@
 bin/pdns_control
 bin/pdnsutil
 bin/zone2json
 bin/zone2sql
 sbin/pdns_server
 %%PROTOBUF%%bin/dnspcap2protobuf
 %%TOOLS%%bin/calidns
 %%TOOLS%%bin/dnsbulktest
 %%TOOLS%%bin/dnsgram
 %%TOOLS%%bin/dnspcap2calidns
 %%TOOLS%%bin/dnsreplay
 %%TOOLS%%bin/dnsscan
 %%TOOLS%%bin/dnsscope
 %%TOOLS%%bin/dnstcpbench
 %%TOOLS%%bin/dnswasher
 %%TOOLS%%bin/dumresp
+%%IXFRDIST%%bin/ixfrdist
 %%TOOLS%%bin/ixplore
 %%TOOLS%%bin/nproxy
 %%TOOLS%%bin/nsec3dig
 %%TOOLS%%bin/pdns_notify
 %%TOOLS%%bin/saxfr
 %%TOOLS%%bin/sdig
 %%TOOLS%%bin/stubquery
 lib/pdns/libbindbackend.so
 lib/pdns/libpipebackend.so
 %%GEOIP%%lib/pdns/libgeoipbackend.so
 %%LMDB%%lib/pdns/liblmdbbackend.so
 %%LUABACKEND%%lib/pdns/liblua2backend.so
 %%MYSQL%%lib/pdns/libgmysqlbackend.so
 %%OPENLDAP%%lib/pdns/libldapbackend.so
 %%OPENLDAP%%bin/zone2ldap
 %%PGSQL%%lib/pdns/libgpgsqlbackend.so
 %%REMOTE%%lib/pdns/libremotebackend.so
 %%SQLITE3%%lib/pdns/libgsqlite3backend.so
 %%TINYDNS%%lib/pdns/libtinydnsbackend.so
 %%UNIXODBC%%lib/pdns/libgodbcbackend.so
 %%TOOLS%%man/man1/calidns.1.gz
 %%TOOLS%%man/man1/dnsbulktest.1.gz
 %%TOOLS%%man/man1/dnsgram.1.gz
 %%TOOLS%%man/man1/dnspcap2calidns.1.gz
 %%TOOLS%%man/man1/dnsscan.1.gz
 %%TOOLS%%man/man1/dumresp.1.gz
+%%IXFRDIST%%man/man1/ixfrdist.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
 %%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
 %%OPENLDAP%%man/man1/zone2ldap.1.gz
 man/man1/zone2sql.1.gz
 %%PROTOBUF%%man/man1/dnspcap2protobuf.1.gz
 %%TOOLS%%man/man1/dnstcpbench.1.gz
 %%TOOLS%%man/man1/dnsreplay.1.gz
 %%TOOLS%%man/man1/dnsscope.1.gz
 %%TOOLS%%man/man1/dnswasher.1.gz
+%%IXFRDIST%%man/man5/ixfrdist.yml.5.gz
+%%IXFRDIST%%etc/pdns/ixfrdist.example.yml
 @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
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.0.0_schema.sqlite3.sql
+%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.mssql.sql
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.sqlite3.sql
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.1.0_to_4.2.0_schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.1.0_to_4.2.0_schema.pgsql.sql
+%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mssql.sql
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.pgsql.sql
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.sqlite3.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
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/enable-foreign-keys.mysql.sql
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
 %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/dnsdomain2.schema
 %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/pdns-domaininfo.schema
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql
 %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/schema.mssql.sql
 @dir(root,wheel,0755) /var/run/pdns