Date: Sat, 28 Jul 2012 12:19:04 +0000 (UTC) From: Michael Scheidell <scheidell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301652 - head/dns/powerdns Message-ID: <201207281219.q6SCJ4we024843@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scheidell Date: Sat Jul 28 12:19:03 2012 New Revision: 301652 URL: http://svn.freebsd.org/changeset/ports/301652 Log: - Fix CONFLICTS. - Convert to new OptionsNG - Add DNSSEC knob by popular demand. Disabling this will disable DNSSEC algorithms 13 and 14 and remove dependency on libcryptopp. - Also disabled botan support since it's broken with 1.8. When 1.10 becomes part of the ports tree it can be enabled again. PR: ports/170195 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) Modified: head/dns/powerdns/Makefile Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Sat Jul 28 12:14:54 2012 (r301651) +++ head/dns/powerdns/Makefile Sat Jul 28 12:19:03 2012 (r301652) @@ -7,7 +7,7 @@ PORTNAME= powerdns PORTVERSION= 3.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ \ http://mirrors.evolva.ro/powerdns.com/releases/ @@ -18,15 +18,14 @@ COMMENT= An advanced DNS server with mul LICENSE= GPLv2 -BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \ - ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp -LIB_DEPENDS= botan.0:${PORTSDIR}/security/botan \ - boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs +BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam +LIB_DEPENDS= boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs +# botan.0:${PORTSDIR}/security/botan USE_LUA= 5.1 LUA_COMPS= lua -CONFLICTS= powerdns-devel-[0-9]* +CONFLICTS= powerdns-devel-[2-3].[0-9]* USE_GMAKE= YES USE_SUBMAKE= YES @@ -37,9 +36,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-modules="" \ --with-dynmodules="pipe ${CONFIGURE_MODULES}" \ --sysconfdir="${PREFIX}/etc/pdns" \ - --with-boost="${LOCALBASE}" \ - --enable-botan1.8 \ - --enable-cryptopp + --with-boost="${LOCALBASE}" +# --enable-botan1.8 SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ @@ -49,33 +47,40 @@ MAN8= pdns_control.8 pdns_server.8 zone SUB_FILES= pkg-message -OPTIONS= PGSQL "PostgreSQL backend" on \ - PGSQL_LOCAL "RUN_DEPEND on PostgreSQL" off \ - MYSQL "MySQL backend" off \ - MYSQL_LOCAL "RUN_DEPEND on MySQL server" off \ - SQLITE "SQLite 2 backend" off \ - SQLITE3 "SQLite 3 backend" off \ - OPENDBX "OpenDBX backend" off \ - OPENLDAP "OpenLDAP backend" off \ - OPENLDAP_LOCAL "RUN_DEPEND on OpenLDAP server" off \ - GEO "Geo backend" off +OPTIONS_DEFINE= PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC + +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 +GEO_DESC= Geo backend +DNSSEC_DESC= Enable extra DNSSEC algorithms (13 & 14) + +OPTIONS_DEFAULT= PGSQL + +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> USE_RC_SUBR+= pdns -.if defined(WITH_GEO) +.if ${PORT_OPTIONS:MGEO} CONFIGURE_MODULES+= "geo" PLIST_SUB+= WITHGEO="" .else PLIST_SUB+= WITHGEO="@comment " .endif -.if defined(WITH_SQLITE) && defined(WITH_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE} && ${PORT_OPTIONS:MSQLITE3} BROKEN= choose only one SQLite backend version .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL?= YES CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_MODULES+= "gpgsql" @@ -85,7 +90,7 @@ CONFIGURE_ARGS+= --without-pgsql PLIST_SUB+= WITHPGSQL="@comment " .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL?= YES CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} CONFIGURE_MODULES+= "gmysql" @@ -97,8 +102,8 @@ CONFIGURE_ARGS+= --without-mysql PLIST_SUB+= WITHMYSQL="@comment " .endif -.if defined(WITH_OPENDBX) || defined(WITH_PGSQL) -. if defined(WITH_PGSQL_LOCAL) +.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MPGSQL} +. if ${PORT_OPTIONS:MPGSQL_LOCAL} USE_PGSQL?= YES RUN_DEPENDS+= postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server SUB_LIST+= PGSQL=postgresql @@ -106,8 +111,8 @@ SUB_LIST+= PGSQL=postgresql .else SUB_LIST+= PGSQL= .endif -.if defined(WITH_OPENDBX) || defined(WITH_MYSQL) -. if defined(WITH_MYSQL_LOCAL) +.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MMYSQL} +. if ${PORT_OPTIONS:MMYSQL_LOCAL} USE_MYSQL?= YES RUN_DEPENDS+= mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server SUB_LIST+= MYSQL=mysql @@ -116,12 +121,12 @@ SUB_LIST+= MYSQL=mysql SUB_LIST+= MYSQL= .endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP?= YES CONFIGURE_MODULES+= "ldap" CXXFLAGS+= -L${LOCALBASE}/lib -DLDAP_DEPRECATED=1 PLIST_SUB+= WITHOPENLDAP="" -. if defined(WITH_OPENLDAP_LOCAL) +. if ${PORT_OPTIONS:MOPENLDAP_LOCAL} RUN_DEPENDS+= openldap-server>=0:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-server SUB_LIST+= SLAPD=slapd . else @@ -132,7 +137,7 @@ PLIST_SUB+= WITHOPENLDAP="@comment " SUB_LIST+= SLAPD= .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} USE_SQLITE?= 2 CONFIGURE_MODULES+= "gsqlite" PLIST_SUB+= WITHSQLITE="" @@ -140,7 +145,7 @@ PLIST_SUB+= WITHSQLITE="" PLIST_SUB+= WITHSQLITE="@comment " .endif -.if defined(WITH_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} USE_SQLITE?= 3 CONFIGURE_MODULES+= "gsqlite3" PLIST_SUB+= WITHSQLITE3="" @@ -148,8 +153,8 @@ PLIST_SUB+= WITHSQLITE3="" PLIST_SUB+= WITHSQLITE3="@comment " .endif -.if defined(WITH_OPENDBX) -LIB_DEPENDS+= opendbx.3:${PORTSDIR}/databases/opendbx +.if ${PORT_OPTIONS:MOPENDBX} +LIB_DEPENDS+= opendbx:${PORTSDIR}/databases/opendbx CONFIGURE_MODULES+= "opendbx" PLIST_SUB+= WITHOPENDBX="" CXXFLAGS+= -L${LOCALBASE}/lib @@ -157,8 +162,13 @@ CXXFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= WITHOPENDBX="@comment " .endif +.if ${PORT_OPTIONS:MDNSSEC} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp +CONFIGURE_ARGS+= --enable-cryptopp +.endif + post-patch: -.if defined(WITH_OPENLDAP) +.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 @@ -166,7 +176,7 @@ post-patch: -e 's;@modulelibs@;@modulelibs@ -llber;' \ ${WRKSRC}/pdns/Makefile.in .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} @${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \ ${WRKSRC}/configure .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207281219.q6SCJ4we024843>