- Update to 3.3

- Depend on Botan 1.10 and make it new default
- Both Botan and Crypto++ can be compiled in now
- Support MySQL forks like MariaDB
- Ability to choose embedded or system-installed PolarSSL
- Convert USE_GMAKE to USES
- Use EXAMPLES OPTION in plce of NOPORTEXAMPLES

Changelog: http://rtfm.powerdns.com/changelog.html#changelog-auth-3-3

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

7 files changed, 85 insertions, 62 deletions

diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 32aa6024b75e..ce76e003a1b2 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 PORTREVISION?=	0
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
@@ -19,8 +19,7 @@ LUA_COMPS=	lua
 
 CONFLICTS=	powerdns-devel-[2-3].[0-9]*
 
-USES=		pkgconfig
-USE_GMAKE=	YES
+USES=		pkgconfig gmake
 USE_SUBMAKE=	YES
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	YES
@@ -39,9 +38,10 @@ MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC
-OPTIONS_SINGLE=DNSSEC
-OPTIONS_SINGLE_DNSSEC=	BOTAN CRYPTOPP
+OPTIONS_DEFINE=	PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 \
+		OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL TOOLS
+OPTIONS_MULTI=	DNSSEC
+OPTIONS_MULTI_DNSSEC=	BOTAN110 CRYPTOPP
 
 PGSQL_DESC=		PostgreSQL backend
 PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
@@ -53,11 +53,13 @@ OPENDBX_DESC=		OpenDBX backend
 OPENLDAP_DESC=		OpenLDAP backend
 OPENLDAP_LOCAL_DESC=	RUN_DEPEND on OpenLDAP server
 GEO_DESC=		Geo backend
-DNSSEC_DESC=		Enable extra DNSSEC algorithms (13 & 14)
-BOTAN_DESC=		Use Botan
-CRYPTOPP_DESC=		Use Crypto++
+DNSSEC_DESC=		Extra DNSSEC options
+BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
+CRYPTOPP_DESC=		ECDSA algorithms
+POLARSSL_DESC=		Use embedded PolarSSL
+TOOLS_DESC=		Build extra tools
 
-OPTIONS_DEFAULT=	PGSQL DNSSEC CRYPTOPP
+OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL
 
 .include <bsd.port.options.mk>
 
@@ -65,6 +67,13 @@ OPTIONS_DEFAULT=	PGSQL DNSSEC CRYPTOPP
 
 USE_RC_SUBR+=	pdns
 
+.if ${PORT_OPTIONS:MTOOLS}
+CONFIGURE_ARGS+=	--enable-tools
+PLIST_SUB+=		WITHTOOLS=""
+.else
+PLIST_SUB+=		WITHTOOLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MGEO}
 CONFIGURE_MODULES+=	"geo"
 PLIST_SUB+=		WITHGEO=""
@@ -90,8 +99,6 @@ PLIST_SUB+=		WITHPGSQL="@comment "
 USE_MYSQL?=		YES
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_MODULES+=	"gmysql"
-#CXXFLAGS+=		-I${LOCALBASE}/include/mysql
-#LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 PLIST_SUB+=		WITHMYSQL=""
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -100,8 +107,7 @@ PLIST_SUB+=		WITHMYSQL="@comment "
 
 .if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MPGSQL}
 .	if ${PORT_OPTIONS:MPGSQL_LOCAL}
-USE_PGSQL?=		YES
-RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+USE_PGSQL=		server
 SUB_LIST+=	PGSQL=postgresql
 .	endif
 .else
@@ -109,8 +115,7 @@ SUB_LIST+=	PGSQL=
 .endif
 .if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MMYSQL}
 .	if ${PORT_OPTIONS:MMYSQL_LOCAL}
-USE_MYSQL?=		YES
-RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+USE_MYSQL=	server
 SUB_LIST+=	MYSQL=mysql
 .	endif
 .else
