Date: Tue, 23 Oct 2012 11:52:56 +0200 From: Erwin Lansing <erwin@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Cc: jaap@NLnetLabs.nl Subject: Re: ports/172903: dns/opendnssec convert to OPTIONSNG Message-ID: <20121023095255.GM4474@droso.net> In-Reply-To: <201210211803.q9LI3aCV044793@freefall.freebsd.org> References: <201210211803.q9LI3aCV044793@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--RASg3xLB4tUQ4RcS Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline If I'm diffing the diffs correctly, you used the first version of my patch to send the new one and the main change you made was to move the ruby check back to the bottem after the inclusion of bsd.port.post.mk. My second patch, attached for completeness, actually did the same, but also moved the OPTIONS_* macros before including bsd.port.options.mk, which is the recommended way. Is this patch fine with you, or did I overlook anything? Thanks, Erwin -- Erwin Lansing (o_ _o) http://droso.dk \\\_\ /_/// erwin@lansing.dk <____) (____> --RASg3xLB4tUQ4RcS Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="patch-ods2.txt" Index: Makefile =================================================================== --- Makefile (revision 306177) +++ Makefile (working copy) @@ -32,13 +32,14 @@ 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_DEFINE= SOFTHSM AUDITOR MYSQL +SOFTHSM_DESC= Build/update SOFTHSM as well. +AUDITOR_DESC= Build with Auditor. +OPTIONS_DEFAULT= AUDITOR .include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} CONFIGURE_ARGS+= --with-database-backend=mysql USE_MYSQL= compat @@ -52,7 +53,7 @@ PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_AUDITOR) +.if ${PORT_OPTIONS:MAUDITOR} BUILD_DEPENDS+= rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby USE_RUBY= yes PLIST_SUB+= AUDITOR="" @@ -62,7 +63,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 +72,7 @@ PKGMESSAGE= ${WRKSRC}/MIGRATION pre-install: -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} @${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec .endif @@ -82,7 +83,7 @@ ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec .include <bsd.port.pre.mk> -.if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9 +.if ${PORT_OPTIONS:MAUDITOR} && ${RUBY_VER} == 1.9 BROKEN= does not work with ruby 1.9 .endif .include <bsd.port.post.mk> --RASg3xLB4tUQ4RcS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121023095255.GM4474>