- Update to 3.3 - Switch to github to make tracking release candidates easier in the future - Added dependencies to bootstrap (autoconf, automake) and compile (bison, ragel) - Hopefully fix building on 10-CURRENT Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: SVN)
Responsible Changed From-To: freebsd-ports-bugs->wg I'll take it.
Hi, This port does not seem to build with botan option: http://pastebin.ca/2460809. Do you have any ideas? Thanks -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil
Hi, This is caused by the botan 1.8 port being installed next to botan 1.10. I'm trying to fix this right now. Best regards, Ralf van der Enden -----Original Message----- From: William Grzybowski [mailto:william88@gmail.com] Sent: dinsdag 1 oktober 2013 17:55 To: bug-followup@FreeBSD.org; tremere@cainites.net Subject: Re: ports/182494: [MAINTAINER] dns/powerdns-devel: update to 3.3,1 Hi, This port does not seem to build with botan option: http://pastebin.ca/2460809. Do you have any ideas? Thanks -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil
This is a multi-part message in MIME format.
Hi, The Makefile.in patch does not apply. Makefile.in does not exists until automake etc runs, looks lile Makefile.am should be the file you want to patch. Thanks -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil
Oops. I forgot to remove that file. It's no longer needed. Want me to delete it and send you a new patch ? Or can you do that on your end using svn delete ? Best regards, Ralf On 3-10-2013 15:55, William Grzybowski wrote: > Hi, > > The Makefile.in patch does not apply. Makefile.in does not exists > until automake etc runs, looks lile Makefile.am should be the file you > want to patch. > > Thanks >
Oh no, thats ok, thanks for the clarification. On Thu, Oct 3, 2013 at 11:29 AM, Ralf van der Enden <tremere@cainites.net> wrote: > Oops. I forgot to remove that file. It's no longer needed. > > Want me to delete it and send you a new patch ? Or can you do that on your > end using svn delete ? > > Best regards, > > Ralf > > > On 3-10-2013 15:55, William Grzybowski wrote: >> >> Hi, >> >> The Makefile.in patch does not apply. Makefile.in does not exists >> until automake etc runs, looks lile Makefile.am should be the file you >> want to patch. >> >> Thanks >> > > -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil
Author: wg Date: Thu Oct 3 16:09:54 2013 New Revision: 329201 URL: http://svnweb.freebsd.org/changeset/ports/329201 Log: dns/powerdns-devel: update to 3.3 - Update to 3.3 [1] - Add TOOLS option [1] - Allow staging - Convert lib depends to new format PR: ports/182494 [1] Submitted by: Ralf van der Enden <tremere cainites.net> (maintainer) [1] Deleted: head/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_OBJECTLIBS head/dns/powerdns-devel/files/patch-pdns_Makefile_in Modified: head/dns/powerdns-devel/Makefile head/dns/powerdns-devel/distinfo head/dns/powerdns-devel/pkg-plist Modified: head/dns/powerdns-devel/Makefile ============================================================================== --- head/dns/powerdns-devel/Makefile Thu Oct 3 15:09:56 2013 (r329200) +++ head/dns/powerdns-devel/Makefile Thu Oct 3 16:09:54 2013 (r329201) @@ -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="${WRKDIRPREFI 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 option 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> Modified: head/dns/powerdns-devel/distinfo ============================================================================== --- head/dns/powerdns-devel/distinfo Thu Oct 3 15:09:56 2013 (r329200) +++ head/dns/powerdns-devel/distinfo Thu Oct 3 16:09:54 2013 (r329201) @@ -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 Modified: head/dns/powerdns-devel/pkg-plist ============================================================================== --- head/dns/powerdns-devel/pkg-plist Thu Oct 3 15:09:56 2013 (r329200) +++ head/dns/powerdns-devel/pkg-plist Thu Oct 3 16:09:54 2013 (r329201) @@ -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 _______________________________________________ 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 minor changes. Thanks!