From erwin@FreeBSD.org  Sat Oct 20 12:44:17 2012
Return-Path: <erwin@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D83A0C1A
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <erwin@freebsd.org>
Reply-To: Erwin Lansing <erwin@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: dns/opendnssec convert to OPTIONSNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify: jaap@NLnetLabs.nl

>Number:         172903
>Category:       ports
>Synopsis:       dns/opendnssec convert to OPTIONSNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    erwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 20 12:50:01 UTC 2012
>Closed-Date:    Tue Oct 23 12:35:06 UTC 2012
>Last-Modified:  Tue Oct 23 12:35:06 UTC 2012
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Oct 20 12:50:08 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172903 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jaap@NLnetLabs.nl
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/172903: dns/opendnssec convert to OPTIONSNG
Date: Sat, 20 Oct 2012 12:50:07 UT

 Maintainer of dns/opendnssec,
 
 Please note that PR ports/172903 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172903
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Erwin Lansing <erwin@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/172903: dns/opendnssec convert to OPTIONSNG
Date: Sat, 20 Oct 2012 16:04:13 +0200

 Update patch:
 
 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
 +OPTIONS_DEFAULT=	AUDITOR
 +SOFTHSM_DESC=		Build/update SOFTHSM as well.
 +AUDITOR_DESC=		Build with 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>

From: Jaap Akkerhuis <jaap@NLnetLabs.nl>
To: bug-followup@FreeBSD.ORG
Cc: jaap@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@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--
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Sun Oct 21 18:03:25 UTC 2012 
State-Changed-Why:  
Maintainer has replied with updated patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172903 
Responsible-Changed-From-To: freebsd-ports-bugs->erwin 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Sun Oct 21 18:16:42 UTC 2012 
Responsible-Changed-Why:  
My PR, I'll handle it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172903 
State-Changed-From-To: open->closed 
State-Changed-By: erwin 
State-Changed-When: Tue Oct 23 12:34:06 UTC 2012 
State-Changed-Why:  
Hoi Jaap, 

I figured something like that happened to the second patch 
after looking in GNATS.  Thanks for reviewing two sets of 
patches, and for catching my mistakes in the first round. 

Committed, thanks again! 
Erwin 


http://www.freebsd.org/cgi/query-pr.cgi?pr=172903 
>Unformatted:
