Date: Mon, 2 Jul 2012 19:49:14 GMT From: Joe Holden <joe@rewt.org.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169612: dns/powerdns: Fix botan/cryptopp dependency, make it configurable Message-ID: <201207021949.q62JnEMu059380@red.freebsd.org> Resent-Message-ID: <201207021950.q62Jo2de090733@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169612
>Category: ports
>Synopsis: dns/powerdns: Fix botan/cryptopp dependency, make it configurable
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 02 19:50:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Joe Holden
>Release: 9.0-RELEASE
>Organization:
Pseudo Networks Limited
>Environment:
FreeBSD abby.lhr1.as41113.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This patch makes cryptopp and botan configurable as well as fixed the configure args, related botan patch in next pr.
The patch should apply cleanly against the current version, was made some time ago. May need reviewing as the default options may not be a suitable default.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2012-03-31 17:29:56.000000000 +0100
+++ Makefile 2012-04-29 00:32:44.000000000 +0100
@@ -16,10 +16,8 @@
MAINTAINER= tremere@cainites.net
COMMENT= An advanced DNS server with multiple backends including SQL
-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
USE_LUA= 5.1
LUA_COMPS= lua
@@ -36,8 +34,6 @@
--with-dynmodules="pipe ${CONFIGURE_MODULES}" \
--sysconfdir="${PREFIX}/etc/pdns" \
--with-boost="${LOCALBASE}" \
- --enable-botan1.8 \
- --enable-cryptopp
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
CURDIR2="${.CURDIR}" \
MKDIR="${MKDIR}" \
@@ -48,15 +44,17 @@
SUB_FILES= pkg-message
OPTIONS= PGSQL "PostgreSQL backend" on \
- PGSQL_LOCAL "RUN_DEPEND on PostgreSQL" off \
+ PGSQL_LOCAL "RUN_DEPEND on PostgreSQL" off \
MYSQL "MySQL backend" off \
- MYSQL_LOCAL "RUN_DEPEND on MySQL server" 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
+ GEO "Geo backend" off \
+ BOTAN "Build with botan" off \
+ CRYPTOPP "Build with cryptopp" on
.include <bsd.port.pre.mk>
@@ -95,6 +93,22 @@
PLIST_SUB+= WITHMYSQL="@comment "
.endif
+.if defined(WITH_BOTAN)
+LIB_DEPENDS+= botan.0:${PORTSDIR}/security/botan
+CONFIGURE_ARGS+= --enable-botan1.8
+PLIST_SUB+= WITHBOTAN=""
+.else
+PLIST_SUB+= WITHBOTAN="@comment "
+.endif
+
+.if defined(WITH_CRYPTOPP)
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
+CONFIGURE_ARGS+= --enable-cryptopp
+PLIST_SUB+= WITHCRYPTOPP=""
+.else
+PLIST_SUB+= WITHCRYPTOPP="@comment "
+.endif
+
.if defined(WITH_OPENDBX) || defined(WITH_PGSQL)
. if defined(WITH_PGSQL_LOCAL)
USE_PGSQL?= YES
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207021949.q62JnEMu059380>