dns/powerdns-recursor: update 4.0.5 -> 4.0.6

- Add option (OPTALGO) for optional algorithms 12 & 15
- Pet portlint

PR:		220533
Submitted by:	Ralf van der Enden <tremere@cainites.net> (maintainer)

3 files changed, 14 insertions, 60 deletions

diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index ee959af1304d..050f8bbe0ea8 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recursor
-PORTVERSION=	4.0.5
+PORTVERSION=	4.0.6
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
@@ -13,13 +13,13 @@ COMMENT=	Advanced DNS recursor
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libboost_context.so:devel/boost-libs
+
 BROKEN_armv6=		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
 BROKEN_powerpc64=	fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
-LIB_DEPENDS=	libboost_context.so:devel/boost-libs
-
 USES=		compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	YES
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
@@ -29,12 +29,13 @@ CPE_VENDOR=	powerdns
 
 USE_RC_SUBR=	pdns-recursor
 
-OPTIONS_DEFINE=	SETUID
+OPTIONS_DEFINE=	OPTALGO SETUID
 OPTIONS_DEFAULT=	LUA SETUID
 OPTIONS_RADIO=	LUA_RG
 OPTIONS_RADIO_LUA_RG=	LUA LUAJIT
 LUAJIT_DESC=		Enable LuaJIT
 LUA_RG_DESC=		Lua Engine
+OPTALGO_DESC=		Enable optional algorithms (12 & 15)
 SETUID_DESC=		Run as pdns_recursor user
 
 LUA_CONFIGURE_WITH=	lua
@@ -43,6 +44,11 @@ LUA_USES=		lua
 LUAJIT_CONFIGURE_WITH=	luajit
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
 
+OPTALGO_CONFIGURE_ON=	--enable-botan1.10 \
+			--enable-libsodium
+OPTALGO_LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+			libsodium.so:security/libsodium
+
 SETUID_VARS=	USERS=pdns_recursor GROUPS=pdns
 SETUID_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-setuid
 
diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo
index 207eac41ab31..a86df5f160c9 100644
--- a/dns/powerdns-recursor/distinfo
+++ b/dns/powerdns-recursor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497513533
-SHA256 (pdns-recursor-4.0.5.tar.bz2) = ba43ce4280b3a06afebe58c5d63680f51dd525c63d1de7f3b229b380e6b1b7af
-SIZE (pdns-recursor-4.0.5.tar.bz2) = 1066145
+TIMESTAMP = 1499338924
+SHA256 (pdns-recursor-4.0.6.tar.bz2) = f2182ac644268bb08b865a71351f11d75c5015ac0608a1469eb4c1cd5494d60d
+SIZE (pdns-recursor-4.0.6.tar.bz2) = 1105423
diff --git a/dns/powerdns-recursor/files/patch-configure b/dns/powerdns-recursor/files/patch-configure
deleted file mode 100644
index 64b84f079864..000000000000
--- a/dns/powerdns-recursor/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	2017-06-13 09:59:12 UTC
-+++ configure
-@@ -15885,17 +15885,14 @@ fi
- 
-   case "$host" in
-   mips* | powerpc* )
--    as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_cannot continue" "$LINENO" 5
--    _-latomic" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
- $as_echo_n "checking whether the linker accepts -latomic... " >&6; }
--if eval \${$as_CACHEVAR+:} false; then :
-+if ${ax_cv_check_ldflags___latomic+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-   ax_check_save_flags=$LDFLAGS
--  LDFLAGS="$LDFLAGS cannot continue" "$LINENO" 5
--     -latomic"
-+  LDFLAGS="$LDFLAGS  -latomic"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15908,21 +15905,21 @@ main ()
- }
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
--  eval "$as_CACHEVAR=yes"
-+  ax_cv_check_ldflags___latomic=yes
- else
--  eval "$as_CACHEVAR=no"
-+  ax_cv_check_ldflags___latomic=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$ax_check_save_flags
- fi
--eval ac_res=\$$as_CACHEVAR
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
-+$as_echo "$ax_cv_check_ldflags___latomic" >&6; }
-+if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
-    :
- else
--  as_fn_error $? "Unable to link against libatomic
-+   as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
-+
- fi
- 
-     LDFLAGS="-latomic $LDFLAGS"