From owner-svn-ports-all@FreeBSD.ORG  Sun Oct  7 13:13:11 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A9371065670;
	Sun,  7 Oct 2012 13:13:11 +0000 (UTC)
	(envelope-from sunpoet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03F618FC0A;
	Sun,  7 Oct 2012 13:13:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97DDAp7004455;
	Sun, 7 Oct 2012 13:13:10 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97DDA35004453;
	Sun, 7 Oct 2012 13:13:10 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201210071313.q97DDA35004453@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 7 Oct 2012 13:13:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305472 - head/benchmarks/iperf
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 13:13:11 -0000

Author: sunpoet
Date: Sun Oct  7 13:13:10 2012
New Revision: 305472
URL: http://svn.freebsd.org/changeset/ports/305472

Log:
  - Add LICENSE
  - Convert to new options framework
  - Cleanup Makefile header

Modified:
  head/benchmarks/iperf/Makefile   (contents, props changed)

Modified: head/benchmarks/iperf/Makefile
==============================================================================
--- head/benchmarks/iperf/Makefile	Sun Oct  7 13:11:20 2012	(r305471)
+++ head/benchmarks/iperf/Makefile	Sun Oct  7 13:13:10 2012	(r305472)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	iperf
-# Date Created:				20 May 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
+# Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	iperf
 PORTVERSION=	2.0.5
@@ -13,8 +9,10 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A tool to measure maximum TCP and UDP bandwidth
 
-OPTIONS=	IPV6	"Enable support to IPv6" on \
-		THREADS	"Enable threads support" on
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	DOCS IPV6 THREADS
+OPTIONS_DEFAULT=IPV6 THREADS
 
 GNU_CONFIGURE=	yes
 
@@ -24,22 +22,24 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.else
+.if ${PORT_OPTIONS:MIPV6}
 CATEGORIES+=	ipv6
+CONFIGURE_ARGS+=--enable-ipv6
+.else
+CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=--disable-threads
-.else
+.if ${PORT_OPTIONS:MTHREADS}
+CONFIGURE_ARGS+=--enable-threads
 LDFLAGS+=	${PTHREAD_LIBS}
+.else
+CONFIGURE_ARGS+=--disable-threads
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/*.html ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>