ports/172903: dns/opendnssec convert to OPTIONSNG

[Jaap Akkerhuis]

The following reply was made to PR ports/172903; it has been noted by GNATS.

From: Jaap Akkerhuis <jaap at NLnetLabs.nl>
To: bug-followup at FreeBSD.ORG
Cc: jaap at NLnetLabs.nl
Subject: Re: ports/172903: dns/opendnssec convert to OPTIONSNG
Date: Sun, 21 Oct 2012 19:54:55 +0200

 --Apple-Mail=_0C5EFE58-C87B-4080-AF5C-6E52EE93B325
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 
 On Oct 20, 2012, at 14:50, Edwin Groothuis <edwin at FreeBSD.ORG> wrote:
 
 > Maintainer of dns/opendnssec,
 > 
 > Please note that PR ports/172903 has just been submitted.
 
 Thanks.  However, the suggested patch doesn't work as intended.  Find below
 an improved version.
 
 Regards,
 
 	jaap
 
 
 
 --Apple-Mail=_0C5EFE58-C87B-4080-AF5C-6E52EE93B325
 Content-Disposition: attachment;
 	filename=patch-ods
 Content-Type: application/octet-stream;
 	name="patch-ods"
 Content-Transfer-Encoding: 7bit
 
 
 --- opendnssec-1.3.10.patch begins here ---
 diff -ruN --exclude=CVS ../opendnssec.orig/Makefile ./Makefile
 --- ../opendnssec.orig/Makefile	2012-10-21 11:02:08.483217673 +0200
 +++ ./Makefile	2012-10-21 16:10:15.917472339 +0200
 @@ -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,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 +64,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 +73,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 +84,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>
 --- opendnssec-1.3.10.patch ends here ---
 
 
 --Apple-Mail=_0C5EFE58-C87B-4080-AF5C-6E52EE93B325--