4 files changed, 57 insertions, 127 deletions

diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index ef85bea00ec4..dd72c405f355 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.4.7
+PORTVERSION=	3.4.8
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -43,123 +43,83 @@ OPTIONS_GROUP=	DNSSEC EXPERIMENTAL REMOTEOPT
 OPTIONS_GROUP_DNSSEC=		BOTAN110
 OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS TINYDNS
 OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
-
-PGSQL_DESC=		PostgreSQL backend
-MYSQL_DESC=		MySQL backend
-OPENDBX_DESC=		OpenDBX backend
-OPENLDAP_DESC=		OpenLDAP backend
-SQLITE3_DESC=		SQLite 3 backend
-GEO_DESC=		Geo backend
-GEOIP_DESC=		GeoIP backend
-DNSSEC_DESC=		Extra DNSSEC options
-BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
-POLARSSL_DESC=		Use embedded PolarSSL
-LMDB_DESC=		LMDB backend
-LUA_DESC=		Lua backend
-MYDNS_DESC=		MyDNS backend
-REMOTE_DESC=		Remote backend
-TINYDNS_DESC=		TinyDNS backend
-TOOLS_DESC=		Build extra tools
-REMOTEOPT_DESC=		Remote backend connectors
-ZEROMQ_DESC=		Enable ZeroMQ connector
+ZEROMQ_IMPLIES=			REMOTE
 
 OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
+OPTIONS_SUB=		yes
 
-OPTIONS_SUB=	yes
+BOTAN110_CONFIGURE_ON=	--enable-botan1.10
+BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
 
-# Don't use CONFIGURE_ENABLE, the configure script
-# has a bug. The options are being enabled even using --disable-
+GEO_VARS=		MODULES+=geo
 
-TOOLS_CONFIGURE_ON=	--enable-tools
+GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
+			libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_VARS=		MODULES+=geoip
 
-PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
-PGSQL_CONFIGURE_OFF=	--without-pgsql
-PGSQL_USES=		pgsql
+LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+LMDB_VARS=		MODULES+=lmdb
+
+LUA_VARS=		MODULES+=lua
+
+MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYDNS_USE=		MYSQL=YES
+MYDNS_VARS=		MODULES+=mydns
 
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USE=		MYSQL=YES
+MYSQL_VARS=		MODULES+=gmysql
 
-MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYDNS_USE=		MYSQL=YES
+OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
+OPENDBX_VARS=		MODULES+=opendbx
 
 OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
 OPENLDAP_USE=		OPENLDAP=YES
+OPENLDAP_VARS=		MODULES+=ldap
 
-SQLITE3_USE=		SQLITE=3
+PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-pgsql
+PGSQL_USES=		pgsql
+PGSQL_VARS=		MODULES+=gpgsql
 
-OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx
+POLARSSL_CONFIGURE_ARGS=	--without-system-polarssl
+POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:${PORTSDIR}/security/polarssl13
 
-BOTAN110_CONFIGURE_ON=	--enable-botan1.10
-BOTAN110_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+REMOTE_VARS=		MODULES+=remote
+
+SQLITE3_USE=		SQLITE=3
+SQLITE3_VARS=		MODULES+=gqlite3
 
-TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
+TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
+TINYDNS_VARS=		MODULES+=tinydns
 
-LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
+ZEROMQ_CONFIGURE_ARGS=	--enable-remotebackend-zeromq
+ZEROMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
 
-GEOIP_LIB_DEPENDS=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \
-			libGeoIP.so:${PORTSDIR}/net/GeoIP
+TOOLS_CONFIGURE_ENABLE=	tools
 
