diff options
| -rw-r--r-- | net/netperf/Makefile | 16 | ||||
| -rw-r--r-- | net/netperf/distinfo | 8 | ||||
| -rw-r--r-- | net/netperf/patches/patch-aa | 23 |
3 files changed, 15 insertions, 32 deletions
diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 256fb673590..cc10331779a 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2004/10/26 09:14:33 salo Exp $ +# $NetBSD: Makefile,v 1.11 2004/12/02 06:41:48 itojun Exp $ # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp # -DISTNAME= netperf-2.1pl3 -PKGNAME= netperf-2.1.3 +DISTNAME= netperf-2.3pl1 +PKGNAME= netperf-2.3.1 CATEGORIES= benchmarks MASTER_SITES= ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ -PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= netperf-21pl3-20000721.diff.gz -PATCH_DIST_STRIP= -p1 - MAINTAINER= itojun@kame.net HOMEPAGE= http://www.netperf.org/ COMMENT= Rick Jones' network performance benchmarking package @@ -20,14 +16,8 @@ USE_BUILDLINK3= yes MAKEFILE= makefile MAN1= netperf.1 netserver.1 -BUILD_DEFS+= USE_INET6 - .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && ${USE_INET6} == "YES" -CFLAGS+= -DDO_IPV6 -.endif - CFLAGS.IRIX+= -DIRIX post-install: diff --git a/net/netperf/distinfo b/net/netperf/distinfo index 7f9d8d630a4..6641e9a0380 100644 --- a/net/netperf/distinfo +++ b/net/netperf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/10/26 10:03:50 agc Exp $ +$NetBSD: distinfo,v 1.4 2004/12/02 06:41:48 itojun Exp $ -SHA1 (netperf-2.1pl3.tar.gz) = e288cc4093058451625b288c96589414e6682ea6 -Size (netperf-2.1pl3.tar.gz) = 832946 bytes +SHA1 (netperf-2.3pl1.tar.gz) = 288c34b6c4d937b06422a8cdab3dcae5ed58cc17 +Size (netperf-2.3pl1.tar.gz) = 836110 bytes SHA1 (netperf-21pl3-20000721.diff.gz) = b660eda13e7c1a8f4f7ad601be0940999f5451d9 Size (netperf-21pl3-20000721.diff.gz) = 8570 bytes -SHA1 (patch-aa) = 01cdafd761f50058d02331b4d0d44bcce5c04e7f +SHA1 (patch-aa) = f9a835995de2130d4bd74d9c5c6a48bc4c0eb59b diff --git a/net/netperf/patches/patch-aa b/net/netperf/patches/patch-aa index a3e72ced436..d598faaaaa4 100644 --- a/net/netperf/patches/patch-aa +++ b/net/netperf/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2001/10/26 10:03:50 agc Exp $ +$NetBSD: patch-aa,v 1.4 2004/12/02 06:41:49 itojun Exp $ ---- makefile.orig Thu Apr 10 03:02:19 1997 -+++ makefile Fri Jan 21 21:31:07 2000 +--- 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 @@ -13,20 +13,13 @@ $NetBSD: patch-aa,v 1.3 2001/10/26 10:03:50 agc Exp $ # The compiler on your system might be somewhere else, and/or have # a different name. -@@ -83,7 +83,7 @@ - # -U__hpux - Use this when compiling _on_ HP-UX *for* an HP-RT system +@@ -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) -DUSE_LOOPER -+CFLAGS += -fno-strength-reduce -D$(LOG_FILE) -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX +-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 -@@ -181,6 +181,7 @@ - netserver.o: netserver.c nettest_bsd.h netlib.h makefile - - install: netperf netserver -+ mkdir -p $(NETPERF_HOME) - chmod -w *.[ch] - chmod +x $(NETPERF_SCRIPTS) - cp netperf $(NETPERF_HOME) |