summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-04-19 14:34:52 +0000
committertron <tron@pkgsrc.org>2001-04-19 14:34:52 +0000
commit4a38089f4f81ad221c04e1c7d35db9c8dbe117e8 (patch)
tree557dc299b789e11d906b6cd566b8e66d80d7ed16
parent86f6051937c4cd6c6dfe1765adbafcb22569094b (diff)
downloadpkgsrc-4a38089f4f81ad221c04e1c7d35db9c8dbe117e8.tar.gz
Update "netio" package to version 1.14. This version includes the bug
fixes from the NetBSD package sources.
-rw-r--r--benchmarks/netio/Makefile6
-rw-r--r--benchmarks/netio/distinfo9
-rw-r--r--benchmarks/netio/patches/patch-aa4
-rw-r--r--benchmarks/netio/patches/patch-ab21
4 files changed, 9 insertions, 31 deletions
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index 48347fa48a2..654798ffbd8 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/04/17 12:44:22 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/04/19 14:34:52 tron Exp $
-DISTNAME= netio113
-PKGNAME= netio-1.13
+DISTNAME= netio114
+PKGNAME= netio-1.14
CATEGORIES= benchmarks net
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/os2/leo/systools/
EXTRACT_SUFX= .zip
diff --git a/benchmarks/netio/distinfo b/benchmarks/netio/distinfo
index dbd28214089..25986b5e028 100644
--- a/benchmarks/netio/distinfo
+++ b/benchmarks/netio/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/17 16:38:42 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/04/19 14:34:52 tron Exp $
-SHA1 (netio113.zip) = f68a8476d3ef0f5b16e2e7829d6bb3c175ec2980
-Size (netio113.zip) = 34 bytes
-SHA1 (patch-aa) = 589aa32c759b973f374ab80270d586f3116e53a2
-SHA1 (patch-ab) = 36c05058f979ca2a7b52b255b0f1d8adc3f118bc
+SHA1 (netio114.zip) = 992f8e2d4cee6a268231e8d9aa296d48e687abc7
+Size (netio114.zip) = 37 bytes
+SHA1 (patch-aa) = dda59d9542d4b99eecb7274f8f3275159fe17795
diff --git a/benchmarks/netio/patches/patch-aa b/benchmarks/netio/patches/patch-aa
index ccaa22569f0..328decf9d06 100644
--- a/benchmarks/netio/patches/patch-aa
+++ b/benchmarks/netio/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/04/17 12:54:11 tron Exp $
+$NetBSD: patch-aa,v 1.3 2001/04/19 14:34:52 tron Exp $
--- Makefile.orig Thu Oct 28 19:37:44 1999
+++ Makefile Tue Apr 17 14:16:41 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2001/04/17 12:54:11 tron Exp $
$(MAKE) all CC="gcc -g -O2" O=.o X=.exe OUT=-o \
CFLAGS="-DWATT32 -I../../inc" LIBS="../../lib/libwatt.a"
+pkgsrc:
-+ $(MAKE) all O=.o X= CFLAGS="$(CFLAGS) -DLINUX" LFLAGS="$(LDFLAGS)" OUT=-o
++ $(MAKE) all O=.o X= CFLAGS="$(CFLAGS) -DUNIX" LFLAGS="$(LDFLAGS)" OUT=-o
INC = -I.
diff --git a/benchmarks/netio/patches/patch-ab b/benchmarks/netio/patches/patch-ab
deleted file mode 100644
index b8e6e218ca4..00000000000
--- a/benchmarks/netio/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/04/17 16:38:43 tron Exp $
-
---- netio.c.orig Wed Mar 28 13:17:28 2001
-+++ netio.c Tue Apr 17 18:33:19 2001
-@@ -282,6 +282,7 @@
- bTimeOver = 0;
- signal(SIGALRM, on_alarm);
- alarm(nSeconds);
-+ return 0;
- }
-
- int StartTimer(TIMER *nStart)
-@@ -603,7 +604,7 @@
- {
- while (!bTimeOver)
- {
-- if ((rc = send(server, cBuffer, tSizes[i], 0)) != tSizes[i] && errno != 0)
-+ if ((rc = send(server, cBuffer, tSizes[i], 0)) != tSizes[i] && errno != 0 && errno != EINTR)
- {
- psock_errno("send()");
- break;