Changes 2.4.5:

* Fixes for Linux procstat-based CPU utilization on newer kernels
  from Andrew Gallatin.
* Fix for a TCP_RR hang from Michael Shuldman
* Compilation cleanups for MingW cnd MSDOS (djgpp) ourtesy of Gisle Vanem.
* Changes to enable compilation and building of netperf for
  VMware. Kudos to the person who did the first port, I will be happy
  to name that person when told it is OK :)
* Fixes from Adam Bidema for launching netserver children when the
  path to netserver.exe is very long.
* For the first time, netperf2 has a dependency, albeit optional, on
  another non-base-os bit of code - libsmbios under Linux.
* Fixes for BSD CPU utilization to deal with different BSD variants
  using different types.
* The "omni" suite has been added on an experimental basis.
* Coming along for the ride are some new platform specific files to
  determine the probable egress interface for each end of a test, as
  well as driver information for that interface.
* The UDP_RR test now understands the global -f option to change
  output units.  It also understands the -B option to tag
  results. Courtesy of Alexander Duyck.
* A fix has been added for hanging UDP_RR tests under Windows.
* Fixes for Solaris sendfilev usage.
* A TCP_MSS test has been added which will report the MSS for a data
  connection setup as if the test were a TCP_STREAM test.
* The width of the confidence interval can be specified in fractions
  of a percent for the confidence of a clean, close, comfortable
  calculation. :)
* Honor the global -B option in a TCP_SENDFILE test.
* Correct the sense of Send/Recv in the banner of a TCP_MAERTS test.

6 files changed, 41 insertions, 101 deletions

diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index dd2ddd2fc4a..043c2defb51 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/07/08 14:28:28 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.8 2010/05/06 11:14:01 adam Exp $
 
-DISTNAME=	netperf-2.3pl1
-PKGNAME=	netperf-2.3.1
-PKGREVISION=	1
+DISTNAME=	netperf-2.4.5
 CATEGORIES=	benchmarks
-MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/archive/ \
-		ftp://ftp.netperf.org/netperf/archive/ 
+MASTER_SITES=	ftp://ftp.netperf.org/netperf/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.netperf.org/
@@ -14,18 +11,12 @@ COMMENT=	Rick Jones' network performance benchmarking package
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	gzip
-MAKE_FILE=	makefile
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 
-CFLAGS.IRIX+=	-DIRIX
+CFLAGS.IRIX+=		-DIRIX
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/netperf
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/netperf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/netperf.1
-	${INSTALL_MAN} ${WRKSRC}/netserver.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/netserver.1
-	${INSTALL_MAN} ${WRKSRC}/netperf.ps ${DESTDIR}${PREFIX}/share/doc/netperf
-	${GZIP_CMD} ${DESTDIR}${PREFIX}/share/doc/netperf/netperf.ps
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 # The sources assume <malloc.h> exists.  Create a fake one for platforms
 # that don't have it.
diff --git a/benchmarks/netperf/PLIST b/benchmarks/netperf/PLIST
index f33ff0b1b21..f518fa0d5b0 100644
--- a/benchmarks/netperf/PLIST
+++ b/benchmarks/netperf/PLIST
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:33:12 joerg 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
+@comment $NetBSD: PLIST,v 1.3 2010/05/06 11:14:01 adam Exp $
+bin/netperf
+bin/netserver
+info/netperf.info
 man/man1/netperf.1
 man/man1/netserver.1
diff --git a/benchmarks/netperf/distinfo b/benchmarks/netperf/distinfo
index ce8413c5d6f..9c4120c9651 100644
--- a/benchmarks/netperf/distinfo
+++ b/benchmarks/netperf/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/07/08 14:28:28 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/05/06 11:14:01 adam 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) = 62d0e7822d3cf9ef3159954f3d642096aa211350
-SHA1 (patch-ab) = a45be8f4f8caf182c053779012e560fa31bcb98b
-SHA1 (patch-ac) = 15714316008fa1362bb8f392f72a6f0125601ce4
-SHA1 (patch-ad) = a829f207d8af01497887b4386d184a4b0d14774f
-SHA1 (patch-ae) = 4848b2699cdbf2b9059f6e0290afc929d94f514c
-SHA1 (patch-af) = 720808dcbdbc6fa1ea55aae43ea1e24c333d9891
-SHA1 (patch-ag) = 4139125768a4b037692ab3cefcb2562ccc5c4b0f
-SHA1 (patch-ah) = ae945388b12d9b964f2728d07ce17d543c440bdd
-SHA1 (patch-ai) = ca2d19efa72f2ac40f66eb5c61272b90b080aec4
-SHA1 (patch-ak) = 35da529b4509791718e2912bc8d59a32ea992933
+SHA1 (netperf-2.4.5.tar.bz2) = ccfe3d11ce520c75dc394277b1bea49f353e032d
+RMD160 (netperf-2.4.5.tar.bz2) = 5791ebfcc798b968dd85e591bb96ade925208294
+Size (netperf-2.4.5.tar.bz2) = 960609 bytes
+SHA1 (patch-aa) = a910b966c414f3a7cd5b0d898726966e47969522
+SHA1 (patch-ah) = 6ca99c4ce567ff2a36f49426e604c7bdfd31f02d
+SHA1 (patch-ak) = 98228d85034878ff3f0c25bebcc80a6006a2f9f4
diff --git a/benchmarks/netperf/patches/patch-aa b/benchmarks/netperf/patches/patch-aa
index b4f649d0b4a..5e5126f1db4 100644
--- a/benchmarks/netperf/patches/patch-aa
+++ b/benchmarks/netperf/patches/patch-aa
@@ -1,50 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2009/07/08 14:28:29 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/05/06 11:14:01 adam Exp $
 
