From nobody@FreeBSD.org  Sun Nov 11 03:16:13 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 1E971846
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 03:16:13 +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 DFD3E8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 03:16:12 +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 qAB3GCik089055
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 03:16:12 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qAB3GC5k089054;
	Sun, 11 Nov 2012 03:16:12 GMT
	(envelope-from nobody)
Message-Id: <201211110316.qAB3GC5k089054@red.freebsd.org>
Date: Sun, 11 Nov 2012 03:16:12 GMT
From: Edward <edward@rdtan.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] benchmarks/netperf: OPTIONSNG & trim Makefile header
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173547
>Category:       ports
>Synopsis:       [PATCH] benchmarks/netperf: OPTIONSNG & trim Makefile header
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sumikawa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 11 03:20:00 UTC 2012
>Closed-Date:    Mon Nov 12 11:40:13 JST 2012
>Last-Modified:  Mon Nov 12 11:40:13 JST 2012
>Originator:     Edward
>Release:        FreeBSD 8.3-RELEASE
>Organization:
>Environment:
FreeBSD optionsng 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr  9 21:23:18 UTC 2012     root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- Update to use OPTIONSNG
- Trim Makefile header
- Will cc Maintainer (sumikawa@FreeBSD.org)

# portlint -a   
looks fine.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.original   2012-10-31 00:24:48.000000000 +0800
+++ Makefile    2012-11-11 01:36:09.000000000 +0800
@@ -1,9 +1,5 @@
-# New ports collection makefile for: netperf
-# Date created:                19 July 1996
-# Whom:                        koshy
-#
-# $FreeBSD: ports/benchmarks/netperf/Makefile,v 1.33 2012/08/24 02:29:12 sumikawa Exp $
-#
+# Created by:                  koshy
+# $FreeBSD$
 
 PORTNAME=      netperf
 PORTVERSION=   2.6.0
@@ -14,11 +10,14 @@
 MAINTAINER=    sumikawa@FreeBSD.org
 COMMENT=       Network performance benchmarking package
 
-OPTIONS=       SOCKETS         "Enable Unix Domain socket support" On \
-               SCTP            "Enable SCTP support" On \
-               EXS             "Enable ICSC async socket support" On \
-               HISTOGRAM       "Enable optional histogram output" On \
-               OMNI            "Enable OMNI tests" Off \
+OPTIONS_DEFINE=        OMNI SCTP SOCKETS HISTOGRAM EXS
+OPTIONS_DEFAULT=       SCTP SOCKETS HISTOGRAM EXS
+
+OMNI_DESC=     Enable OMNI tests
+SCTP_DESC=     Enable SCTP support
+SOCKETS_DESC=  Enable Unix Domain socket support
+HISTOGRAM_DESC=        Enable optional histogram output
+EXS_DESC=      Enable ICSC async socket support
 
 .include <bsd.port.options.mk>
 
@@ -27,31 +26,31 @@
 CONFIGURE_ARGS=        --program-prefix=""  --program-suffix="" --enable-dirty \
                --enable-demo --enable-burst --enable-intervals
 
-.if !defined(WITHOUT_SOCKETS)
+.if ${PORT_OPTIONS:MSOCKETS}
 CONFIGURE_ARGS+=       --enable-unixdomain
 .else
 CONFIGURE_ARGS+=       --disable-unixdomain
 .endif
 
-.if !defined(WITHOUT_SCTP)
+.if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=       --enable-sctp
 .else
 CONFIGURE_ARGS+=       --disable-sctp
 .endif
 
-.if !defined(WITHOUT_EXS)
+.if ${PORT_OPTIONS:MEXS}
 CONFIGURE_ARGS+=       --enable-exs
 .else
 CONFIGURE_ARGS+=       --disable-exs
 .endif
 
-.if !defined(WITHOUT_HISTOGRAM)
+.if ${PORT_OPTIONS:MHISTOGRAM}
 CONFIGURE_ARGS+=       --enable-histogram
 .else
 CONFIGURE_ARGS+=       --disable-histogram
 .endif
 
-.if !defined(WITHOUT_OMNI)
+.if ${PORT_OPTIONS:MOMNI}
 CONFIGURE_ARGS+=       --enable-omni
 .else
 CONFIGURE_ARGS+=       --disable-omni


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sumikawa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Nov 11 03:20:07 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173547 
State-Changed-From-To: open->closed 
State-Changed-By: sumikawa 
State-Changed-When: Mon Nov 12 11:40:02 JST 2012 
State-Changed-Why:  
Commited, thanks. 

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