Attachment #139557 for bug #185824




# $FreeBSD$

PORTNAME=	powerdns
PORTVERSION=	3.3.1
PORTREVISION?=	0
CATEGORIES=	dns ipv6
MASTER_SITES=	http://downloads.powerdns.com/releases/
DISTNAME=	pdns-${PORTVERSION}


CONFLICTS=	powerdns-devel-[2-3].[0-9]*

USES=		gmake pkgconfig
USE_SUBMAKE=	YES
USE_AUTOTOOLS=	libtool
USE_LDCONFIG=	YES


USE_RC_SUBR=	pdns

OPTIONS_DEFINE=	GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \
		PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS
OPTIONS_GROUP=	DNSSEC EXPERIMENTAL
OPTIONS_GROUP_DNSSEC=	BOTAN110 CRYPTOPP
OPTIONS_GROUP_EXPERIMENTAL=	LUA MYDNS REMOTE REMOTE_HTTP TINYDNS

PGSQL_DESC=		PostgreSQL backend
PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server

BOTAN110_DESC=		Faster signing + ECDSA & GOST algorithms
CRYPTOPP_DESC=		ECDSA algorithms
POLARSSL_DESC=		Use embedded PolarSSL
LUA_DESC=		Lua backend
MYDNS_DESC=		MyDNS backend
REMOTE_DESC=		Remote backend
REMOTE_HTTP_DESC=	Enable HTTP for the Remote backed
TINYDNS_DESC=		TinyDNS backend
TOOLS_DESC=		Build extra tools

OPTIONS_DEFAULT=	PGSQL DNSSEC BOTAN110 POLARSSL

MYSQL_USE=		MYSQL=YES
MYSQL_LOCAL_USE=	MYSQL=server

MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
MYDNS_USE=		MYSQL=YES
MYDNS_LOCAL_USE=	MYSQL=server

OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
OPENLDAP_USE=		OPENLDAP=YES
OPENLDAP_LOCAL_RUN_DEPENDS=	openldap-server>=0:${PORTSDIR}/net/openldap24-server

REMOTE_HTTP_CONFIGURE_ENABLE=	remotebackend-http
REMOTE_HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl

SQLITE3_USE=	SQLITE=3

OPENDBX_LIB_DEPENDS=	libopendbx.so:${PORTSDIR}/databases/opendbx

BOTAN110_CONFIGURE_ENABLE=	botan1.10
BOTAN110_LIB_DEPENDS=		libbotan-1.10.so:${PORTSDIR}/security/botan110

TINYDNS_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"

CRYPTOPP_CONFIGURE_ENABLE=	cryptopp

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGEO}
MODULES+=	geo
.endif

.if ${PORT_OPTIONS:MPGSQL}
MODULES+=	gpgsql
.endif

.if ${PORT_OPTIONS:MMYSQL}
MODULES+=	gmysql
.endif

.if ${PORT_OPTIONS:MPGSQL_LOCAL}

.endif

.if ${PORT_OPTIONS:MOPENLDAP}
MODULES+=	ldap
.endif

.if ${PORT_OPTIONS:MOPENLDAP_LOCAL}

.endif

.if ${PORT_OPTIONS:MSQLITE3}
MODULES+=	gsqlite3
.endif

.if ${PORT_OPTIONS:MLUA}
MODULES+=	lua
.endif

.if ${PORT_OPTIONS:MMYDNS}
MODULES+=	mydns
.endif

.if ${PORT_OPTIONS:MREMOTE}
MODULES+=	remote
.endif

.if ${PORT_OPTIONS:MTINYDNS}
MODULES+=	tinydns
.endif

.if ${PORT_OPTIONS:MOPENDBX}
MODULES+=	opendbx
.endif

.if ${PORT_OPTIONS:MCRYPTOPP}
CONFIGURE_ARGS+=	--enable-cryptopp
.	if exists(${LOCALBASE}/lib/libcryptopp.so)
LIB_DEPENDS+=	libcryptopp.so:${PORTSDIR}/security/cryptopp
.	else

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pdns-3.3.tar.gz) = 93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6	1	SHA256 (pdns-3.3.1.tar.gz) = feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3
2	SIZE (pdns-3.3.tar.gz) = 1360167	2	SIZE (pdns-3.3.1.tar.gz) = 1403435

Line 0 Link Here

(-)files/patch-modules__remotebackend__Makefile.in (+11 lines)
	1	--- ./modules/remotebackend/Makefile.in.orig 2013-12-17 14:47:45.000000000 +0100
	2	+++ ./modules/remotebackend/Makefile.in 2014-01-16 13:37:09.323941191 +0100
	3	@@ -473,7 +473,7 @@
	4	EXTRA_LTLIBRARIES = libtestremotebackend.la
	5	lib_LTLIBRARIES = libremotebackend.la
	6	libremotebackend_la_SOURCES = remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc
	7	-libremotebackend_la_LDFLAGS = -module -avoid-version
	8	+libremotebackend_la_LDFLAGS = -module -avoid-version $(LIBCURL_LIBS)
	9	libremotebackend_la_LIBS = $(LIBCURL_LIBS)
	10	TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_HTTP=$(REMOTEBACKEND_HTTP) ./testrunner.sh
	11	BUILT_SOURCES = ../../pdns/dnslabeltext.cc




--- ./pdns/Makefile.in.orig	2013-07-05 03:30:48.000000000 -0300
+++ ./pdns/Makefile.in	2013-10-09 16:39:02.000000000 -0300
@@ -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
@@ -717,8 +717,8 @@
 top_srcdir = @top_srcdir@
 @HAVE_LIBPOLARSSL_FALSE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
 @HAVE_LIBPOLARSSL_TRUE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
-	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
+	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
 EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
@@ -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 \




