Date: Sat, 20 Oct 2012 12:44:17 GMT From: Erwin Lansing <erwin@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172903: dns/opendnssec convert to OPTIONSNG Message-ID: <201210201244.q9KCiH3I085297@freefall.freebsd.org> Resent-Message-ID: <201210201250.q9KCo1rC085523@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
-.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 <bsd.port.pre.mk>
-.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9
-BROKEN= does not work with ruby 1.9
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- optionsng-ods.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210201244.q9KCiH3I085297>