From nobody@FreeBSD.org  Sat Nov 10 07:08:21 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9E17E9C0
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Nov 2012 07:08:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BA128FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Nov 2012 07:08:21 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAA78LM3097345
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Nov 2012 07:08:21 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qAA78LCD097343;
	Sat, 10 Nov 2012 07:08:21 GMT
	(envelope-from nobody)
Message-Id: <201211100708.qAA78LCD097343@red.freebsd.org>
Date: Sat, 10 Nov 2012 07:08:21 GMT
From: Jason Helfman <jgh@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] net/bird: adopt optionsNG, trim header
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: melifaro@ipfw.ru

>Number:         173523
>Category:       ports
>Synopsis:       [patch] net/bird: adopt optionsNG, trim header
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    melifaro
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 10 09:40:03 UTC 2012
>Closed-Date:    Sat Jan 12 13:59:33 UTC 2013
>Last-Modified:  Sat Jan 12 13:59:33 UTC 2013
>Originator:     Jason Helfman
>Release:        9.0-RELEASE-p3
>Organization:
>Environment:
FreeBSD pepper 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Update to use optionsNG
Trim Makefile header
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: net/bird/Makefile
===================================================================
--- net/bird/Makefile	(revision 307263)
+++ net/bird/Makefile	(working copy)
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	bird
-# Date created:				12th May 2005
-# Whom:					Pav Lucistnik <pav@FreeBSD.org>
+# Created by:	Pav Lucistnik <pav@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	bird
 PORTVERSION=	1.3.8
@@ -20,9 +17,11 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	FIBS		"Enable multiple fib support" Off \
-		FIREWALL	"Enable firewall protocol" Off \
-		AGG		"Enable aggregation protocol (EXPERIMENTAL)" Off
+OPTIONS_DEFINE=	FIBS FIREWALL AGG
+FIBS_DESC=	Enable multiple fib support
+FIREWALL_DESC=	Enable firewall protocol
+AGG_DESC=	Enable aggregation protocol (EXPERIMENTAL)
+NO_OPTIONS_SORT=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -30,15 +29,15 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FIBS)
+.if ${PORT_OPTIONS:MFIBS}
 EXTRA_PATCHES+=	${FILESDIR}/fibs.diff
 .endif
 
-.if defined(WITH_FIREWALL)
+.if ${PORT_OPTIONS:MFIREWALL}
 EXTRA_PATCHES+=	${FILESDIR}/firewall_support.patch
 .endif
 
-.if defined(WITH_AGG)
+.if ${PORT_OPTIONS:MAGG}
 EXTRA_PATCHES+=	${FILESDIR}/agg_support.patch
 .endif
 
@@ -47,7 +46,7 @@
 		${CP} -p ${PREFIX}/etc/bird.conf.example ${PREFIX}/etc/bird.conf ; \
 		${CHMOD} 0640 ${PREFIX}/etc/bird.conf ; \
 	fi
-.if defined(WITH_FIBS)
+.if ${PORT_OPTIONS:MFIBS}
 	@${ECHO_MSG}
 	@${ECHO_MSG} =====================================================================
 	@${ECHO_MSG}


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Nov 10 09:40:47 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: melifaro@ipfw.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173523: [patch] net/bird: adopt optionsNG, trim header
Date: Sat, 10 Nov 2012 09:40:46 UT

 Maintainer of net/bird,
 
 Please note that PR ports/173523 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/173523
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->melifaro 
Responsible-Changed-By: melifaro 
Responsible-Changed-When: Tue Nov 27 15:35:50 UTC 2012 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173523 
State-Changed-From-To: feedback->closed 
State-Changed-By: melifaro 
State-Changed-When: Sat Jan 12 13:58:15 UTC 2013 
State-Changed-Why:  
Merged in r310237, thanks! 

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