-.include <bsd.port.options.mk>
+PGSQL_DESC=		PostgreSQL backend
+MYSQL_DESC=		MySQL backend
+OPENDBX_DESC=		OpenDBX backend
+OPENLDAP_DESC=		OpenLDAP backend
+SQLITE3_DESC=		SQLite 3 backend
+GEO_DESC=		Geo backend
+GEOIP_DESC=		GeoIP backend
+DNSSEC_DESC=		Extra DNSSEC options
+BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
+POLARSSL_DESC=		Use embedded PolarSSL
+LMDB_DESC=		LMDB backend
+LUA_DESC=		Lua backend
+MYDNS_DESC=		MyDNS backend
+REMOTE_DESC=		Remote backend
+TINYDNS_DESC=		TinyDNS backend
+TOOLS_DESC=		Build extra tools
+REMOTEOPT_DESC=		Remote backend connectors
+ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)
 
-.if ${PORT_OPTIONS:MGEO}
-MODULES+=	geo
-.endif
-
-.if ${PORT_OPTIONS:MGEOIP}
-MODULES+=	geoip
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-MODULES+=	gpgsql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-MODULES+=	gmysql
-.endif
-
-.if ${PORT_OPTIONS:MOPENLDAP}
-MODULES+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE3}
-MODULES+=	gsqlite3
-.endif
-
-.if ${PORT_OPTIONS:MLMDB}
-MODULES+=	lmdb
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-MODULES+=	lua
-.endif
-
-.if ${PORT_OPTIONS:MMYDNS}
-MODULES+=	mydns
-.endif
-
-.if ${PORT_OPTIONS:MREMOTE}
-MODULES+=	remote
-.	if ${PORT_OPTIONS:MZEROMQ}
-CONFIGURE_ARGS+=	--enable-remotebackend-zeromq
-LIB_DEPENDS+=		libzmq.so:${PORTSDIR}/net/libzmq4
-.	endif
-.endif
-
-.if ${PORT_OPTIONS:MTINYDNS}
-MODULES+=	tinydns
-.endif
-
-.if ${PORT_OPTIONS:MOPENDBX}
-MODULES+=	opendbx
-.endif
-
-.if ${PORT_OPTIONS:MPOLARSSL}
-CONFIGURE_ARGS+=	--without-system-polarssl
-.else
-LIB_DEPENDS+=		libmbedtls.so.9:${PORTSDIR}/security/polarssl13
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 7c87b3cbf695..322266fa85a4 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.4.7.tar.bz2) = e17eca86c5e702b54b62b1edebc4741d8e0db748050a7214c778302039f28c4b
-SIZE (pdns-3.4.7.tar.bz2) = 1345379
+SHA256 (pdns-3.4.8.tar.bz2) = 4f818fd09bff89625b4317cc7c05445f6e7bd9ea8d21e7eefeaaca07b8b0cd9f
+SIZE (pdns-3.4.8.tar.bz2) = 1345728
diff --git a/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc b/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
deleted file mode 100644
index 603424111e61..000000000000
--- a/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/luabackend/lua_functions.cc.orig	2014-09-23 06:27:34 UTC
-+++ modules/luabackend/lua_functions.cc
-@@ -238,6 +238,7 @@
-   return ret;
- }
- 
-+#if !(defined( __i386__) && defined(__FreeBSD__))
- bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) {
-   lua_pushstring(lua, key.c_str()); 
-   lua_gettable(lua, -2);  
-@@ -253,6 +254,7 @@
-   
-   return ret;
- }
-+#endif
- 
- bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) {
-   lua_pushstring(lua, key.c_str()); 
diff --git a/dns/powerdns/files/patch-modules__luabackend__luabackend.hh b/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
deleted file mode 100644
index 31d598112985..000000000000
--- a/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/luabackend/luabackend.hh.orig	2014-09-23 06:27:34 UTC
-+++ modules/luabackend/luabackend.hh
-@@ -155,7 +155,9 @@
- //  FUNCTIONS TO THIS BACKEND
-     bool getValueFromTable(lua_State *lua, const std::string& key, string& value);
-     bool getValueFromTable(lua_State *lua, uint32_t key, string& value);
-+#if !(defined(__i386__) && defined(__FreeBSD__))
-     bool getValueFromTable(lua_State *lua, const std::string& key, time_t& value);
-+#endif
-     bool getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value);
-     bool getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value);
-     bool getValueFromTable(lua_State *lua, const std::string& key, int& value);