Changes 2.0.5:

* bumped default TCP send/recv buffer to 128K (this is not the kernel buffer
  that controls the window, but rather the Iperf internal buffer)
* update autoconf goo using Autoconf 2.65, this should help portability a bit
* honor -i flag when for a server (-s) when using TCP
* Exit rather than warn on connection failure

6 files changed, 22 insertions, 53 deletions

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index f39102bec9c..d0b0f844946 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2010/02/11 21:34:34 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2011/01/31 08:42:09 adam Exp $
 
-DISTNAME=	iperf-2.0.2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
+DISTNAME=	iperf-2.0.5
+CATEGORIES=	net benchmarks
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=iperf/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://dast.nlanr.net/Projects/Iperf/
+HOMEPAGE=	http://iperf.sourceforge.net/
 COMMENT=	TCP and UDP bandwidth performance measurement tool
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,18 +19,14 @@ GCC_REQD+=	3.0
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-#CONFIGURE_DIRS=		${WRKSRC}/cfg
-#INSTALL_DIRS=		${WRKSRC}/src
-#MAKE_ENV+=		INSTALL_DIR=${PREFIX}/bin
 
-INSTALLATION_DIRS+=	share/doc/html/${PKGBASE}
+INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 
-PTHREAD_OPTS+=	native optional
+PTHREAD_OPTS+=		native optional
 .include "../../mk/pthread.buildlink3.mk"
 
 post-install:
-	for f in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif; do		\
-		${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/doc/html/${PKGBASE}; \
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/*.html \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/iperf/PLIST b/net/iperf/PLIST
index f83894fdecc..c3ec3c64e0b 100644
--- a/net/iperf/PLIST
+++ b/net/iperf/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/01/31 08:42:09 adam Exp $
 bin/iperf
-share/doc/html/iperf/dast.gif
-share/doc/html/iperf/index.html
-share/doc/html/iperf/ui_license.html
+man/man1/iperf.1
+share/doc/iperf/dast.gif
+share/doc/iperf/index.html
+share/doc/iperf/ui_license.html
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index b3fc9ad266d..eb884b0c4c1 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/02/08 18:15:26 minskim Exp $
+$NetBSD: distinfo,v 1.8 2011/01/31 08:42:09 adam Exp $
 
-SHA1 (iperf-2.0.2.tar.gz) = 5cbda4199c2c6c9417d0d0d0cd840de3009fa36a
-RMD160 (iperf-2.0.2.tar.gz) = 8e3627f718ddc9aea109fceb0c8a0359cd054447
-Size (iperf-2.0.2.tar.gz) = 233595 bytes
-SHA1 (patch-aa) = 0758967ce641c823f7f5cf1e233736e411019684
+SHA1 (iperf-2.0.5.tar.gz) = 7302792dcb1bd7aeba032fef6d3dcc310e4d113f
+RMD160 (iperf-2.0.5.tar.gz) = 975d971974437136ae72bb17c0f776ea92eaf878
+Size (iperf-2.0.5.tar.gz) = 248583 bytes
 SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc
-SHA1 (patch-ac) = e46304be305b099b79acdfd31a57b537a360d669
-SHA1 (patch-ad) = 6591365041c21b38a9bdc68cbc97f899d1a9ad42
+SHA1 (patch-ac) = 83479534caf61cf034453e1953e9ed5618f3f74c
diff --git a/net/iperf/patches/patch-aa b/net/iperf/patches/patch-aa
deleted file mode 100644
index e2b160256a2..00000000000
--- a/net/iperf/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/07 20:29:52 markd Exp $
-
---- configure.orig	2005-05-03 08:22:07.000000000 +1200
-+++ configure
-@@ -11915,6 +11915,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
-+#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP)
-+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-+#endif
- #ifndef IPV6_ADD_MEMBERSHIP
-   char *p = (char *) IPV6_ADD_MEMBERSHIP;
- #endif
diff --git a/net/iperf/patches/patch-ac b/net/iperf/patches/patch-ac
index f092be136fa..062d6f25629 100644
--- a/net/iperf/patches/patch-ac
+++ b/net/iperf/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/10/07 20:29:52 markd Exp $
+$NetBSD: patch-ac,v 1.2 2011/01/31 08:42:10 adam Exp $
 
 --- src/PerfSocket.cpp.orig	2005-10-07 13:34:29.000000000 +1300
 +++ src/PerfSocket.cpp
-@@ -95,8 +95,9 @@ void SetSocketOptions( thread_Settings *
+@@ -110,8 +110,9 @@ void SetSocketOptions( thread_Settings *
  	int val = inSettings->mTTL;
  #ifdef HAVE_MULTICAST
  	if ( !SockAddr_isIPv6( &inSettings->local ) ) {
diff --git a/net/iperf/patches/patch-ad b/net/iperf/patches/patch-ad
deleted file mode 100644
index 3d5a505855b..00000000000
--- a/net/iperf/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/02/08 18:15:26 minskim Exp $
-
---- compat/Thread.c.orig	2005-05-03 08:15:51.000000000 -0700
-+++ compat/Thread.c
-@@ -202,7 +202,7 @@ void thread_stop( struct thread_Settings
- #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