Update iperf to version 1.6.3

4 files changed, 4 insertions, 53 deletions

diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index d7d1dc5c7468..ed35db236b78 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	iperf
-PORTVERSION= 	1.2
+PORTVERSION= 	1.6.3
+DISTNAME=	iperf-1.6.3-source
 CATEGORIES=	net
 MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	petef@FreeBSD.org
 
diff --git a/benchmarks/iperf/distinfo b/benchmarks/iperf/distinfo
index c6ef0c7d5e94..20c96bce0aaa 100644
--- a/benchmarks/iperf/distinfo
+++ b/benchmarks/iperf/distinfo
@@ -1 +1 @@
-MD5 (iperf-1.2.tar.gz) = b727074c779f8f3087dec5e455840201
+MD5 (iperf-1.6.3-source.tar.gz) = 958894904f7abddef9239d2fa12b40da
diff --git a/benchmarks/iperf/files/patch-cfg::Makefile b/benchmarks/iperf/files/patch-cfg::Makefile
deleted file mode 100644
index 01ab09ce0e2c..000000000000
--- a/benchmarks/iperf/files/patch-cfg::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- cfg/Makefile.orig	Sat May 19 23:54:00 2001
-+++ cfg/Makefile	Sat May 19 23:54:12 2001
-@@ -31,7 +31,7 @@
- #
- 
- all: configure
--	./configure
-+	./configure --cc=${CC} --cxx=${CXX}
- 
- clean:
- 	-rm -f $(CLEAN_FILES)
diff --git a/benchmarks/iperf/files/patch-cfg::configure b/benchmarks/iperf/files/patch-cfg::configure
deleted file mode 100644
index 92c8a2e87637..000000000000
--- a/benchmarks/iperf/files/patch-cfg::configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- cfg/configure.orig	Sat May 19 23:45:26 2001
-+++ cfg/configure	Sat May 19 23:54:28 2001
-@@ -90,6 +90,12 @@
-   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-     cache_file="$ac_optarg" ;;
- 
-+  --cc=*)
-+    ac_cv_prog_CC="$ac_optarg" ;;
-+
-+  --cxx=*)
-+    ac_cv_prog_CXX="$ac_optarg" ;;
-+
-   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-     ac_prev=datadir ;;
-   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-@@ -952,7 +958,7 @@
- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
- echo "configure:954: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
--cross_compiling=$ac_cv_prog_cxx_cross
-+cross_compiling="no"
- 
- echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
- echo "configure:959: checking whether we are using GNU C++" >&5
-@@ -1065,14 +1071,7 @@
- echo
- 
- 
--if test -z "$ac_cv_use_pthread"; then
--  ac_cv_use_pthread="yes"
--fi
--echo "Make iperf multi-threaded (using pthreads)? [$ac_cv_use_pthread] "
--read tmp
--if test -n "$tmp"; then  
--  ac_cv_use_pthread="$tmp"
--fi
-+ac_cv_use_pthread="no"
- 
- 
- if test "$ac_cv_use_pthread" = yes ; then