Index: head/dns/powerdns-recursor/Makefile
===================================================================
--- head/dns/powerdns-recursor/Makefile	(revision 534144)
+++ head/dns/powerdns-recursor/Makefile	(revision 534145)
@@ -1,60 +1,61 @@
 # Created by: sten@blinkenlights.nl
 # $FreeBSD$
 
 PORTNAME=	recursor
-DISTVERSION=	4.2.1
+DISTVERSION=	4.3.0
 CATEGORIES=	dns
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
 DISTNAME=	pdns-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	Advanced DNS recursor
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=	fails to compile: use of overloaded operator << is ambiguous
 BROKEN_armv7=	fails to compile: use of overloaded operator << is ambiguous
 BROKEN_sparc64=	fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
 		libprotobuf.so:devel/protobuf
 
 USES=		compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl \
 		tar:bzip2
 
 CPE_VENDOR=	powerdns
 USE_RC_SUBR=	pdns-recursor
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pdns \
 		--with-protobuf \
 		--without-net-snmp
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		LUAJIT SETUID
-OPTIONS_DEFAULT=	SETUID
+USERS=		pdns_recursor
+GROUPS=		pdns
 
+OPTIONS_DEFINE=	LUAJIT
+
 LUAJIT_DESC=	Use LuaJIT instead of Lua
-SETUID_DESC=	Run as pdns_recursor user
 
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit-openresty
 LUAJIT_USES_OFF=	lua
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 
-SETUID_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-setuid
-SETUID_VARS=		GROUPS=pdns \
-			USERS=pdns_recursor
-
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl
 CONFIGURE_ARGS+=	--enable-libdecaf \
 			--enable-libsodium
 LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
 			libsodium.so:security/libsodium
 .endif
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/var/run/pdns-recursor
 
 .include <bsd.port.post.mk>
Index: head/dns/powerdns-recursor/distinfo
===================================================================
--- head/dns/powerdns-recursor/distinfo	(revision 534144)
+++ head/dns/powerdns-recursor/distinfo	(revision 534145)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575887223
-SHA256 (pdns-recursor-4.2.1.tar.bz2) = 8d8c3235cc5281f0fc51946129f22758778f4c50bfda095d5856feb4c756891f
-SIZE (pdns-recursor-4.2.1.tar.bz2) = 1318022
+TIMESTAMP = 1583454090
+SHA256 (pdns-recursor-4.3.0.tar.bz2) = 2bc130f287dfdb32e03d0b38a4ac24baf1117f96eca9b407611c847fa08a628f
+SIZE (pdns-recursor-4.3.0.tar.bz2) = 1349359
Index: head/dns/powerdns-recursor/files/patch-pdns_dns__random.cc
===================================================================
--- head/dns/powerdns-recursor/files/patch-pdns_dns__random.cc	(revision 534144)
+++ head/dns/powerdns-recursor/files/patch-pdns_dns__random.cc	(nonexistent)
@@ -1,12 +0,0 @@
---- dns_random.cc.orig	2018-11-29 12:53:42 UTC
-+++ 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-recursor/files/patch-pdns_dns__random.cc
___________________________________________________________________
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-recursor/files/extrapatch-setuid
===================================================================
--- head/dns/powerdns-recursor/files/extrapatch-setuid	(revision 534144)
+++ head/dns/powerdns-recursor/files/extrapatch-setuid	(nonexistent)
@@ -1,13 +0,0 @@
---- pdns_recursor.cc.orig	2017-12-11 13:13:52.274237000 +0100
-+++ pdns_recursor.cc	2017-12-11 13:18:42.339569000 +0100
-@@ -3325,8 +3325,8 @@
-     ::arg().set("log-timestamp","Print timestamps in log lines, useful to disable when running with a tool that timestamps stdout already")="yes";
-     ::arg().set("log-common-errors","If we should log rather common errors")="no";
-     ::arg().set("chroot","switch to chroot jail")="";
--    ::arg().set("setgid","If set, change group id to this gid for more security")="";
--    ::arg().set("setuid","If set, change user id to this uid for more security")="";
-+    ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
-+    ::arg().set("setuid","If set, change user id to this uid for more security")="pdns_recursor";
-     ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o")="1500";
-     ::arg().set("threads", "Launch this number of threads")="2";
-     ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1"; // if we un-experimental this, need to fix openssl rand seeding for multiple PIDs!

