Date: Sat, 10 Nov 2012 07:08:21 GMT From: Jason Helfman <jgh@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173523: [patch] net/bird: adopt optionsNG, trim header Message-ID: <201211100708.qAA78LCD097343@red.freebsd.org> Resent-Message-ID: <201211100940.qAA9e3Fl001056@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173523
>Category: ports
>Synopsis: [patch] net/bird: adopt optionsNG, trim header
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 10 09:40:03 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211100708.qAA78LCD097343>