5 files changed, 67 insertions, 82 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index d38c8ef8d6df..06fe9b1676db 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -1,20 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	powerdns
-PORTVERSION=	3.3.r1
+PORTVERSION=	3.3
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
-MASTER_SITES=	http://powerdnssec.org/downloads/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	pdns-${PORTVERSION:S/.r/-rc/}
+DISTNAME=	auth-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	An advanced DNS server with multiple backends including SQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_serialization:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	ragel:${PORTSDIR}/devel/ragel
+LIB_DEPENDS=	libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+
+USE_GITHUB=	YES
+GH_ACCOUNT=	PowerDNS
+GH_PROJECT=	pdns
+GH_TAGNAME=	auth-3.3
+GH_COMMIT=	b8fe1df
 
 USE_LUA=	5.1
 LUA_COMPS=	lua
@@ -23,11 +29,11 @@ CONFLICTS=	powerdns-[2-3].[0-9]*
 
 NO_LATEST_LINK=	YES
 
-USES=		pkgconfig
-USE_GMAKE=	YES
+USES=		bison gmake pkgconfig
 USE_SUBMAKE=	YES
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 USE_LDCONFIG=	YES
+GNU_CONFIGURE=	YES
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-modules="" \
@@ -39,11 +45,11 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
-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 POLARSSL
+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
 
@@ -61,16 +67,21 @@ DNSSEC_DESC=		Enable 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 BOTAN110 POLARSSL
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 .include <bsd.port.pre.mk>
 
 USE_RC_SUBR+=	pdns-devel
 
+.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=""
@@ -152,7 +163,7 @@ PLIST_SUB+=		WITHSQLITE3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENDBX}
-LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
+LIB_DEPENDS+=		libopendbx.so:${PORTSDIR}/databases/opendbx
 CONFIGURE_MODULES+=	"opendbx"
 PLIST_SUB+=		WITHOPENDBX=""
 CXXFLAGS+=		-L${LOCALBASE}/lib
@@ -163,54 +174,61 @@ PLIST_SUB+=		WITHOPENDBX="@comment "
 .if ${PORT_OPTIONS:MPOLARSSL}
 CONFIGURE_ARGS+=	--without-system-polarssl
 .else
-LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
+LIB_DEPENDS+=		libpolarssl.so:${PORTSDIR}/security/polarssl
 .endif
 
 .if ${PORT_OPTIONS:MBOTAN110}
 CONFIGURE_ARGS+=	--enable-botan1.10
-LIB_DEPENDS+=		botan-1.10:${PORTSDIR}/security/botan110
+LIB_DEPENDS+=		libbotan-1.10.so:${PORTSDIR}/security/botan110
 .endif
 
 .if ${PORT_OPTIONS:MCRYPTOPP}
 .	if exists(${LOCALBASE}/lib/libcryptopp.so)
-LIB_DEPENDS+=		cryptopp:${PORTSDIR}/security/cryptopp
+LIB_DEPENDS+=		libcryptopp.so:${PORTSDIR}/security/cryptopp
 .	else
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 .	endif
 CONFIGURE_ARGS+=	--enable-cryptopp
 .endif
 
-post-patch:
+pre-patch:
+	@${REINPLACE_CMD} -e "s;/bin/bash;/usr/bin/env bash;" \
+		-e "s;ssed -r;sed -E -e;g" \
+		-e "s;-i;-i \.bak;g" \
+		${WRKSRC}/build-scripts/set-version-auth
+	@${REINPLACE_CMD} -e 's;\$$(LIBCURL_LIBS) \$$(MYSQL_lib);;g' \
+		-e 's;\$$(LIBCURL_CFLAGS);;g' \
+		${WRKSRC}/pdns/Makefile.am
+.if ${PORT_OPTIONS:MBOTAN110}
+	@${REINPLACE_CMD} -e 's;\$$(BOOST_CPPFLAGS);;g' \
+		-e 's;-lgmp -lrt;;g' \
+		${WRKSRC}/pdns/Makefile.am
+	@${REINPLACE_CMD} -E -e 's;(\$$\(BOTAN110_CFLAGS\));\1 \$$\(BOOST_CPPFLAGS\);' \
+		${WRKSRC}/pdns/Makefile.am
+.endif
 .if ${PORT_OPTIONS:MOPENLDAP}