Property changes on: head/dns/powerdns-recursor/files/extrapatch-setuid
___________________________________________________________________
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-recursor/files/patch-configure
===================================================================
--- head/dns/powerdns-recursor/files/patch-configure	(revision 534144)
+++ head/dns/powerdns-recursor/files/patch-configure	(revision 534145)
@@ -1,15 +1,15 @@
---- configure.orig	2019-05-17 10:25:29 UTC
-+++ configure
-@@ -19350,8 +19350,10 @@ fi
+--- configure.orig	2020-03-02 07:50:20.000000000 -0500
++++ configure	2020-03-02 07:50:20.000000000 -0500
+@@ -21139,8 +21139,10 @@
              { $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-recursor/files/patch-dns_random.cc
===================================================================
--- head/dns/powerdns-recursor/files/patch-dns_random.cc	(nonexistent)
+++ head/dns/powerdns-recursor/files/patch-dns_random.cc	(revision 534145)
@@ -0,0 +1,12 @@
+--- dns_random.cc.orig	2018-11-29 12:53:42 UTC
++++ 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-recursor/files/patch-dns_random.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/dns/powerdns-recursor/files/patch-dnsname.hh
===================================================================
--- head/dns/powerdns-recursor/files/patch-dnsname.hh	(revision 534144)
+++ head/dns/powerdns-recursor/files/patch-dnsname.hh	(revision 534145)
@@ -1,20 +1,20 @@
---- dnsname.hh.orig	2019-01-31 19:43:44 UTC
-+++ dnsname.hh
-@@ -30,7 +30,7 @@
+--- dnsname.hh.orig	2020-03-02 07:49:54.000000000 -0500
++++ dnsname.hh	2020-03-02 07:49:54.000000000 -0500
+@@ -33,7 +33,7 @@
  #include <boost/version.hpp>
  
  // it crashes on OSX and doesn't compile on OpenBSD
 -#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
 +#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__)
  #include <boost/container/string.hpp>
  #endif
  
-@@ -135,7 +135,7 @@ class DNSName (public)
+@@ -138,7 +138,7 @@
    inline bool canonCompare(const DNSName& rhs) const;
    bool slowCanonCompare(const DNSName& rhs) const;  
  
 -#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
 +#if BOOST_VERSION >= 105300 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__)
    typedef boost::container::string string_t;
  #else
    typedef std::string string_t;
Index: head/dns/powerdns-recursor/files/patch-pdns_recursor.cc
===================================================================
--- head/dns/powerdns-recursor/files/patch-pdns_recursor.cc	(nonexistent)
+++ head/dns/powerdns-recursor/files/patch-pdns_recursor.cc	(revision 534145)
@@ -0,0 +1,17 @@
+--- pdns_recursor.cc.orig	2020-03-02 07:49:54.000000000 -0500
++++ pdns_recursor.cc	2020-03-02 07:49:54.000000000 -0500
+@@ -4639,12 +4639,12 @@
+ #define SYSTEMD_SETID_MSG ". When running inside systemd, use the User and Group settings in the unit-file!"
+         SYSTEMD_SETID_MSG
+ #endif
+-        )="";
++        )="pdns";
+     ::arg().set("setuid","If set, change user id to this uid for more security"
+ #ifdef HAVE_SYSTEMD
+         SYSTEMD_SETID_MSG
+ #endif
+-        )="";
++        )="pdns_recursor";
+     ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o")="1500";
+     ::arg().set("threads", "Launch this number of threads")="2";
+     ::arg().set("distributor-threads", "Launch this number of distributor threads, distributing queries to other threads")="0";

Property changes on: head/dns/powerdns-recursor/files/patch-pdns_recursor.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/dns/powerdns-recursor/files/pdns-recursor.in
===================================================================
--- head/dns/powerdns-recursor/files/pdns-recursor.in	(revision 534144)
+++ head/dns/powerdns-recursor/files/pdns-recursor.in	(revision 534145)
@@ -1,37 +1,36 @@
 #!/bin/sh
 #
-# $$
+# $FreeBSD$
 #
 
 # PROVIDE: pdns_recursor
-# REQUIRE: SERVERS cleanvar
-# BEFORE:  DAEMON
+# REQUIRE: NETWORKING
+# BEFORE: SERVERS
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable pdns_recursor:
 #
 # pdns_recursor_enable="YES"
 # pdns_recursor_flags="<set as needed>"
 #
 # See pdns_recursor(8) for flags.
 #
 
 . /etc/rc.subr
 
 name=pdns_recursor
 rcvar=pdns_recursor_enable
 
-command=%%PREFIX%%/sbin/pdns_recursor
-command_args="--daemon=yes"
+load_rc_config ${name}
 
-# set defaults
-
 pdns_recursor_enable=${pdns_recursor_enable:-"NO"}
 pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/pdns/recursor.conf"}
+required_files=${pdns_recursor_conf}
 
-load_rc_config ${name}
+pidfile=/var/run/pdns-recursor/${name}.pid
 
-required_files=${pdns_recursor_conf}
+command=%%PREFIX%%/sbin/${name}
+command_args="--daemon"
 
 run_rc_command "$1"
Index: head/dns/powerdns-recursor/files/pkg-message.in
===================================================================
--- head/dns/powerdns-recursor/files/pkg-message.in	(revision 534144)
+++ head/dns/powerdns-recursor/files/pkg-message.in	(revision 534145)
@@ -1,13 +1,14 @@
 [
 { type: install
   message: <<EOM
- If you want to use the powerdns recursor,
+ If you want to use the PowerDNS Recursor,
  you need the following line in /etc/rc.conf(.local)
+ or in /etc/rc.conf.d/pdns_recursor
 
     pdns_recursor_enable="YES"
 
  Configuration templates are available in %%PREFIX%%/etc/pdns
  as recursor.conf-dist.
 EOM
 }
 ]
Index: head/dns/powerdns-recursor/pkg-descr
===================================================================
--- head/dns/powerdns-recursor/pkg-descr	(revision 534144)
+++ head/dns/powerdns-recursor/pkg-descr	(revision 534145)
@@ -1,4 +1,23 @@
-PowerDNS recursor is a high performance, simple and secure recursing
-nameserver. It currently powers over two million internet connections.
+The PowerDNS Recursor is a high-end, high-performance resolving
+name server which powers the DNS resolution of at least a hundred
+million subscribers. Utilizing multiple processors and supporting
+the same powerful scripting ability of the Authoritative Server,
+the Recursor delivers top performance while retaining the flexibility
+modern DNS deployments require:
 
-WWW: https://www.powerdns.com
+ * IPv4, UDP/TCP
+ * IPv6, UDP/TCP, 100% compliant
+ * Remotely pollable statistics for real time graphing
+ * Full support for all relevant standards
+ * Advanced anti-spoofing measures
+ * Reconfiguration without downtime
+ * Plain BIND zone files for "resolved hosting"
+ * Internal Lua-based scripted answer generation
+ * Question interception, answer reconditioning, NXDOMAIN redirection
+   - Including 'block lists' and security measures
+ * API for direct control (rec_control)
+   - Local and remote access
+ * DNS Response Policy Zones (RPZ)
+ * DNS64
+
+WWW: https://www.PowerDNS.com/recursor.html
Index: head/dns/powerdns-recursor/pkg-plist
===================================================================
--- head/dns/powerdns-recursor/pkg-plist	(revision 534144)
+++ head/dns/powerdns-recursor/pkg-plist	(revision 534145)
@@ -1,5 +1,6 @@
 @sample etc/pdns/recursor.conf-dist etc/pdns/recursor.conf
 bin/rec_control
 sbin/pdns_recursor
 man/man1/pdns_recursor.1.gz
 man/man1/rec_control.1.gz
+@dir(root,wheel,0755) /var/run/pdns-recursor