Changes 2.0.1:

* Running Iperf in bidirectional mode
* Removed STDLIB requirement to Iperf
* Client reporting of server side statistics in UDP tests

4 files changed, 12 insertions, 40 deletions

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 5718dcc74dd..a05553fff37 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/04/12 13:36:37 seb Exp $
-#
+# $NetBSD: Makefile,v 1.10 2004/12/03 13:30:20 adam Exp $
 
-DISTNAME=	iperf-1.7.0-source
-PKGNAME=	${DISTNAME:C/-source//}
+DISTNAME=	iperf-2.0.1
 CATEGORIES=	net
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
+MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/
 
 MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://dast.nlanr.net/Projects/Iperf/
@@ -16,13 +14,12 @@ COMMENT=	TCP and UDP bandwidth performance measurement tool
 GCC_REQD+=	3.0
 .endif
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK3=		YES
-CONFIGURE_DIRS=		${WRKSRC}/cfg
-INSTALL_DIRS=		${WRKSRC}/src
-GNU_CONFIGURE=		YES
-MAKE_ENV+=		INSTALL_DIR=${PREFIX}/bin
+USE_BUILDLINK3=		yes
 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}
 
diff --git a/net/iperf/PLIST b/net/iperf/PLIST
index 79b00491037..7ba6551ea03 100644
--- a/net/iperf/PLIST
+++ b/net/iperf/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/27 13:13:55 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/03 13:30:20 adam Exp $
 bin/iperf
 share/doc/html/iperf/dast.gif
 share/doc/html/iperf/index.html
-share/doc/html/iperf/jperf.gif
-share/doc/html/iperf/lib.html
 share/doc/html/iperf/ui_license.html
 @dirrm share/doc/html/iperf
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index e40fffdb053..78996cac3c8 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/10/06 09:19:00 adam Exp $
+$NetBSD: distinfo,v 1.4 2004/12/03 13:30:20 adam Exp $
 
-SHA1 (iperf-1.7.0-source.tar.gz) = 6f8058616f2105f8342e3a39366a3362b0f85589
-Size (iperf-1.7.0-source.tar.gz) = 182773 bytes
-SHA1 (patch-aa) = 14848d63dab5e9d413f82046b87ad686251a9b94
+SHA1 (iperf-2.0.1.tar.gz) = 880cd6bcdfe43832288a1ce63d0d7453e1860d0c
+Size (iperf-2.0.1.tar.gz) = 220446 bytes
diff --git a/net/iperf/patches/patch-aa b/net/iperf/patches/patch-aa
deleted file mode 100644
index c08d431b335..00000000000
--- a/net/iperf/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/10/06 09:19:00 adam Exp $
-
---- cfg/configure.orig	2003-03-31 20:25:20.000000000 +0000
-+++ cfg/configure
-@@ -1687,7 +1687,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- if test "$ac_cv_c_compiler_gnu" = yes ; then
--  CFLAGS="$OLD_CFLAGS -Wall -O2"
-+  CFLAGS="$OLD_CFLAGS -Wall"
- else
-   if test `uname -s` = "HP-UX"; then
-     CFLAGS="$OLD_CFLAGS -Ae +O2"
-@@ -1999,7 +1999,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- if test "$ac_cv_c_compiler_gnu" = yes ; then
--  CXXFLAGS="$OLD_CXXFLAGS -Wall -O2"
-+  CXXFLAGS="$OLD_CXXFLAGS -Wall"
- else
-   if test `uname -s` = "HP-UX"; then
-     CXXFLAGS="$OLD_CXXFLAGS -Ae +O2"