-	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
-		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
-		${WRKSRC}/modules/ldapbackend/Makefile.in
-	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
-		-e 's;@modulelibs@;@modulelibs@ -llber;' \
-		${WRKSRC}/pdns/Makefile.in
+	@${REINPLACE_CMD} -e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib ;' \
+		${WRKSRC}/modules/ldapbackend/Makefile.am
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
 	@${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \
-		${WRKSRC}/configure
+		${WRKSRC}/configure.ac
 .endif
 
+pre-configure:
+	@(cd ${WRKSRC} && ${WRKSRC}/build-scripts/set-version-auth git-${GH_TAGNAME} 0.0.${GH_TAGNAME} 0.0.${GH_TAGNAME} && ${WRKSRC}/bootstrap)
+
 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)
-	${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in pdns.conf
-	${INSTALL_DATA} ${FILESDIR}/$i ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-.endif
 .for j in libgpgsqlbackend.so libgmysqlbackend.so libgsqlitebackend.so \
 	libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \
 	libgeobackend.so libpipebackend.so
-	@if ([ -f ${PREFIX}/lib/$j ] && [ ! -f ${PREFIX}/lib/$j.0 ]); then \
-		${LN} -sf ${PREFIX}/lib/$j ${PREFIX}/lib/$j.0; \
+	@if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \
+		${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \
 	fi
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index 1ba5f0cc2f31..38c32898737f 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.3-rc1.tar.gz) = 06269412693aae5925c338f8f03ea32d60584e1b206310dffc451a15039694e9
-SIZE (pdns-3.3-rc1.tar.gz) = 1333561
+SHA256 (auth-3.3.tar.gz) = 0f6e85f6ee3041718dcc5d3aa97c8e48f7dc5ab33678c5c40b2bc4e585c6a4d6
+SIZE (auth-3.3.tar.gz) = 1794516
diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS
deleted file mode 100644
index dd7c21f02974..000000000000
--- a/dns/powerdns-devel/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-devel/files/patch-pdns_Makefile_in b/dns/powerdns-devel/files/patch-pdns_Makefile_in
deleted file mode 100644
index e87fba9566c1..000000000000
--- a/dns/powerdns-devel/files/patch-pdns_Makefile_in
+++ /dev/null
@@ -1,38 +0,0 @@
---- pdns/Makefile.in.orig	2013-05-28 08:12:43.000000000 +0200
-+++ pdns/Makefile.in	2013-06-03 11:39:18.377503664 +0200
-@@ -53,7 +53,7 @@
- 	dnsscan$(EXEEXT) nproxy$(EXEEXT) notify$(EXEEXT) \
- 	pdnssec$(EXEEXT) dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
- @BOTAN110_TRUE@am__append_3 = botan110signers.cc botansigners.cc
--@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS) -lgmp -lrt
-+@BOTAN110_TRUE@am__append_4 = $(BOTAN110_LIBS)
- @BOTAN18_TRUE@am__append_5 = botan18signers.cc botansigners.cc
- @BOTAN18_TRUE@am__append_6 = $(BOTAN18_LIBS) -lgmp
- @CRYPTOPP_TRUE@am__append_7 = cryptoppsigners.cc
-@@ -61,7 +61,7 @@
- @SQLITE3_TRUE@am__append_9 = ssqlite3.cc ssqlite3.hh
- @ORACLE_TRUE@am__append_10 = $(ORACLE_LIBS)
- @BOTAN110_TRUE@am__append_11 = botan110signers.cc botansigners.cc
--@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS) -lgmp -lrt
-+@BOTAN110_TRUE@am__append_12 = $(BOTAN110_LIBS)
- @BOTAN18_TRUE@am__append_13 = botan18signers.cc botansigners.cc
- @BOTAN18_TRUE@am__append_14 = $(BOTAN18_LIBS) -lgmp
- @CRYPTOPP_TRUE@am__append_15 = cryptoppsigners.cc
-@@ -752,7 +752,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_4) $(am__append_6) \
-+	$(am__append_4) $(am__append_6) \
- 	$(am__append_8) $(am__append_10)
- pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
- 	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
-@@ -775,7 +775,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_12) \
-+	$(SQLITE3_LIBS) $(am__append_12) \
- 	$(am__append_14) $(am__append_16) $(am__append_18)
- 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-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 2f05f1506d12..9890da9570db 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/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
@@ -37,6 +44,11 @@ lib/libpipebackend.a
 lib/libpipebackend.la
 lib/libpipebackend.so
 lib/libpipebackend.so.0
+man/man8/pdns_control.8.gz
+man/man8/pdns_server.8.gz
+man/man8/pdnssec.8.gz
+man/man8/zone2ldap.8.gz
+man/man8/zone2sql.8.gz
 @unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi
 etc/pdns/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf