Move directory of "netperf" package to "benchmarks". It was marked as

being in that category anyway.

6 files changed, 106 insertions, 1 deletions

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 90cbbf45f09..4a4e7ab4ccd 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/13 08:19:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.40 2006/11/21 10:59:25 tron Exp $
 #
 
 COMMENT=	Benchmarking tools
@@ -23,6 +23,7 @@ SUBDIR+=	linpack-bench
 SUBDIR+=	lmbench
 SUBDIR+=	nbench
 SUBDIR+=	netio
+SUBDIR+=	netperf
 SUBDIR+=	netpipe
 SUBDIR+=	nettest
 SUBDIR+=	nsieve
diff --git a/benchmarks/netperf/DESCR b/benchmarks/netperf/DESCR
new file mode 100644
index 00000000000..9313c3ec9d7
--- /dev/null
+++ b/benchmarks/netperf/DESCR
@@ -0,0 +1,23 @@
+Netperf is a serious networking performance evaluation tool being
+distributed under GPL by HP's Information Networks Division.
+Testing is done using a pair of programs: `netserver' (the server) and
+`netperf' (the measurement tool).
+
+Netperf allows control over a large number of test `variables'.
+Some of these are:
+
+        * specification of desired confidence levels for the tests
+          Netperf will warn the user if these levels were not achieved.
+        * filling send buffers with specified data (to beat compression
+	  schemes)
+        * specification of send/recieve buffer alignments and data offsets
+        * requesting cpu utilization and service demand calculations
+        * specification of sizes of data to send
+
+Netperf can be used for measuring stream performance as well as
+round-trip performance.
+
+This port of netperf has been configured to support:
+
+	TCP and UDP via BSD sockets
+	Unix domain sockets
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
new file mode 100644
index 00000000000..437bc55833b
--- /dev/null
+++ b/benchmarks/netperf/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2006/11/21 10:59:25 tron Exp $
+# KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp
+#
+
+DISTNAME=	netperf-2.3pl1
+PKGNAME=	netperf-2.3.1
+CATEGORIES=	benchmarks
+MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
+
+MAINTAINER=	itojun@kame.net
+HOMEPAGE=	http://www.netperf.org/
+COMMENT=	Rick Jones' network performance benchmarking package
+
+USE_TOOLS+=	gzip
+MAKE_FILE=	makefile
+
+CFLAGS.IRIX+=	-DIRIX
+
+post-install:
+	strip ${PREFIX}/netperf/netperf
+	strip ${PREFIX}/netperf/netserver
+	${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
+	${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netperf
+	${INSTALL_MAN} ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf
+	${GZIP_CMD} ${PREFIX}/share/doc/netperf/netperf.ps
+
+# The sources assume <malloc.h> exists.  Create a fake one for platforms
+# that don't have it.
+post-wrapper:
+	if ${TEST} ! -f /usr/include/malloc.h; then		\
+		${ECHO} "#include <stdlib.h>"			\
+			> ${BUILDLINK_DIR}/include/malloc.h;	\
+	fi
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/netperf/PLIST b/benchmarks/netperf/PLIST
new file mode 100644
index 00000000000..6dc9bf98e68
--- /dev/null
+++ b/benchmarks/netperf/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2006/11/21 10:59:25 tron Exp $
+netperf/netperf
+netperf/netserver
+netperf/tcp_range_script
+netperf/tcp_stream_script
+netperf/tcp_rr_script
+netperf/udp_stream_script
+netperf/udp_rr_script
+netperf/snapshot_script
+share/doc/netperf/netperf.ps.gz
+@dirrm netperf
+@dirrm share/doc/netperf
+man/man1/netperf.1
+man/man1/netserver.1
diff --git a/benchmarks/netperf/distinfo b/benchmarks/netperf/distinfo
new file mode 100644
index 00000000000..20fe1612957
--- /dev/null
+++ b/benchmarks/netperf/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2006/11/21 10:59:25 tron Exp $
+
+SHA1 (netperf-2.3pl1.tar.gz) = 288c34b6c4d937b06422a8cdab3dcae5ed58cc17
+RMD160 (netperf-2.3pl1.tar.gz) = 83f2afd612b7d4d4b486b82554f4e792c5e8509d
+Size (netperf-2.3pl1.tar.gz) = 836110 bytes
+SHA1 (patch-aa) = f9a835995de2130d4bd74d9c5c6a48bc4c0eb59b
diff --git a/benchmarks/netperf/patches/patch-aa b/benchmarks/netperf/patches/patch-aa
new file mode 100644
index 00000000000..03f8f7900fa
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1 2006/11/21 10:59:25 tron Exp $
+
+--- makefile.orig	2004-09-22 06:33:40.000000000 +0900
++++ makefile	2004-12-02 15:39:16.000000000 +0900
+@@ -15,8 +15,8 @@
+ # for the rest of the world, it is probably better to put the binaries
+ # in /usr/local/netperf or /opt/netperf
+ #
+-#NETPERF_HOME = /usr/local/netperf
+-NETPERF_HOME = /opt/netperf
++NETPERF_HOME = ${PREFIX}/netperf
++#NETPERF_HOME = /opt/netperf
+ 
+ # The compiler on your system might be somewhere else, and/or have
+ # a different name.
+@@ -113,7 +113,8 @@
+ #                   netserver via the netperf command line with -T
+ 
+ LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\""
+-CFLAGS = -O -D$(LOG_FILE) -DNEED_MAKEFILE_EDIT
++CFLAGS = -O -D$(LOG_FILE)
++CFLAGS+=-fno-strength-reduce -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX -DDO_IPV6
+ 
+ # Some platforms, and some options, require additional libraries.
+ # you can add to the "LIBS =" line to accomplish this. if you find