Index: head/dns/powerdns/Makefile
===================================================================
--- head/dns/powerdns/Makefile
+++ head/dns/powerdns/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	4.0.3
-PORTREVISION=	5
+PORTVERSION=	4.0.4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -12,11 +11,11 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
-
 BROKEN_powerpc64=	Does not build: undefined reference to std::__throw_out_of_range_fmt
 BROKEN_sparc64=		Does not compile: error: to_string is not a member of std
 
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
+
 USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \
 		tar:bzip2
 USE_LDCONFIG=	YES
@@ -39,7 +38,7 @@
 
 USE_RC_SUBR=	pdns
 
-OPTIONS_DEFINE=	GEOIP MYDNS MYSQL OPENDBX OPENLDAP PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
+OPTIONS_DEFINE=	GEOIP MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
 OPTIONS_GROUP=	EXPERIMENTAL REMOTEOPT
 OPTIONS_GROUP_EXPERIMENTAL=	LUABACKEND
 OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
@@ -63,12 +62,12 @@
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
 
 MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYDNS_USE=		MYSQL=YES
+MYDNS_USES=		mysql
 MYDNS_VARS=		MODULES+=mydns
 
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
-MYSQL_USE=		MYSQL=YES
+MYSQL_USES=		mysql
 MYSQL_VARS=		MODULES+=gmysql
 
 OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
@@ -78,6 +77,11 @@
 OPENLDAP_USE=		OPENLDAP=YES
 OPENLDAP_VARS=		MODULES+=ldap
 
+OPTALGO_CONFIGURE_ON=	--enable-botan1.10 \
+			--enable-libsodium
+OPTALGO_LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+			libsodium.so:security/libsodium
+
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 PGSQL_USES=		pgsql
@@ -111,6 +115,7 @@
 MYSQL_DESC=		MySQL backend
 OPENDBX_DESC=		OpenDBX backend
 OPENLDAP_DESC=		OpenLDAP backend
+OPTALGO_DESC=		Enable optional algorithms (12 & 15)
 PGSQL_DESC=		PostgreSQL backend
 PROTOBUF_DESC=		Protobuf support
 REMOTE_DESC=		Remote backend
Index: head/dns/powerdns/distinfo
===================================================================
--- head/dns/powerdns/distinfo
+++ head/dns/powerdns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484653707
-SHA256 (pdns-4.0.3.tar.bz2) = 60fa21550b278b41f58701af31c9f2b121badf271fb9d7642f6d35bfbea8e282
-SIZE (pdns-4.0.3.tar.bz2) = 1312299
+TIMESTAMP = 1498217242
+SHA256 (pdns-4.0.4.tar.bz2) = d974ab89de69477c7f581a3233bc731eacbb43d479291e472b2c531c83b6d763
+SIZE (pdns-4.0.4.tar.bz2) = 1320327