net/netperf:

Rick Jones' <raj@cup.hp.com> network performance benchmarking package

(IPv6-ready when USE_INET6 - will be revisited when we change USE_INET6 to
something else)

5 files changed, 16 insertions, 33 deletions

diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 3012bf69b17..954e6065415 100644
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@@ -1,8 +1,4 @@
-# New ports collection makefile for: netperf
-# Version required:	2.1.3
-# Date created:		19 July 1996
-# Whom:			koshy
-#
+# $NetBSD: Makefile,v 1.2 2000/01/21 13:01:57 itojun Exp $
 # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp
 #
 
@@ -12,15 +8,22 @@ 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-20000111.diff.gz
-PATCH_DIST_STRIP=	-p
+PATCHFILES=	netperf-21pl3-20000121a.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	sumikawa@kame.net
+MAINTAINER=	itojun@kame.net
+HOMEPAGE=	http://www.netperf.org/
 
 MAKEFILE=	makefile
 MAN1=		netperf.1 netserver.1
 MINSTALL=	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 
+BUILD_DEFS+=	USE_INET6
+.include "../../mk/bsd.prefs.mk"
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+CFLAGS+=	-DDO_IPV6
+.endif
+
 post-install:
 	strip ${PREFIX}/netperf/netperf
 	strip ${PREFIX}/netperf/netserver
@@ -29,7 +32,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/netperf
 	${MINSTALL} ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf
-	gzip -9nf ${PREFIX}/share/doc/netperf/netperf.ps
+	${GZIP_CMD} -9nf ${PREFIX}/share/doc/netperf/netperf.ps
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netperf/files/md5 b/net/netperf/files/md5
index 42261ca508b..f139c18af34 100644
--- a/net/netperf/files/md5
+++ b/net/netperf/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 2000/01/21 12:37:34 itojun Exp $
+$NetBSD: md5,v 1.2 2000/01/21 13:01:57 itojun Exp $
 
 MD5 (netperf-2.1pl3.tar.gz) = ca221caf6dc60322386158c2885fcf68
-MD5 (netperf-21pl3-20000111.diff.gz) = 58c87769f3fdc43fbce6a2ecd7254d3a
+MD5 (netperf-21pl3-20000121a.diff.gz) = 692ce126b0faa49adf93c7d2f09b43bc
diff --git a/net/netperf/patches/patch-aa b/net/netperf/patches/patch-aa
index cb99426a79a..9ca53e68383 100644
--- a/net/netperf/patches/patch-aa
+++ b/net/netperf/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.2 2000/01/21 13:01:57 itojun Exp $
+
 --- makefile.orig	Thu Apr 10 03:02:19 1997
 +++ makefile	Fri Jan 21 21:31:07 2000
 @@ -15,8 +15,8 @@
diff --git a/net/netperf/patches/patch-ab b/net/netperf/patches/patch-ab
deleted file mode 100644
index 8d606259bbd..00000000000
--- a/net/netperf/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- makefile	Fri Jan 21 21:31:07 2000
-+++ makefile Jan 21 21:30:56 2000
-@@ -83,7 +83,7 @@
- # -U__hpux    - Use this when compiling _on_ HP-UX *for* an HP-RT system
- 
- LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\""
--CFLAGS = %CFLAGS% -D$(LOG_FILE) -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX
-+CFLAGS = %CFLAGS% -D$(LOG_FILE) -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
-@@ -101,7 +101,7 @@
- # -lm                   - required for ALL platforms
- # -lxti                 - required for -DDO_XTI on HP_UX 10.X
- 
--LIBS= -lm
-+LIBS= -lm -L/usr/local/v6/lib -linet6
- 
- # ---------------------------------------------------------------
- # it should not be the case that anything below this line needs to
diff --git a/net/netperf/pkg/DESCR b/net/netperf/pkg/DESCR
index 53b953a7c9d..a27b56f819b 100644
--- a/net/netperf/pkg/DESCR
+++ b/net/netperf/pkg/DESCR
@@ -22,5 +22,3 @@ This port of netperf has been configured to support:
 	Unix domain sockets
 
 WWW: http://www.netperf.org/
-
-- Koshy