Change powerdns dependency from polarssl to mbedtls. Streamline bl3 setup

while at it. Bump PKGREVISION (and of the module packages).

7 files changed, 18 insertions, 11 deletions

diff --git a/net/powerdns-ldap/Makefile b/net/powerdns-ldap/Makefile
index f9813ec8cbc..791c0fa3f7d 100644
--- a/net/powerdns-ldap/Makefile
+++ b/net/powerdns-ldap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/12/10 14:50:09 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:58 fhajny Exp $
 
 .include "../../net/powerdns/Makefile.backend"
 
 PKGNAME=		${DISTNAME:S/pdns/powerdns-ldap/}
+PKGREVISION=		1
 COMMENT=		LDAP backend module for PowerDNS
 
 CONFIGURE_ARGS+=	--with-dynmodules="ldap"
diff --git a/net/powerdns-mysql/Makefile b/net/powerdns-mysql/Makefile
index 1edbf44aa77..a46f4f3c950 100644
--- a/net/powerdns-mysql/Makefile
+++ b/net/powerdns-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/12/10 14:50:09 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:58 fhajny Exp $
 
 .include "../../net/powerdns/Makefile.backend"
 
 PKGNAME=		${DISTNAME:S/pdns/powerdns-mysql/}
+PKGREVISION=		1
 COMMENT=		MySQL backend module for PowerDNS
 
 CONFIGURE_ARGS+=	--with-dynmodules="gmysql"
diff --git a/net/powerdns-pgsql/Makefile b/net/powerdns-pgsql/Makefile
index 9ed9abed7d4..4a0e88c9ffe 100644
--- a/net/powerdns-pgsql/Makefile
+++ b/net/powerdns-pgsql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2015/02/17 01:55:12 rodent Exp $
+# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:58 fhajny Exp $
 
 .include "../../net/powerdns/Makefile.backend"
 
 PKGNAME=		${DISTNAME:S/pdns/powerdns-pgsql/}
+PKGREVISION=		1
 COMMENT=		PostgreSQL backend module for PowerDNS
 
 CONFIGURE_ARGS+=	--with-dynmodules="gpgsql"
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 183f83b4f2b..483d84ec4d8 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/06/10 16:24:44 fhajny Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:58 fhajny Exp $
 
 .include "Makefile.common"
 
 PKGNAME=		${DISTNAME:S/pdns/powerdns/}
+PKGREVISION=		1
 COMMENT=		Modern, advanced and high performance nameserver
 
 .include "options.mk"
@@ -26,5 +27,4 @@ SUBST_SED.conf+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
-.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/powerdns/Makefile.backend b/net/powerdns/Makefile.backend
index ab388bb6b2b..517ef0609a2 100644
--- a/net/powerdns/Makefile.backend
+++ b/net/powerdns/Makefile.backend
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.2 2014/12/10 14:50:08 fhajny Exp $
+# $NetBSD: Makefile.backend,v 1.3 2015/06/12 10:50:58 fhajny Exp $
 
 .include "../../net/powerdns/Makefile.common"
 
@@ -11,3 +11,8 @@ CONFIGURE_ARGS+=	--disable-pdns_server
 CONFIGURE_ARGS+=	--with-modules=""
 
 BUILD_DIRS=		modules
+
+# These are required by configure, but not used by the modules
+BUILDLINK_DEPMETHOD.boost-headers=	build
+BUILDLINK_DEPMETHOD.boost-libs=		build
+BUILDLINK_DEPMETHOD.mbedtls=		build
diff --git a/net/powerdns/Makefile.common b/net/powerdns/Makefile.common
index 978b54831f0..304d0141487 100644
--- a/net/powerdns/Makefile.common
+++ b/net/powerdns/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2015/06/10 16:24:44 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.13 2015/06/12 10:50:58 fhajny Exp $
 
 PDNS_VERSION=		3.4.5
 DISTNAME=		pdns-${PDNS_VERSION}
@@ -28,7 +28,5 @@ BUILDLINK_TRANSFORM+=	rm:-fstack-protector
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/polarssl/buildlink3.mk"
+.include "../../security/mbedtls/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/powerdns/options.mk b/net/powerdns/options.mk
index 9bb36d415c5..e3b1fda1c69 100644
--- a/net/powerdns/options.mk
+++ b/net/powerdns/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/03/27 23:37:52 rodent Exp $
+# $NetBSD: options.mk,v 1.3 2015/06/12 10:50:58 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.powerdns
 PKG_SUPPORTED_OPTIONS=	bind botan cryptopp pipe random remote sqlite tools
@@ -16,6 +16,7 @@ PLIST.bind=		yes
 
 .if !empty(PKG_OPTIONS:Mbotan)
 CONFIGURE_ARGS+=	--enable-botan1.8
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../security/botan/buildlink3.mk"
 .endif