---- makefile.orig	2004-09-21 23:33:40.000000000 +0200
-+++ makefile
-@@ -15,8 +15,8 @@ VERSION = 2.3pl1
- # 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 @@ CC = cc
- #                   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
-@@ -216,19 +217,12 @@ nettest_dns.o:  nettest_dns.c nettest_dn
- netserver.o:	netserver.c nettest_bsd.h netlib.h makefile
- 
- install:	netperf netserver
--		mkdir -p $(NETPERF_HOME)
-+		mkdir -p ${DESTDIR}$(NETPERF_HOME)
- 		chmod -w *.[ch]
--		chmod +x $(NETPERF_SCRIPTS)
--		@if [ ! -d $(NETPERF_HOME) ]; then \
--			mkdir $(NETPERF_HOME) && chmod a+rx $(NETPERF_HOME); \
--		fi
--		cp netperf $(NETPERF_HOME)
--		cp netserver $(NETPERF_HOME)
--		cp $(NETPERF_SCRIPTS) $(NETPERF_HOME)
--		chmod a+rx $(NETPERF_HOME)/netperf $(NETPERF_HOME)/netserver
--		@for i in $(NETPERF_SCRIPTS); do \
--			chmod a+rx $(NETPERF_HOME)/$$i; \
--		done
-+		${BSD_INSTALL_PROGRAM} netperf ${DESTDIR}$(NETPERF_HOME)
-+		${BSD_INSTALL_PROGRAM} netserver ${DESTDIR}$(NETPERF_HOME)
-+		${BSD_INSTALL_SCRIPT} $(NETPERF_SCRIPTS) ${DESTDIR}$(NETPERF_HOME)
-+
- clean:
- 	rm -f *.o netperf netserver core
- 
+--- src/net_uuid.c.orig	2010-05-06 12:52:11.000000000 +0000
++++ src/net_uuid.c
+@@ -38,7 +38,6 @@
+ #else
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/sysinfo.h>
+ #endif
+ 
+ /* system dependent call to get the current system time. Returned as
diff --git a/benchmarks/netperf/patches/patch-ah b/benchmarks/netperf/patches/patch-ah
index 6f030e4ae66..fa0dc929f01 100644
--- a/benchmarks/netperf/patches/patch-ah
+++ b/benchmarks/netperf/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.1 2008/05/12 15:49:30 tonnerre Exp $
+$NetBSD: patch-ah,v 1.2 2010/05/06 11:14:01 adam Exp $
 
---- netlib.h.orig	2004-09-21 23:33:40.000000000 +0200
-+++ netlib.h
-@@ -343,6 +343,7 @@ extern  int     lib_num_loc_cpus;
+--- src/netlib.h.orig	2008-10-30 20:48:46.000000000 +0000
++++ src/netlib.h
+@@ -476,6 +476,7 @@ extern  int     lib_num_rem_cpus;
  extern  SOCKET  server_sock;
  extern  int     times_up;
  extern  FILE    *where;
-+extern	int	fd;
++extern	 int     fd;
  extern  int     loops_per_msec;
  extern  float   lib_local_per_cpu_util[];
    
diff --git a/benchmarks/netperf/patches/patch-ak b/benchmarks/netperf/patches/patch-ak
index 865f2ac0022..eb471319961 100644
--- a/benchmarks/netperf/patches/patch-ak
+++ b/benchmarks/netperf/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2008/05/12 15:49:30 tonnerre Exp $
+$NetBSD: patch-ak,v 1.2 2010/05/06 11:14:01 adam Exp $
 
---- netlib.c.orig	2004-09-21 23:33:40.000000000 +0200
-+++ netlib.c
-@@ -422,6 +422,7 @@ union   netperf_request_struct  netperf_
+--- src/netlib.c.orig	2009-05-27 22:27:34.000000000 +0000
++++ src/netlib.c
+@@ -262,6 +262,7 @@ union   netperf_request_struct  netperf_
  union   netperf_response_struct netperf_response;
  
  FILE    *where;
-+int	fd = -1;
++int     fd = -1;
  
- char    libfmt = 'm';
+ char    libfmt = '?';