4 files changed, 43 insertions, 29 deletions

diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 3dc774800962..2b0f20d7d7a0 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -6,26 +6,43 @@
 #
 
 PORTNAME=	iperf
-PORTVERSION= 	1.7.0
+PORTVERSION=	2.0.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
-DISTNAME=	iperf-1.7.0-source
+MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/
 
-MAINTAINER=	smace@FreeBSD.org
+MAINTAINER=	marcus@corp.grupos.com.br
 COMMENT=	A tool to measure maximum TCP and UDP bandwidth
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 NO_CDROM=	"can't charge a fee for the software"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iperf ${PREFIX}/bin
+HAS_CONFIGURE=	yes
+
+PLIST_FILES=	bin/iperf
+
+OPTIONS=	IPV6	"Enable support to IPv6" 	on \
+		THREADS	"Enable threads support"	on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/iperf
-.for file in README doc/index.html doc/jperf.gif doc/dast.gif \
-		doc/lib.html doc/ui_license.html
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/iperf
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.for FILE in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/benchmarks/iperf/distinfo b/benchmarks/iperf/distinfo
index b5db47f3a1c1..37dee94b28bd 100644
--- a/benchmarks/iperf/distinfo
+++ b/benchmarks/iperf/distinfo
@@ -1,2 +1,2 @@
-MD5 (iperf-1.7.0-source.tar.gz) = 3e4aea85822bcf10ed14040f4b26bd26
-SIZE (iperf-1.7.0-source.tar.gz) = 182773
+MD5 (iperf-2.0.1.tar.gz) = a7a8f5797c68383722ff671ae18067a4
+SIZE (iperf-2.0.1.tar.gz) = 220446
diff --git a/benchmarks/iperf/pkg-descr b/benchmarks/iperf/pkg-descr
index e930a3b166a8..d6ccb610c709 100644
--- a/benchmarks/iperf/pkg-descr
+++ b/benchmarks/iperf/pkg-descr
@@ -1,9 +1,14 @@
-Iperf is a tool for measuring maximum TCP and UDP bandwidth,
-reminiscent of ttcp and nettest. It has been written to overcome
-the shortcomings of those aging tools. Iperf can also test UDP
-bandwidth, loss, and jitter.
+What is Iperf?
+
+While tools to measure network performance, such as ttcp,
+exist, most are very old and have confusing options. Iperf
+was developed as a modern alternative for measuring TCP 
+and UDP bandwidth performance.
+
+Iperf is a tool to measure maximum TCP bandwidth, allowing
+the tuning of various parameters and UDP characteristics.
+Iperf reports bandwidth, delay jitter, datagram loss. 
 
 WWW: http://dast.nlanr.net/Projects/Iperf/
 
-- Pete
-petef@databits.net
+Pete <petef@databits.net>
diff --git a/benchmarks/iperf/pkg-plist b/benchmarks/iperf/pkg-plist
deleted file mode 100644
index 307f4f448d7e..000000000000
--- a/benchmarks/iperf/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/iperf
-%%PORTDOCS%%share/doc/iperf/README
-%%PORTDOCS%%share/doc/iperf/index.html
-%%PORTDOCS%%share/doc/iperf/jperf.gif
-%%PORTDOCS%%share/doc/iperf/dast.gif
-%%PORTDOCS%%share/doc/iperf/lib.html
-%%PORTDOCS%%share/doc/iperf/ui_license.html
-%%PORTDOCS%%@dirrm share/doc/iperf