Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Oct 2012 12:34:03 +0000 (UTC)
From:      Erwin Lansing <erwin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306308 - head/dns/opendnssec
Message-ID:  <201210231234.q9NCY3KY062764@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: erwin
Date: Tue Oct 23 12:34:03 2012
New Revision: 306308
URL: http://svn.freebsd.org/changeset/ports/306308

Log:
  Convert to OPTIONSNG
  
  PR:		172903
  Submitted by:	me
  Approved by:	Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer)
  Feature safe:	yes

Modified:
  head/dns/opendnssec/Makefile

Modified: head/dns/opendnssec/Makefile
==============================================================================
--- head/dns/opendnssec/Makefile	Tue Oct 23 12:19:58 2012	(r306307)
+++ head/dns/opendnssec/Makefile	Tue Oct 23 12:34:03 2012	(r306308)
@@ -32,13 +32,14 @@ MAN5=		ods-timing.5
 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+=	SQLITE=""
 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 @@ CONFIGURE_ARGS+=	--disable-auditor
 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 @@ RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}
 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 @@ post-install:
 	${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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210231234.q9NCY3KY062764>