Add bash dependency for bootstrapping (BUILD_DEPENDS) Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
Responsible Changed From-To: freebsd-ports-bugs->danilo I'll take it.
Author: danilo Date: Sun Nov 10 23:21:00 2013 New Revision: 333456 URL: http://svnweb.freebsd.org/changeset/ports/333456 Log: - Add bash dependency for bootstrapping [1] - Use options helpers to simplify the Makefile - Remove SQLITE2 option as it was dropped from powerdns on 2012 PR: ports/182902 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) [1] Modified: head/dns/powerdns-devel/Makefile head/dns/powerdns-devel/files/pdns-devel.in head/dns/powerdns-devel/pkg-plist Modified: head/dns/powerdns-devel/Makefile ============================================================================== --- head/dns/powerdns-devel/Makefile Sun Nov 10 23:13:21 2013 (r333455) +++ head/dns/powerdns-devel/Makefile Sun Nov 10 23:21:00 2013 (r333456) @@ -9,11 +9,12 @@ PKGNAMESUFFIX= -devel DISTNAME= auth-${PORTVERSION:S/.r/-rc/} 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 -BUILD_DEPENDS= ragel:${PORTSDIR}/devel/ragel +BUILD_DEPENDS= ragel:${PORTSDIR}/devel/ragel \ + bash:${PORTSDIR}/shells/bash LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs USE_GITHUB= YES @@ -37,7 +38,7 @@ GNU_CONFIGURE= YES CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-modules="" \ - --with-dynmodules="pipe ${CONFIGURE_MODULES}" \ + --with-dynmodules="pipe ${MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ @@ -48,20 +49,22 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFI SUB_FILES= pkg-message -OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 \ - OPENDBX OPENLDAP OPENLDAP_LOCAL GEO POLARSSL TOOLS +USE_RC_SUBR+= pdns-devel + +OPTIONS_DEFINE= GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \ + PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS OPTIONS_MULTI= DNSSEC OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP +BACKENDS_DESC= Choose backend(s) 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 +SQLITE3_DESC= SQLite 3 backend GEO_DESC= Geo backend DNSSEC_DESC= Enable extra DNSSEC options BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms @@ -71,104 +74,73 @@ TOOLS_DESC= Build extra tools OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL -.include <bsd.port.pre.mk> +OPTIONS_SUB= yes -USE_RC_SUBR+= pdns-devel +TOOLS_CONFIGURE_ENABLE= tools -.if ${PORT_OPTIONS:MTOOLS} -CONFIGURE_ARGS+= --enable-tools -PLIST_SUB+= WITHTOOLS="" -.else -PLIST_SUB+= WITHTOOLS="@comment " -.endif +PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} +PGSQL_CONFIGURE_OFF= --without-pgsql +PGSQL_USE= PGSQL=YES +PGSQL_LOCAL_USE= PGSQL=server -.if ${PORT_OPTIONS:MGEO} -CONFIGURE_MODULES+= "geo" -PLIST_SUB+= WITHGEO="" -.else -PLIST_SUB+= WITHGEO="@comment " -.endif +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_CONFIGURE_OFF= --without-mysql +MYSQL_USE= MYSQL=YES +MYSQL_LOCAL_USE= MYSQL=server + +OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 +OPENLDAP_USE= OPENLDAP=YES +OPENLDAP_LOCAL_RUN_DEPENDS= openldap-server>=0:${PORTSDIR}/net/openldap24-server -.if ${PORT_OPTIONS:MSQLITE} && ${PORT_OPTIONS:MSQLITE3} -BROKEN= choose only one SQLite backend version +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 + +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MGEO} +MODULES+= "geo" .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL?= YES -CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} -CONFIGURE_MODULES+= "gpgsql" -PLIST_SUB+= WITHPGSQL="" -.else -CONFIGURE_ARGS+= --without-pgsql -PLIST_SUB+= WITHPGSQL="@comment " +MODULES+= "gpgsql" .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL?= YES -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_MODULES+= "gmysql" -PLIST_SUB+= WITHMYSQL="" -.else -CONFIGURE_ARGS+= --without-mysql -PLIST_SUB+= WITHMYSQL="@comment " +MODULES+= "gmysql" .endif -.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MPGSQL} -. if ${PORT_OPTIONS:MPGSQL_LOCAL} -USE_PGSQL?= server -SUB_LIST+= PGSQL=postgresql -. endif +.if ${PORT_OPTIONS:MPGSQL_LOCAL} +SUB_LIST+= PGSQL_REQ=postgresql .else -SUB_LIST+= PGSQL= +SUB_LIST+= PGSQL_REQ= .endif -.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MMYSQL} -. if ${PORT_OPTIONS:MMYSQL_LOCAL} -USE_MYSQL?= server -SUB_LIST+= MYSQL=mysql -. endif + +.if ${PORT_OPTIONS:MMYSQL_LOCAL} +SUB_LIST+= MYSQL_REQ=mysql .else -SUB_LIST+= MYSQL= +SUB_LIST+= MYSQL_REQ= .endif .if ${PORT_OPTIONS:MOPENLDAP} -USE_OPENLDAP?= YES -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 -SUB_LIST+= SLAPD=slapd -. else -SUB_LIST+= SLAPD= -. endif -.else -PLIST_SUB+= WITHOPENLDAP="@comment " -SUB_LIST+= SLAPD= +MODULES+= "ldap" .endif -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE?= 2 -CONFIGURE_MODULES+= "gsqlite" -PLIST_SUB+= WITHSQLITE="" +.if ${PORT_OPTIONS:MOPENLDAP_LOCAL} +SUB_LIST+= SLAPD_REQ=slapd .else -PLIST_SUB+= WITHSQLITE="@comment " +SUB_LIST+= SLAPD_REQ= .endif .if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE?= 3 -CONFIGURE_MODULES+= "gsqlite3" -PLIST_SUB+= WITHSQLITE3="" -.else -PLIST_SUB+= WITHSQLITE3="@comment " +MODULES+= "gsqlite3" .endif .if ${PORT_OPTIONS:MOPENDBX} -LIB_DEPENDS+= libopendbx.so:${PORTSDIR}/databases/opendbx -CONFIGURE_MODULES+= "opendbx" -PLIST_SUB+= WITHOPENDBX="" -CXXFLAGS+= -L${LOCALBASE}/lib -.else -PLIST_SUB+= WITHOPENDBX="@comment " +MODULES+= "opendbx" .endif .if ${PORT_OPTIONS:MPOLARSSL} @@ -177,11 +149,6 @@ CONFIGURE_ARGS+= --without-system-polars LIB_DEPENDS+= libpolarssl.so:${PORTSDIR}/security/polarssl .endif -.if ${PORT_OPTIONS:MBOTAN110} -CONFIGURE_ARGS+= --enable-botan1.10 -LIB_DEPENDS+= libbotan-1.10.so:${PORTSDIR}/security/botan110 -.endif - .if ${PORT_OPTIONS:MCRYPTOPP} . if exists(${LOCALBASE}/lib/libcryptopp.so) LIB_DEPENDS+= libcryptopp.so:${PORTSDIR}/security/cryptopp @@ -192,6 +159,7 @@ CONFIGURE_ARGS+= --enable-cryptopp .endif pre-patch: + ${ECHO_CMD} ${BARBA} @${REINPLACE_CMD} -e "s;/bin/bash;/usr/bin/env bash;" \ -e "s;ssed -r;sed -E -e;g" \ -e "s;-i;-i \.bak;g" \ @@ -223,9 +191,9 @@ post-install: .for i in pdns.conf ${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/ .endfor -.for j in libgpgsqlbackend.so libgmysqlbackend.so libgsqlitebackend.so \ - libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \ - libgeobackend.so libpipebackend.so +.for j in libgpgsqlbackend.so libgmysqlbackend.so libgsqlite3backend.so \ + libldapbackend.so libopendbxbackend.so libgeobackend.so \ + libpipebackend.so @if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \ ${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \ fi Modified: head/dns/powerdns-devel/files/pdns-devel.in ============================================================================== --- head/dns/powerdns-devel/files/pdns-devel.in Sun Nov 10 23:13:21 2013 (r333455) +++ head/dns/powerdns-devel/files/pdns-devel.in Sun Nov 10 23:21:00 2013 (r333456) @@ -4,7 +4,7 @@ # # PROVIDE: pdns_server -# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%SLAPD%% +# REQUIRE: DAEMON %%MYSQL_REQ%% %%PGSQL_REQ%% %%SLAPD_REQ%% # KEYWORD: shutdown # Modified: head/dns/powerdns-devel/pkg-plist ============================================================================== --- head/dns/powerdns-devel/pkg-plist Sun Nov 10 23:13:21 2013 (r333455) +++ head/dns/powerdns-devel/pkg-plist Sun Nov 10 23:21:00 2013 (r333456) @@ -4,46 +4,46 @@ 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 -%%WITHPGSQL%%lib/libgpgsqlbackend.so.0 -%%WITHMYSQL%%lib/libgmysqlbackend.a -%%WITHMYSQL%%lib/libgmysqlbackend.la -%%WITHMYSQL%%lib/libgmysqlbackend.so -%%WITHMYSQL%%lib/libgmysqlbackend.so.0 -%%WITHSQLITE%%lib/libgsqlitebackend.a -%%WITHSQLITE%%lib/libgsqlitebackend.la -%%WITHSQLITE%%lib/libgsqlitebackend.so -%%WITHSQLITE%%lib/libgsqlitebackend.so.0 -%%WITHSQLITE3%%lib/libgsqlite3backend.a -%%WITHSQLITE3%%lib/libgsqlite3backend.la -%%WITHSQLITE3%%lib/libgsqlite3backend.so -%%WITHSQLITE3%%lib/libgsqlite3backend.so.0 -%%WITHOPENLDAP%%lib/libldapbackend.a -%%WITHOPENLDAP%%lib/libldapbackend.la -%%WITHOPENLDAP%%lib/libldapbackend.so -%%WITHOPENLDAP%%lib/libldapbackend.so.0 -%%WITHOPENDBX%%lib/libopendbxbackend.a -%%WITHOPENDBX%%lib/libopendbxbackend.la -%%WITHOPENDBX%%lib/libopendbxbackend.so -%%WITHOPENDBX%%lib/libopendbxbackend.so.0 -%%WITHGEO%%lib/libgeobackend.a -%%WITHGEO%%lib/libgeobackend.la -%%WITHGEO%%lib/libgeobackend.so -%%WITHGEO%%lib/libgeobackend.so.0 +%%TOOLS%%bin/dnsbulktest +%%TOOLS%%bin/dnsreplay +%%TOOLS%%bin/dnsscan +%%TOOLS%%bin/dnsscope +%%TOOLS%%bin/dnstcpbench +%%TOOLS%%bin/dnswasher +%%TOOLS%%bin/nproxy +%%TOOLS%%bin/nsec3dig +%%PGSQL%%lib/libgpgsqlbackend.a +%%PGSQL%%lib/libgpgsqlbackend.la +%%PGSQL%%lib/libgpgsqlbackend.so +%%PGSQL%%lib/libgpgsqlbackend.so.0 +%%MYSQL%%lib/libgmysqlbackend.a +%%MYSQL%%lib/libgmysqlbackend.la +%%MYSQL%%lib/libgmysqlbackend.so +%%MYSQL%%lib/libgmysqlbackend.so.0 +%%SQLITE3%%lib/libgsqlite3backend.a +%%SQLITE3%%lib/libgsqlite3backend.la +%%SQLITE3%%lib/libgsqlite3backend.so +%%SQLITE3%%lib/libgsqlite3backend.so.0 +%%OPENLDAP%%lib/libldapbackend.a +%%OPENLDAP%%lib/libldapbackend.la +%%OPENLDAP%%lib/libldapbackend.so +%%OPENLDAP%%lib/libldapbackend.so.0 +%%OPENDBX%%lib/libopendbxbackend.a +%%OPENDBX%%lib/libopendbxbackend.la +%%OPENDBX%%lib/libopendbxbackend.so +%%OPENDBX%%lib/libopendbxbackend.so.0 +%%GEO%%lib/libgeobackend.a +%%GEO%%lib/libgeobackend.la +%%GEO%%lib/libgeobackend.so +%%GEO%%lib/libgeobackend.so.0 lib/libpipebackend.a lib/libpipebackend.la lib/libpipebackend.so lib/libpipebackend.so.0 +%%TOOLS%%man/man1/dnstcpbench.1.gz +%%TOOLS%%man/man8/dnsreplay.8.gz +%%TOOLS%%man/man8/dnsscope.8.gz +%%TOOLS%%man/man8/dnswasher.8.gz man/man8/pdns_control.8.gz man/man8/pdns_server.8.gz man/man8/pdnssec.8.gz _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with some changes. Thanks!