--- ./pdns/Makefile.in.orig	2013-12-17 14:47:45.000000000 +0100
+++ ./pdns/Makefile.in	2014-01-16 13:37:09.328942976 +0100
@@ -66,7 +66,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
@@ -74,7 +74,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
@@ -750,8 +750,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
-	$(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
+	$(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
 EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8  \
 	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
 	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
@@ -797,7 +797,7 @@
 #
 pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
 pdns_server_LDADD = $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) \
-	$(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(am__append_5) \
+	$(LUA_LIBS) $(SQLITE3_LIBS) $(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 \
@@ -819,7 +819,7 @@
 	$(am__append_18)
 pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
 pdnssec_LDADD = $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
-	$(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) \
+	$(BOOST_SERIALIZATION_LIBS) $(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 \

Return to bug 185824

Lines 1-8 Link Here

(-)Makefile (-14 / +47 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= powerdns	3	PORTNAME= powerdns
4	PORTVERSION= 3.3	4	PORTVERSION= 3.3.1
5	PORTREVISION?= 1	5	PORTREVISION?= 0
6	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
7	MASTER_SITES= http://downloads.powerdns.com/releases/	7	MASTER_SITES= http://downloads.powerdns.com/releases/
8	DISTNAME= pdns-${PORTVERSION}	8	DISTNAME= pdns-${PORTVERSION}
Lines 19-25 Link Here
19		19
20	CONFLICTS= powerdns-devel-[2-3].[0-9]*	20	CONFLICTS= powerdns-devel-[2-3].[0-9]*
21		21
22	USES= pkgconfig gmake	22	USES= gmake pkgconfig
23	USE_SUBMAKE= YES	23	USE_SUBMAKE= YES
24	USE_AUTOTOOLS= libtool	24	USE_AUTOTOOLS= libtool
25	USE_LDCONFIG= YES	25	USE_LDCONFIG= YES
Lines 39-48 Link Here
39		39
40	USE_RC_SUBR= pdns	40	USE_RC_SUBR= pdns
41		41
42	OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL \	42	OPTIONS_DEFINE= GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \
43	OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL SQLITE3 TOOLS	43	PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS
44	OPTIONS_MULTI= DNSSEC	44	OPTIONS_GROUP= DNSSEC EXPERIMENTAL
45	OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP	45	OPTIONS_GROUP_DNSSEC= BOTAN110 CRYPTOPP
		46	OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS REMOTE REMOTE_HTTP TINYDNS
46		47
47	PGSQL_DESC= PostgreSQL backend	48	PGSQL_DESC= PostgreSQL backend
48	PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server	49	PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server
Lines 57-62 Link Here
57	BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms	58	BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms
58	CRYPTOPP_DESC= ECDSA algorithms	59	CRYPTOPP_DESC= ECDSA algorithms
59	POLARSSL_DESC= Use embedded PolarSSL	60	POLARSSL_DESC= Use embedded PolarSSL
		61	LUA_DESC= Lua backend
		62	MYDNS_DESC= MyDNS backend
		63	REMOTE_DESC= Remote backend
		64	REMOTE_HTTP_DESC= Enable HTTP for the Remote backed
		65	TINYDNS_DESC= TinyDNS backend
60	TOOLS_DESC= Build extra tools	66	TOOLS_DESC= Build extra tools
61		67
62	OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL	68	OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL
Lines 75-84 Link Here
75	MYSQL_USE= MYSQL=YES	81	MYSQL_USE= MYSQL=YES
76	MYSQL_LOCAL_USE= MYSQL=server	82	MYSQL_LOCAL_USE= MYSQL=server
77		83
		84	MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE}
		85	MYDNS_USE= MYSQL=YES
		86	MYDNS_LOCAL_USE= MYSQL=server
		87
78	OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1	88	OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1
79	OPENLDAP_USE= OPENLDAP=YES	89	OPENLDAP_USE= OPENLDAP=YES
80	OPENLDAP_LOCAL_RUN_DEPENDS= openldap-server>=0:${PORTSDIR}/net/openldap24-server	90	OPENLDAP_LOCAL_RUN_DEPENDS= openldap-server>=0:${PORTSDIR}/net/openldap24-server
81		91
		92	REMOTE_HTTP_CONFIGURE_ENABLE= remotebackend-http
		93	REMOTE_HTTP_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
		94
82	SQLITE3_USE= SQLITE=3	95	SQLITE3_USE= SQLITE=3
83		96
84	OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx	97	OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx
Lines 86-103 Link Here
86	BOTAN110_CONFIGURE_ENABLE= botan1.10	99	BOTAN110_CONFIGURE_ENABLE= botan1.10
87	BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110	100	BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110
88		101
		102	TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb
		103	TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
		104
		105	CRYPTOPP_CONFIGURE_ENABLE= cryptopp
		106
89	.include <bsd.port.options.mk>	107	.include <bsd.port.options.mk>
90		108
91	.if ${PORT_OPTIONS:MGEO}	109	.if ${PORT_OPTIONS:MGEO}
92	MODULES+= "geo"	110	MODULES+= geo
93	.endif	111	.endif
94		112
95	.if ${PORT_OPTIONS:MPGSQL}	113	.if ${PORT_OPTIONS:MPGSQL}
96	MODULES+= "gpgsql"	114	MODULES+= gpgsql
97	.endif	115	.endif
98		116
99	.if ${PORT_OPTIONS:MMYSQL}	117	.if ${PORT_OPTIONS:MMYSQL}
100	MODULES+= "gmysql"	118	MODULES+= gmysql
101	.endif	119	.endif
102		120
103	.if ${PORT_OPTIONS:MPGSQL_LOCAL}	121	.if ${PORT_OPTIONS:MPGSQL_LOCAL}
Lines 113-119 Link Here
113	.endif	131	.endif
114		132
115	.if ${PORT_OPTIONS:MOPENLDAP}	133	.if ${PORT_OPTIONS:MOPENLDAP}
116	MODULES+= "ldap"	134	MODULES+= ldap
117	.endif	135	.endif
118		136
119	.if ${PORT_OPTIONS:MOPENLDAP_LOCAL}	137	.if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
Lines 123-137 Link Here
123	.endif	141	.endif
124		142
125	.if ${PORT_OPTIONS:MSQLITE3}	143	.if ${PORT_OPTIONS:MSQLITE3}
126	MODULES+= "gsqlite3"	144	MODULES+= gsqlite3
127	.endif	145	.endif
128		146
		147	.if ${PORT_OPTIONS:MLUA}
		148	MODULES+= lua
		149	.endif
		150
		151	.if ${PORT_OPTIONS:MMYDNS}
		152	MODULES+= mydns
		153	.endif
		154
		155	.if ${PORT_OPTIONS:MREMOTE}
		156	MODULES+= remote
		157	.endif
		158
		159	.if ${PORT_OPTIONS:MTINYDNS}
		160	MODULES+= tinydns
		161	.endif
		162
129	.if ${PORT_OPTIONS:MOPENDBX}	163	.if ${PORT_OPTIONS:MOPENDBX}
130	MODULES+= "opendbx"	164	MODULES+= opendbx
131	.endif	165	.endif
132		166
133	.if ${PORT_OPTIONS:MCRYPTOPP}	167	.if ${PORT_OPTIONS:MCRYPTOPP}
134	CONFIGURE_ARGS+= --enable-cryptopp
135	. if exists(${LOCALBASE}/lib/libcryptopp.so)	168	. if exists(${LOCALBASE}/lib/libcryptopp.so)
136	LIB_DEPENDS+= libcryptopp.so:${PORTSDIR}/security/cryptopp	169	LIB_DEPENDS+= libcryptopp.so:${PORTSDIR}/security/cryptopp
137	. else	170	. else

Lines 1-49 Link Here

(-)files/patch-pdns_Makefile_in (-49 lines)
1	--- ./pdns/Makefile.in.orig 2013-07-05 03:30:48.000000000 -0300
2	+++ ./pdns/Makefile.in 2013-10-09 16:39:02.000000000 -0300
3	@@ -49,7 +49,7 @@
4	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
5	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
6	@BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc
7	-@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
8	+@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
9	@BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc
10	@BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp
11	@CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc
12	@@ -57,7 +57,7 @@
13	@SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh
14	@ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS)
15	@BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc
16	-@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
17	+@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
18	@BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc
19	@BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp
20	@CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc
21	@@ -717,8 +717,8 @@
22	top_srcdir = @top_srcdir@
23	@HAVE_LIBPOLARSSL_FALSE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -Iext/polarssl-1.1.2/include -Iext/rapidjson/include
24	@HAVE_LIBPOLARSSL_TRUE@AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) -I ext/rapidjson/include
25	-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
26	- $(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
27	+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
28	+ $(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
29	EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8 \
30	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
31	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
32	@@ -766,7 +766,7 @@
33	pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
34	pdns_server_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \
35	$(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) \
36	- $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_5) $(am__append_7) \
37	+ $(am__append_5) $(am__append_7) \
38	$(am__append_9) $(am__append_11)
39	pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
40	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
41	@@ -789,7 +789,7 @@
42	pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
43	pdnssec_LDADD = ext/polarssl-1.1.2/library/libpolarssl.a \
44	$(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) \
45	- $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib) $(am__append_13) \
46	+ $(SQLITE3_LIBS) $(am__append_13) \
47	$(am__append_15) $(am__append_17) $(am__append_19)
48	sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \
49	misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc \

Line 0 Link Here

(-)files/patch-pdns__Makefile.in (+49 lines)
	1	--- ./pdns/Makefile.in.orig 2013-12-17 14:47:45.000000000 +0100
	2	+++ ./pdns/Makefile.in 2014-01-16 13:37:09.328942976 +0100
	3	@@ -66,7 +66,7 @@
	4	nproxy$(EXEEXT) notify$(EXEEXT) pdnssec$(EXEEXT) \
	5	dnsbulktest$(EXEEXT) nsec3dig$(EXEEXT)
	6	@BOTAN110_TRUE@am__append_4 = botan110signers.cc botansigners.cc
	7	-@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS) -lgmp -lrt
	8	+@BOTAN110_TRUE@am__append_5 = $(BOTAN110_LIBS)
	9	@BOTAN18_TRUE@am__append_6 = botan18signers.cc botansigners.cc
	10	@BOTAN18_TRUE@am__append_7 = $(BOTAN18_LIBS) -lgmp
	11	@CRYPTOPP_TRUE@am__append_8 = cryptoppsigners.cc
	12	@@ -74,7 +74,7 @@
	13	@SQLITE3_TRUE@am__append_10 = ssqlite3.cc ssqlite3.hh
	14	@ORACLE_TRUE@am__append_11 = $(ORACLE_LIBS)
	15	@BOTAN110_TRUE@am__append_12 = botan110signers.cc botansigners.cc
	16	-@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS) -lgmp -lrt
	17	+@BOTAN110_TRUE@am__append_13 = $(BOTAN110_LIBS)
	18	@BOTAN18_TRUE@am__append_14 = botan18signers.cc botansigners.cc
	19	@BOTAN18_TRUE@am__append_15 = $(BOTAN18_LIBS) -lgmp
	20	@CRYPTOPP_TRUE@am__append_16 = cryptoppsigners.cc
	21	@@ -750,8 +750,8 @@
	22	top_builddir = @top_builddir@
	23	top_srcdir = @top_srcdir@
	24	AM_CXXFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DLIBDIR=\"@libdir@\" -DLOCALSTATEDIR=\"@socketdir@\" -Ibackends/bind @THREADFLAGS@ $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -Iext/rapidjson/include
	25	-AM_CPPFLAGS = -Ibackends/bind $(BOOST_CPPFLAGS) @THREADFLAGS@ \
	26	- $(LIBCURL_CFLAGS) $(am__append_1) $(am__append_2)
	27	+AM_CPPFLAGS = -Ibackends/bind @THREADFLAGS@ \
	28	+ $(am__append_1) $(am__append_2) $(BOOST_CPPFLAGS)
	29	EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8 \
	30	docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \
	31	docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \
	32	@@ -797,7 +797,7 @@
	33	#
	34	pdns_server_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic
	35	pdns_server_LDADD = $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) \
	36	- $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(am__append_5) \
	37	+ $(LUA_LIBS) $(SQLITE3_LIBS) $(am__append_5) \
	38	$(am__append_7) $(am__append_9) $(am__append_11)
	39	pdnssec_SOURCES = pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc \
	40	dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh misc.cc \
	41	@@ -819,7 +819,7 @@
	42	$(am__append_18)
	43	pdnssec_LDFLAGS = @moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
	44	pdnssec_LDADD = $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
	45	- $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) \
	46	+ $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) \
	47	$(am__append_13) $(am__append_15) $(am__append_17) \
	48	$(am__append_19)
	49	sdig_SOURCES = sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnslabeltext.cc dnswriter.hh \