From efeb1957e8a6e9aa57321bb034b161849b4f932d Mon Sep 17 00:00:00 2001
From: rui <rui@openbsd.org>
Date: Sat, 16 May 2009 21:48:20 +0000
Subject: [PATCH] - update iperf to 2.0.4.

ok jakob@
---
 net/iperf/Makefile                         | 10 +++++-----
 net/iperf/distinfo                         | 10 +++++-----
 net/iperf/patches/patch-src_PerfSocket_cpp |  8 ++++----
 net/iperf/patches/patch-src_Reporter_c     |  8 ++++----
 net/iperf/pkg/PLIST                        |  5 +++--
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 7710663d29e..2ac535310bf 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 22:36:54 merdely Exp $
+# $OpenBSD: Makefile,v 1.15 2009/05/16 21:48:20 rui Exp $
 
 COMMENT=	tool for measuring maximum TCP and UDP bandwidth
 
-VERSION=	2.0.2
+VERSION=	2.0.4
 DISTNAME=	iperf-${VERSION}
-PKGNAME=	iperf-${VERSION}p1
 CATEGORIES=    	net
 
 HOMEPAGE=	http://dast.nlanr.net/Projects/Iperf/
 
-MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>
+MAINTAINER=	Rui Reis <rui@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	no fee license
 PERMIT_PACKAGE_FTP=	Yes
@@ -18,13 +17,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	c m stdc++
 
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=iperf/}
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--disable-threads
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/src/iperf ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/iperf.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/iperf
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/iperf
 	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/doc/iperf
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index edf192a4cb8..a1b8bf9fa5b 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,5 +1,5 @@
-MD5 (iperf-2.0.2.tar.gz) = u2WKulilrwNW9bE0Lf6PUw==
-RMD160 (iperf-2.0.2.tar.gz) = jjYn9xjdya6hCfzrDIoDWc0FREc=
-SHA1 (iperf-2.0.2.tar.gz) = XL2kGZwsbJQX0NDQzYQN4wCfo2o=
-SHA256 (iperf-2.0.2.tar.gz) = 6brqjLUWtdgwE/dG+foQSrtF/PFdREoDrdBnaZFuQdY=
-SIZE (iperf-2.0.2.tar.gz) = 233595
+MD5 (iperf-2.0.4.tar.gz) = jFvBTMLqVfGPIq/jwj49yw==
+RMD160 (iperf-2.0.4.tar.gz) = sCHMXyoFRl/wTUuRTJRpJInkmp4=
+SHA1 (iperf-2.0.4.tar.gz) = eLa3h4nsz0K13reDvYqSRp0Tg+E=
+SHA256 (iperf-2.0.4.tar.gz) = O1LxwXjWqZwnEUkp1UacAJGX0VN5yWezKbr7lW85eUQ=
+SIZE (iperf-2.0.4.tar.gz) = 248493
diff --git a/net/iperf/patches/patch-src_PerfSocket_cpp b/net/iperf/patches/patch-src_PerfSocket_cpp
index 235d91e9180..9bf1a3a042b 100644
--- a/net/iperf/patches/patch-src_PerfSocket_cpp
+++ b/net/iperf/patches/patch-src_PerfSocket_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_PerfSocket_cpp,v 1.1 2006/03/23 19:35:08 jakob Exp $
---- src/PerfSocket.cpp.orig	Mon May  2 22:09:27 2005
-+++ src/PerfSocket.cpp	Thu Mar 23 20:29:38 2006
-@@ -92,7 +92,7 @@ void SetSocketOptions( thread_Settings *
+$OpenBSD: patch-src_PerfSocket_cpp,v 1.2 2009/05/16 21:48:20 rui Exp $
+--- src/PerfSocket.cpp.orig	Tue Apr  8 03:37:54 2008
++++ src/PerfSocket.cpp	Sat May 16 12:29:06 2009
+@@ -107,7 +107,7 @@ void SetSocketOptions( thread_Settings *inSettings ) {
  
      // check if we're sending multicast, and set TTL
      if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) {
diff --git a/net/iperf/patches/patch-src_Reporter_c b/net/iperf/patches/patch-src_Reporter_c
index 07ddf90b6d8..2118663dd13 100644
--- a/net/iperf/patches/patch-src_Reporter_c
+++ b/net/iperf/patches/patch-src_Reporter_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Reporter_c,v 1.1 2006/08/29 19:50:22 aanriot Exp $
---- src/Reporter.c.orig	Mon Aug 28 02:12:10 2006
-+++ src/Reporter.c	Mon Aug 28 02:11:37 2006
-@@ -307,6 +307,9 @@ ReportHeader* InitReport( thread_Setting
+$OpenBSD: patch-src_Reporter_c,v 1.2 2009/05/16 21:48:20 rui Exp $
+--- src/Reporter.c.orig	Tue Apr  8 03:37:54 2008
++++ src/Reporter.c	Sat May 16 12:29:06 2009
+@@ -309,6 +309,9 @@ ReportHeader* InitReport( thread_Settings *agent ) {
  #else
          // set start time
          gettimeofday( &(reporthdr->report.startTime), NULL );
diff --git a/net/iperf/pkg/PLIST b/net/iperf/pkg/PLIST
index d6054298973..16df30adad1 100644
--- a/net/iperf/pkg/PLIST
+++ b/net/iperf/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/05/08 21:16:15 jakob Exp $
-bin/iperf
+@comment $OpenBSD: PLIST,v 1.5 2009/05/16 21:48:20 rui Exp $
+@bin bin/iperf
+@man man/man1/iperf.1
 share/doc/iperf/
 share/doc/iperf/dast.gif
 share/doc/iperf/index.html