@@ -123,7 +128,7 @@ CONFIGURE_MODULES+=	"ldap"
 CXXFLAGS+=		-L${LOCALBASE}/lib -DLDAP_DEPRECATED=1
 PLIST_SUB+=		WITHOPENLDAP=""
 .	if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
-RUN_DEPENDS+=	openldap-server>=0:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-server
+RUN_DEPENDS+=	openldap-server>=0:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server
 SUB_LIST+=	SLAPD=slapd
 .	else
 SUB_LIST+=	SLAPD=
@@ -158,13 +163,23 @@ CXXFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		WITHOPENDBX="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MBOTAN}
-LIB_DEPENDS+=		botan.0:${PORTSDIR}/security/botan
-CONFIGURE_ARGS+=	--enable-botan1.8
+.if ${PORT_OPTIONS:MPOLARSSL}
+CONFIGURE_ARGS+=	--without-system-polarssl
+.else
+LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
+.endif
+
+.if ${PORT_OPTIONS:MBOTAN110}
+CONFIGURE_ARGS+=	--enable-botan1.10
+LIB_DEPENDS+=		botan-1.10:${PORTSDIR}/security/botan110
 .endif
 
 .if ${PORT_OPTIONS:MCRYPTOPP}
+.if exists(${LOCALBASE}/lib/libcryptopp.so)
+LIB_DEPENDS+=		cryptopp:${PORTSDIR}/security/cryptopp
+.else
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+.endif
 CONFIGURE_ARGS+=	--enable-cryptopp
 .endif
 
@@ -186,7 +201,7 @@ post-install:
 .if !exists(${PREFIX}/etc/pdns/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 .for i in pdns.conf
 	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index b5414eebad89..097ae9c2230d 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.2.tar.gz) = d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572
-SIZE (pdns-3.2.tar.gz) = 1293593
+SHA256 (pdns-3.3.tar.gz) = 93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6
+SIZE (pdns-3.3.tar.gz) = 1360167
diff --git a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
deleted file mode 100644
index 91e11a68ef41..000000000000
--- a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/gpgsqlbackend/Makefile.in.org	2009-01-28 10:55:21.000000000 +0100
-+++ modules/gpgsqlbackend/Makefile.in	2009-01-28 11:02:29.000000000 +0100
-@@ -217,8 +217,8 @@
- AM_CPPFLAGS = @THREADFLAGS@
- lib_LTLIBRARIES = libgpgsqlbackend.la
- EXTRA_DIST = OBJECTFILES OBJECTLIBS
--INCLUDES = -I@PGSQL_incdir@
-+INCLUDES = -I@includedir@ -I@PGSQL_incdir@
- libgpgsqlbackend_la_SOURCES = gpgsqlbackend.cc gpgsqlbackend.hh \
- 		spgsql.hh spgsql.cc
- 
diff --git a/dns/powerdns/files/patch-modules_gpgsqlbackend_OBJECTLIBS b/dns/powerdns/files/patch-modules_gpgsqlbackend_OBJECTLIBS
deleted file mode 100644
index dd7c21f02974..000000000000
--- a/dns/powerdns/files/patch-modules_gpgsqlbackend_OBJECTLIBS
+++ /dev/null
@@ -1,7 +0,0 @@
---- modules/gpgsqlbackend/OBJECTLIBS.orig	Sat Apr 23 23:40:15 2005
-+++ modules/gpgsqlbackend/OBJECTLIBS	Mon Jul 18 14:21:17 2005
-@@ -1,3 +1,3 @@
---lpq -lssl -lcrypto  -lcrypt -lresolv -lnsl  
-+-lpq -lssl -lcrypto
- 
- 
diff --git a/dns/powerdns/files/patch-pdns_Makefile_in b/dns/powerdns/files/patch-pdns_Makefile_in
index d480e3fb237b..f794f7f0804a 100644
--- a/dns/powerdns/files/patch-pdns_Makefile_in
+++ b/dns/powerdns/files/patch-pdns_Makefile_in
@@ -1,19 +1,38 @@
---- pdns/Makefile.in.orig	2011-07-22 13:26:07.000000000 +0200
-+++ pdns/Makefile.in	2013-01-17 13:23:49.892508749 +0100
-@@ -55,14 +55,14 @@
- @BOTAN110_TRUE@am__append_3 = botan110signers.cc botansigners.cc
- @BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt
- @BOTAN18_TRUE@am__append_5 = botan18signers.cc botansigners.cc
--@BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp
-+@BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS)
- @CRYPTOPP_TRUE@am__append_7 = cryptoppsigners.cc
- @CRYPTOPP_TRUE@am__append_8 = -lcryptopp
- @SQLITE3_TRUE@am__append_9 = ssqlite3.cc ssqlite3.hh
- @BOTAN110_TRUE@am__append_10 = botan110signers.cc botansigners.cc
- @BOTAN110_TRUE@am__append_11 = $(BOTAN110_LIBS) -lgmp -lrt
- @BOTAN18_TRUE@am__append_12 = botan18signers.cc botansigners.cc
--@BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS) -lgmp
-+@BOTAN18_TRUE@am__append_13 = $(BOTAN18_LIBS)
- @CRYPTOPP_TRUE@am__append_14 = cryptoppsigners.cc
- @CRYPTOPP_TRUE@am__append_15 = -lcryptopp
- @SQLITE3_TRUE@am__append_16 = ssqlite3.cc ssqlite3.hh
+--- pdns/Makefile.in.orig	2013-06-27 13:47:04.000000000 +0200
++++ pdns/Makefile.in	2013-06-28 10:28:35.191325678 +0200
+@@ -49,7 +49,7 @@
+ 	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
+ 	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
+ @BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
++@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc
+@@ -57,7 +57,7 @@
+ @SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh
+ @ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS)
+ @BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc
+-@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
++@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
+ @BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc
+ @BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp
+ @CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc
+@@ -766,7 +766,7 @@
+ pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
+ pdns_server_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \
+ 	$(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) \
+-	$(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_5) $(am__append_7) \
++	$(am__append_5) $(am__append_7) \
+ 	$(am__append_9) $(am__append_11)
+ pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
+ 	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
+@@ -789,7 +789,7 @@
+ pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
+ pdnssec_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \
+ 	$(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) \
+-	$(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_13) \
++	$(SQLITE3_LIBS) $(am__append_13) \
+ 	$(am__append_15) $(am__append_17) $(am__append_19)
+ sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
+ 	misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \
diff --git a/dns/powerdns/pkg-descr b/dns/powerdns/pkg-descr
index df31acd7a636..4e448bb16bb3 100644
--- a/dns/powerdns/pkg-descr
+++ b/dns/powerdns/pkg-descr
@@ -1,4 +1,4 @@
 PowerDNS is an advanced DNS server, which allows for several different
 backends. Current backends include MySQL, PostgreSQL, bind, etc.
 
-WWW:	http://www.powerdns.com/
+WWW: http://www.powerdns.com/
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index 2f05f1506d12..0aafbab88a80 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -1,10 +1,17 @@
-bin/dnsreplay
 bin/pdns_control
 bin/pdnssec
 bin/zone2json
 bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
+%%WITHTOOLS%%bin/dnsbulktest
+%%WITHTOOLS%%bin/dnsreplay
+%%WITHTOOLS%%bin/dnsscan
+%%WITHTOOLS%%bin/dnsscope
+%%WITHTOOLS%%bin/dnstcpbench
+%%WITHTOOLS%%bin/dnswasher
+%%WITHTOOLS%%bin/nproxy
+%%WITHTOOLS%%bin/nsec3dig
 %%WITHPGSQL%%lib/libgpgsqlbackend.a
 %%WITHPGSQL%%lib/libgpgsqlbackend.la
 %%WITHPGSQL%%lib/libgpgsqlbackend.so