Date: Wed, 9 Oct 2013 22:15:48 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329932 - in head/dns/powerdns: . files Message-ID: <201310092215.r99MFmpx065324@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Wed Oct 9 22:15:48 2013 New Revision: 329932 URL: http://svnweb.freebsd.org/changeset/ports/329932 Log: - Convert LIB_DEPENDS to new syntax [1] - Add stage support [1] - Use OPTIONS_RADIO to handle SQLITE - Remove indefinite article from COMMENT PR: ports/182631 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) [1] Approved by: wg/culot (mentors, implicit) Modified: head/dns/powerdns/Makefile head/dns/powerdns/files/patch-pdns_Makefile_in head/dns/powerdns/pkg-plist Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Wed Oct 9 21:41:32 2013 (r329931) +++ head/dns/powerdns/Makefile Wed Oct 9 22:15:48 2013 (r329932) @@ -8,11 +8,11 @@ MASTER_SITES= http://downloads.powerdns. DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net -COMMENT= An advanced DNS server with multiple backends including SQL +COMMENT= Advanced DNS server with multiple backends including SQL LICENSE= GPLv2 -LIB_DEPENDS= boost_serialization:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs USE_LUA= 5.1 LUA_COMPS= lua @@ -34,21 +34,22 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFI MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" -MAN8= pdns_control.8 pdns_server.8 zone2sql.8 pdnssec.8 zone2ldap.8 SUB_FILES= pkg-message -OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 \ +OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL \ OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL TOOLS OPTIONS_MULTI= DNSSEC OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP +OPTIONS_RADIO= SQLITE +OPTIONS_RADIO_SQLITE= SQLITE2 SQLITE3 +SQLITE2_DESC= SQLite 2 database support + PGSQL_DESC= PostgreSQL backend PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server MYSQL_DESC= MySQL backend MYSQL_LOCAL_DESC= RUN_DEPEND on MySQL server -SQLITE_DESC= SQLite 2 backend -SQLITE3_DESC= SQLite 3 backend OPENDBX_DESC= OpenDBX backend OPENLDAP_DESC= OpenLDAP backend OPENLDAP_LOCAL_DESC= RUN_DEPEND on OpenLDAP server @@ -61,11 +62,8 @@ 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 .if ${PORT_OPTIONS:MTOOLS} @@ -82,10 +80,6 @@ PLIST_SUB+= WITHGEO="" PLIST_SUB+= WITHGEO="@comment " .endif -.if ${PORT_OPTIONS:MSQLITE} && ${PORT_OPTIONS:MSQLITE3} -BROKEN= choose only one SQLite backend version -.endif - .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL?= YES CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} @@ -156,7 +150,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 @@ -167,17 +161,17 @@ 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 @@ -199,22 +193,16 @@ post-patch: .endif post-install: -.if !exists(${PREFIX}/etc/pdns/pdns.conf) - ${INSTALL_DATA} ${PREFIX}/etc/pdns/pdns.conf-dist ${PREFIX}/etc/pdns/pdns.conf -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - ${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> +.include <bsd.port.mk> Modified: head/dns/powerdns/files/patch-pdns_Makefile_in ============================================================================== --- head/dns/powerdns/files/patch-pdns_Makefile_in Wed Oct 9 21:41:32 2013 (r329931) +++ head/dns/powerdns/files/patch-pdns_Makefile_in Wed Oct 9 22:15:48 2013 (r329932) @@ -1,5 +1,5 @@ ---- pdns/Makefile.in.orig 2013-06-27 13:47:04.000000000 +0200 -+++ pdns/Makefile.in 2013-06-28 10:28:35.191325678 +0200 +--- ./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) @@ -18,6 +18,17 @@ @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 \ Modified: head/dns/powerdns/pkg-plist ============================================================================== --- head/dns/powerdns/pkg-plist Wed Oct 9 21:41:32 2013 (r329931) +++ head/dns/powerdns/pkg-plist Wed Oct 9 22:15:48 2013 (r329932) @@ -44,6 +44,15 @@ lib/libpipebackend.a lib/libpipebackend.la lib/libpipebackend.so lib/libpipebackend.so.0 +%%WITHTOOLS%%man/man1/dnstcpbench.1.gz +%%WITHTOOLS%%man/man8/dnsreplay.8.gz +%%WITHTOOLS%%man/man8/dnsscope.8.gz +%%WITHTOOLS%%man/man8/dnswasher.8.gz +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310092215.r99MFmpx065324>