From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 20 12:50:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A003BD39 for ; Sat, 20 Oct 2012 12:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 7769D8FC12 for ; Sat, 20 Oct 2012 12:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9KCo1fG085524 for ; Sat, 20 Oct 2012 12:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9KCo1rC085523; Sat, 20 Oct 2012 12:50:01 GMT (envelope-from gnats) Resent-Date: Sat, 20 Oct 2012 12:50:01 GMT Resent-Message-Id: <201210201250.q9KCo1rC085523@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erwin Lansing Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D83A0C1A for ; Sat, 20 Oct 2012 12:44:17 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id A71C08FC08 for ; Sat, 20 Oct 2012 12:44:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9KCiHwC085298 for ; Sat, 20 Oct 2012 12:44:17 GMT (envelope-from erwin@freefall.freebsd.org) Received: (from erwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9KCiH3I085297; Sat, 20 Oct 2012 12:44:17 GMT (envelope-from erwin) Message-Id: <201210201244.q9KCiH3I085297@freefall.freebsd.org> Date: Sat, 20 Oct 2012 12:44:17 GMT From: Erwin Lansing To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/172903: dns/opendnssec convert to OPTIONSNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Erwin Lansing List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2012 12:50:01 -0000 >Number: 172903 >Category: ports >Synopsis: dns/opendnssec convert to OPTIONSNG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 20 12:50:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Erwin Lansing >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: DK Hostmaster A/S >Environment: System: FreeBSD freefall.freebsd.org 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r241358: Mon Oct 8 23:17:12 UTC 2012 peter@freefall.freebsd.org:/usr/src/sys/amd64/compile/FREEFALL amd64 >Description: Convert to new OPTIONSNG framework >How-To-Repeat: >Fix: --- optionsng-ods.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 306177) +++ Makefile (working copy) @@ -32,13 +32,15 @@ MAN7= opendnssec.7 MAN8= ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8 -OPTIONS= SOFTHSM "Build/update SOFTHSM as well." Off \ - AUDITOR "Build with Auditor." On \ - MYSQL "Use with (experimental) MYSQL support" Off +OPTIONS_DEFAULT= AUDITOR .include -.if defined(WITH_MYSQL) +OPTIONS_DEFINE= SOFTHSM AUDITOR MYSQL +SOFTHSM_DESC= Build/update SOFTHSM as well. +AUDITOR_DESC= Build with Auditor. + +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} CONFIGURE_ARGS+= --with-database-backend=mysql USE_MYSQL= compat @@ -52,7 +54,10 @@ PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_AUDITOR) +.if ${PORT_OPTIONS:MAUDITOR} +.if ${RUBY_VER} == 1.9 +BROKEN= does not work with ruby 1.9 +.endif BUILD_DEPENDS+= rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby USE_RUBY= yes PLIST_SUB+= AUDITOR="" @@ -62,7 +67,7 @@ PLIST_SUB+= AUDITOR="@comment " .endif -.if defined(WITH_SOFTHSM) +.if ${PORT_OPTIONS:MSOFTHSM} CONFIGURE_ARGS+= --with-softhsm CONFIGURE_ARGS+= --with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so RUN_DEPENDS+= softhsm>=1.2.0:${PORTSDIR}/security/softhsm @@ -71,7 +76,7 @@ PKGMESSAGE= ${WRKSRC}/MIGRATION pre-install: -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} @${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec .endif @@ -81,8 +86,4 @@ .endif ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec -.include -.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9 -BROKEN= does not work with ruby 1.9 -.endif -.include +.include --- optionsng-ods.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: