Index: head/benchmarks/iperf/Makefile
===================================================================
--- head/benchmarks/iperf/Makefile	(revision 214619)
+++ head/benchmarks/iperf/Makefile	(revision 214620)
@@ -1,48 +1,47 @@
 # New ports collection makefile for:	iperf
 # Date Created:				20 May 2001
 # Whom:					Pete Fritchman <petef@databits.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	iperf
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	benchmarks ipv6
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A tool to measure maximum TCP and UDP bandwidth
 
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/iperf
+MAN1=		iperf.1
 PORTDOCS=	*
 
 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
 .else
 CONFIGURE_ENV+=		CFLAGS=${PTHREAD_LIBS}
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .for f in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/benchmarks/iperf/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.20
\ No newline at end of property
+1.21
\ No newline at end of property
Index: head/benchmarks/iperf/distinfo
===================================================================
--- head/benchmarks/iperf/distinfo	(revision 214619)
+++ head/benchmarks/iperf/distinfo	(revision 214620)
@@ -1,3 +1,3 @@
-MD5 (iperf-2.0.2.tar.gz) = bb658aba58a5af0356f5b1342dfe8f53
-SHA256 (iperf-2.0.2.tar.gz) = e9baea8cb516b5d83013f746f9fa104abb45fcf15d444a03add06769916e41d6
-SIZE (iperf-2.0.2.tar.gz) = 233595
+MD5 (iperf-2.0.4.tar.gz) = 8c5bc14cc2ea55f18f22afe3c23e3dcb
+SHA256 (iperf-2.0.4.tar.gz) = 3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944
+SIZE (iperf-2.0.4.tar.gz) = 248493

Property changes on: head/benchmarks/iperf/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/benchmarks/iperf/files/patch-include-headers.h
===================================================================
--- head/benchmarks/iperf/files/patch-include-headers.h	(revision 214619)
+++ head/benchmarks/iperf/files/patch-include-headers.h	(nonexistent)
@@ -1,11 +0,0 @@
---- include/headers.h.orig	Mon May  9 21:40:53 2005
-+++ include/headers.h	Mon May  9 21:41:06 2005
-@@ -180,7 +180,7 @@
- // from the gnu archive
- 
- #include <iperf-int.h>
--typedef uintmax_t max_size_t;
-+typedef uint64_t max_size_t;
- 
- /* in case the OS doesn't have these, we provide our own implementations */
- #include "gettimeofday.h"

Property changes on: head/benchmarks/iperf/files/patch-include-headers.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/benchmarks/iperf/files/patch-compat__Thread.c
===================================================================
--- head/benchmarks/iperf/files/patch-compat__Thread.c	(revision 214619)
+++ head/benchmarks/iperf/files/patch-compat__Thread.c	(nonexistent)
@@ -1,11 +0,0 @@
---- ./compat/Thread.c.orig	Mon Apr 24 11:02:47 2006
-+++ ./compat/Thread.c	Mon Apr 24 11:03:46 2006
-@@ -202,7 +202,7 @@
- #if   defined( HAVE_POSIX_THREAD )
-             // Cray J90 doesn't have pthread_cancel; Iperf works okay without
- #ifdef HAVE_PTHREAD_CANCEL
--            pthread_cancel( oldTID );
-+            pthread_cancel( thread->mTID );
- #endif
- #else // Win32
-             // this is a somewhat dangerous function; it's not

Property changes on: head/benchmarks/iperf/files/patch-compat__Thread.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/benchmarks/iperf/pkg-descr
===================================================================
--- head/benchmarks/iperf/pkg-descr	(revision 214619)
+++ head/benchmarks/iperf/pkg-descr	(revision 214620)
@@ -1,14 +1,12 @@
 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>
+WWW: http://iperf.sourceforge.net/

Property changes on: head/benchmarks/iperf/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property