diff options
author | tron <tron> | 2005-08-09 22:47:09 +0000 |
---|---|---|
committer | tron <tron> | 2005-08-09 22:47:09 +0000 |
commit | b5dd89f8c1335f60167c0a418c2401a314f765dc (patch) | |
tree | 55d14a6c63a92c9138c625db5f8d689c76f0a4c7 | |
parent | c1b52bb92521ae63cfb8628d61a172cd593bc97f (diff) | |
download | pkgsrc-b5dd89f8c1335f60167c0a418c2401a314f765dc.tar.gz |
Update "netio" package to version 1.23. Changes since version 1.13 include:
- UDP support
- sets socket buffer size by default for decent performance under *BSD
-rw-r--r-- | benchmarks/netio/Makefile | 15 | ||||
-rw-r--r-- | benchmarks/netio/distinfo | 9 | ||||
-rw-r--r-- | benchmarks/netio/patches/patch-aa | 35 |
3 files changed, 12 insertions, 47 deletions
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile index 0d20b581087..4855389f4c0 100644 --- a/benchmarks/netio/Makefile +++ b/benchmarks/netio/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.10 2004/07/30 15:50:37 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/09 22:47:09 tron Exp $ -DISTNAME= netio114 -PKGNAME= netio-1.14 -PKGREVISION= 1 +DISTNAME= netio123 +PKGNAME= netio-1.23 CATEGORIES= benchmarks net -MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/os2/leo/systools/ +MASTER_SITES= ftp://ftp.leo.org/pub/historic/comp/os/os2/leo/systools/ EXTRACT_SUFX= .zip MAINTAINER= tron@NetBSD.org -COMMENT= Network benchmark for DOS, OS/2 2.x, Windows NT/2000 and Unix +COMMENT= Network benchmark for OS/2 2.x, Windows NT/2000 and Unix LICENSE= no-commercial-use PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -MAKE_FLAGS+= CC="${CC}" CFLAGS="-DUNIX ${CFLAGS}" LFLAGS="${LDFLAGS}" \ +MAKE_FLAGS+= CC="${CC}" CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \ + LFLAGS="${PTHREAD_LDFLAGS} ${LDFLAGS}" \ LIBS="${LIBS}" O=.o OUT=-o X= .include "../../mk/bsd.prefs.mk" @@ -31,4 +31,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netio ${INSTALL_DATA} ${WRKSRC}/netio.doc ${PREFIX}/share/doc/netio +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/netio/distinfo b/benchmarks/netio/distinfo index f22848b934d..781e11d3a8e 100644 --- a/benchmarks/netio/distinfo +++ b/benchmarks/netio/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2005/02/22 21:16:36 agc Exp $ +$NetBSD: distinfo,v 1.8 2005/08/09 22:47:09 tron Exp $ -SHA1 (netio114.zip) = 992f8e2d4cee6a268231e8d9aa296d48e687abc7 -RMD160 (netio114.zip) = 53f66c6ae0e2c9d2f1333ac419af0f2b57140d3c -Size (netio114.zip) = 210744 bytes -SHA1 (patch-aa) = 50760bf1e3737a878cfb713a31ee682612128e22 +SHA1 (netio123.zip) = 6a75ba56813e60a1e0e8b9bba6f2d3cc6b7290d1 +RMD160 (netio123.zip) = df6b077cd4549c7cc6e6df71c3af103d1f43cb42 +Size (netio123.zip) = 130800 bytes diff --git a/benchmarks/netio/patches/patch-aa b/benchmarks/netio/patches/patch-aa deleted file mode 100644 index d87a6f7c843..00000000000 --- a/benchmarks/netio/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2003/09/28 14:40:06 tron Exp $ - ---- netio.c.orig 2001-04-19 14:21:02.000000000 +0200 -+++ netio.c 2003-09-28 16:31:19.000000000 +0200 -@@ -502,6 +502,10 @@ - free(cBuffer); - return; - } -+#if defined(UNIX) && defined(SO_RCVBUF) -+ length = 65536; -+ (void) setsockopt(server, SOL_SOCKET, SO_RCVBUF, &length, sizeof (length)); -+#endif - - sa_server.sin_family = AF_INET; - sa_server.sin_port = htons(nPort); -@@ -596,6 +600,10 @@ - free(cBuffer); - return; - } -+#if defined(UNIX) && defined(SO_SNDBUF) -+ i = 65536; -+ (void) setsockopt(server, SOL_SOCKET, SO_SNDBUF, &i, sizeof (i)); -+#endif - - if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) - { -@@ -618,7 +626,7 @@ - { - while (!bTimeOver) - { -- if ((rc = send(server, cBuffer, tSizes[i], 0)) != tSizes[i] && errno != 0 && errno != EINTR) -+ if ((rc = send(server, cBuffer, tSizes[i], 0)) < 0 && errno != EINTR) - { - psock_errno("send()"); - break; |