9 files changed, 4 insertions, 82 deletions

diff --git a/LEGAL b/LEGAL
index 2807e595ac54..65105e6d3186 100644
--- a/LEGAL
+++ b/LEGAL
@@ -294,7 +294,7 @@ idea.V*.tar.Z		security/idea		A patented algorithm that
 idled-*.tar.gz		sysutils/idled		Non-profit use and distribution
 						only
 invitationtoruby.tgz	devel/invitation_to_ruby No commercial use
-iperf-*-source.tar.gz	net/iperf		Cannot charge a fee for the
+iperf-*-source.tar.gz	benchmarks/iperf	Cannot charge a fee for the
 						software
 IPv6socket_scrub.tar	net/ipv6socket_scrub	Not redistributable,
 						license agreement required
diff --git a/MOVED b/MOVED
index eecbaee37270..b0084e29b287 100644
--- a/MOVED
+++ b/MOVED
@@ -1492,3 +1492,4 @@ net/amule|net/amule1|2005-05-16|port renamed
 net/amule-devel|net/amule2|2005-05-16|obsolete
 databases/firebird|databases/firebird-server|2005-05-17|split into -client and -server
 audio/mpeg4ip-faad||2005-05-19|Port no longer needed with new mpeg4ip-1.3
+net/iperf|benchmarks/iperf|2005-02-21|better category
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 7b686398ae17..58202d499db3 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -16,6 +16,7 @@
     SUBDIR += httperf
     SUBDIR += iozone
     SUBDIR += iozone21
+    SUBDIR += iperf
     SUBDIR += lmbench
     SUBDIR += nbench
     SUBDIR += netio
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index d88e5442cb75..3b7dc4d66145 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iperf
 PORTVERSION=	2.0.2
-CATEGORIES=	net ipv6
+CATEGORIES=	benchmarks ipv6
 MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/Makefile b/net/Makefile
index 606527d6992d..b17ecda8bdff 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -241,7 +241,6 @@
     SUBDIR += imapproxy
     SUBDIR += imcom
     SUBDIR += ip6_int
-    SUBDIR += iperf
     SUBDIR += ipex
     SUBDIR += ipfw-graph
     SUBDIR += ipgrab
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
deleted file mode 100644
index d88e5442cb75..000000000000
--- a/net/iperf/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for:	iperf
-# Date Created:				20 May 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	iperf
-PORTVERSION=	2.0.2
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	marcus@corp.grupos.com.br
-COMMENT=	A tool to measure maximum TCP and UDP bandwidth
-
-NO_CDROM=	"can't charge a fee for the software"
-
-HAS_CONFIGURE=	yes
-
-PLIST_FILES=	bin/iperf
-
-OPTIONS=	IPV6	"Enable support to IPv6" 	on \
-		THREADS	"Enable threads support"	on
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=	--disable-threads
-.endif
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.for FILE in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
deleted file mode 100644
index 5daf14d8d02d..000000000000
--- a/net/iperf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (iperf-2.0.2.tar.gz) = bb658aba58a5af0356f5b1342dfe8f53
-SIZE (iperf-2.0.2.tar.gz) = 233595
diff --git a/net/iperf/files/patch-include-headers.h b/net/iperf/files/patch-include-headers.h
deleted file mode 100644
index ebb5a5f68ae9..000000000000
--- a/net/iperf/files/patch-include-headers.h
+++ /dev/null
@@ -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"
diff --git a/net/iperf/pkg-descr b/net/iperf/pkg-descr
deleted file mode 100644
index d6ccb610c709..000000000000
--- a/net/iperf/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-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>