Import of pkgsrc-2015Q3

This commit is contained in:
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions

View File

@@ -1,11 +1,9 @@
# $NetBSD: Makefile,v 1.7 2012/09/11 22:37:11 asau Exp $
# $NetBSD: Makefile,v 1.8 2015/08/16 06:08:57 mef Exp $
#
DISTNAME= blogbench-1.0
PKGREVISION= 1
DISTNAME= blogbench-1.1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.uvsq.fr/pub/networking/ftp/pure-ftpd/misc/blogbench/
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= http://download.pureftpd.org/pub/blogbench/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://blogbench.pureftpd.org/

View File

@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.4 2006/10/22 04:36:12 rillig Exp $
$NetBSD: distinfo,v 1.5 2015/08/16 06:08:57 mef Exp $
SHA1 (blogbench-1.0.tar.bz2) = 3e667bc9ebfee8751c28508a1840a10b9bdfc099
RMD160 (blogbench-1.0.tar.bz2) = b688e83c06d45986d592a4fc6a6f5f59ade3da7a
Size (blogbench-1.0.tar.bz2) = 103355 bytes
SHA1 (blogbench-1.1.tar.gz) = a53747336ec990701e216f3280179f5949b7da44
RMD160 (blogbench-1.1.tar.gz) = e9e58a61f78a8ebb41797cfe0bc4a7ef6bf61136
Size (blogbench-1.1.tar.gz) = 137664 bytes
SHA1 (patch-aa) = 77c48f0e50aeeec341d7d127564839f526a86e1f
SHA1 (patch-ab) = 9db1070408e2afd12272e01a62d5ea8f2802c1df
SHA1 (patch-ac) = 72ce26dc25b1c2adf9b6d8835852c6ff7ddc1d84
SHA1 (patch-ad) = dab09cd5e678cc5ccce62ffac365b6a61df14ee6
SHA1 (patch-ac) = b850202ad3aca50f645ebf3028bca4ea25c8fb44
SHA1 (patch-ad) = fc6cf7ca0b62deec5a805af34827f8c8f876f57a
SHA1 (patch-ae) = 01b8dcb0641941d70dd056ae2026b83fb16be954
SHA1 (patch-af) = 8c16af43c281d28446dc2b976662c64b02cf3269
SHA1 (patch-af) = 4cea6ee154466af88f996f1aa2a90b27269a1ad4

View File

@@ -1,22 +1,25 @@
$NetBSD: patch-ac,v 1.1 2006/10/15 12:53:04 xtraeme Exp $
$NetBSD: patch-ac,v 1.2 2015/08/16 06:08:57 mef Exp $
--- src/blogbench.c.orig 2006-10-15 13:09:33.000000000 +0200
+++ src/blogbench.c 2006-10-15 13:10:39.000000000 +0200
@@ -19,6 +19,7 @@
"--rewriters=<n> (-W <n>): number of rewriters\n"
"--sleep=<secs> (-s <secs>): delay after every iteration\n"
"--writers=<n> (-w <n>): number of writers\n"
+ "--directio (-o): enable Direct I/O\n"
"\n"
"Sample usage:\n"
"\n"
@@ -56,6 +57,9 @@
case 'i':
stats_iterations = (unsigned int) strtoul(optarg, NULL, 10);
break;
+ case 'o':
+ do_directio = 1;
+ break;
case 'r':
nb_readers = (unsigned int) strtoul(optarg, NULL, 10);
break;
Add --directio option on help and alias as o
--- src/blogbench.c.orig 2010-07-08 18:59:41.000000000 +0900
+++ src/blogbench.c 2015-08-16 14:56:27.000000000 +0900
@@ -18,7 +18,7 @@ static void usage(void)
"--readers=<n> (-r <n>): number of writers\n"
"--rewriters=<n> (-W <n>): number of rewriters\n"
"--sleep=<secs> (-s <secs>): delay after every iteration\n"
- "--writers=<n> (-w <n>): number of writers\n"
+ "--directio (-o): enable Direct I/O\n"
"\n"
"Sample usage:\n"
"\n"
@@ -56,6 +56,9 @@ int main(int argc, char *argv[])
case 'i':
stats_iterations = (unsigned int) strtoul(optarg, NULL, 10);
break;
+ case 'o':
+ do_directio = 1;
+ break;
case 'r':
nb_readers = (unsigned int) strtoul(optarg, NULL, 10);
break;

View File

@@ -1,28 +1,34 @@
$NetBSD: patch-ad,v 1.2 2006/10/22 04:36:12 rillig Exp $
$NetBSD: patch-ad,v 1.3 2015/08/16 06:08:57 mef Exp $
--- src/helpers.c.orig 2005-02-11 15:46:26.000000000 +0100
+++ src/helpers.c 2006-10-22 06:33:08.000000000 +0200
@@ -48,9 +48,20 @@ int create_dummy_file(const char * const
--- src/helpers.c~ 2015-08-16 14:59:03.000000000 +0900
+++ src/helpers.c 2015-08-16 14:59:14.000000000 +0900
@@ -46,12 +46,24 @@ int create_dummy_file(const char * const
{
static char garbage[WRITE_CHUNK_SIZE];
size_t towrite;
ssize_t written;
- ssize_t written;
+ ssize_t written;
int fd;
-
- if ((fd = open(file_name, O_CREAT | O_TRUNC | O_WRONLY,
- (mode_t) 0600)) == -1) {
+ mode_t m;
- if ((fd = open(file_name, O_CREAT | O_TRUNC | O_WRONLY,
- (mode_t) 0600)) == -1) {
- if (errno != ENOENT) {
+
+#if defined(O_DIRECT)
+ m = O_CREAT|O_TRUNC|O_WRONLY|(do_directio ? O_DIRECT : 0);
+#else
+ if (do_directio) {
+ reentrant_printf("open: O_DIRECT is not supported on this system.\n");
+ return -1;
+ reentrant_printf("open: O_DIRECT is not supported on this system.\n");
+ return -1;
+ }
+ m = O_CREAT|O_TRUNC|O_WRONLY;
+#endif
+
+ fd = open(file_name, m, (mode_t)0600);
+ if (fd == -1) {
if (errno != ENOENT) {
reentrant_printf("open(\"%s\"): %s\n",
file_name, strerror(errno));
+ if (fd == -1) {
+ if (errno != ENOENT) {
reentrant_printf("open(\"%s\"): %s\n",
file_name, strerror(errno));
}

View File

@@ -1,13 +1,13 @@
$NetBSD: patch-af,v 1.1 2006/10/15 12:53:04 xtraeme Exp $
$NetBSD: patch-af,v 1.2 2015/08/16 06:08:57 mef Exp $
--- src/process.c.orig 2005-02-11 22:32:46.000000000 +0100
+++ src/process.c 2006-10-15 14:44:32.000000000 +0200
@@ -138,6 +138,8 @@
"Frequency = %u secs\n"
"Scratch dir = [%s]\n",
sleep_stats, scratch_dir);
+ reentrant_printf("Direct I/O: %s\n", do_directio ? "enabled" : "disabled");
--- src/process.c~ 2015-08-16 15:00:37.000000000 +0900
+++ src/process.c 2015-08-16 15:01:10.000000000 +0900
@@ -146,6 +146,8 @@ int process(void)
"Frequency = %u secs\n"
"Scratch dir = [%s]\n",
sleep_stats, scratch_dir);
+ reentrant_printf("Direct I/O: %s\n", do_directio ? "enabled" : "disabled");
+
if (chdir(scratch_dir) != 0) {
reentrant_printf("Unable to enter the scratch dir [%s]: [%s]\n",
scratch_dir, strerror(errno));
reentrant_printf("Unable to enter the scratch dir [%s]: [%s]\n",
scratch_dir, strerror(errno));

View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.54 2015/06/12 10:48:25 wiz Exp $
# $NetBSD: Makefile,v 1.55 2015/07/13 14:05:56 ryoon Exp $
DISTNAME= iozone3_429
DISTNAME= iozone3_430
PKGNAME= ${DISTNAME:S/3_/-3./}
PKGREVISION= 1
CATEGORIES= benchmarks
MASTER_SITES= http://www.iozone.org/src/current/
EXTRACT_SUFX= .tar
@@ -23,7 +22,11 @@ CPPFLAGS.SunOS+= -Dsolaris
.include "../../mk/bsd.prefs.mk"
.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
BUILD_TARGET= netbsd
.elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
BUILD_TARGET= netbsd-AMD64
.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
BUILD_TARGET= ${LOWER_OPSYS}
.elif (${OPSYS} == "SunOS")
BUILD_TARGET= Solaris

View File

@@ -1,7 +1,9 @@
$NetBSD: distinfo,v 1.21 2014/12/09 13:53:13 mef Exp $
$NetBSD: distinfo,v 1.22 2015/07/13 14:05:56 ryoon Exp $
SHA1 (iozone3_429.tar) = 13b74ba397530ff2f117bac3d1d7dec81dcc66d2
RMD160 (iozone3_429.tar) = c945becef75f89eb7eba0e12e6959ae6dcdf6514
Size (iozone3_429.tar) = 1832960 bytes
SHA1 (iozone3_430.tar) = de02b10fcde6bd60e0c805e3abfc0aed15e85ac1
RMD160 (iozone3_430.tar) = 4b43f14268ebe3accf8cdc881c3f82430d649082
Size (iozone3_430.tar) = 1832960 bytes
SHA1 (patch-ab) = fdd36fead26811aa830df5fac35b79a9b62ed1f0
SHA1 (patch-ac) = 6a02e13f3441a76709fbe8ba064555b650f9bd1c
SHA1 (patch-libasync.c) = 2c1bebb4423ea84329511cc7fd32d093a6063bf9
SHA1 (patch-makefile) = 0eb68d8838141e96b08a156f59ed197407eb95e9

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-libasync.c,v 1.1 2015/07/13 14:05:56 ryoon Exp $
--- libasync.c.orig 2015-01-07 20:43:10.000000000 +0000
+++ libasync.c
@@ -96,7 +96,7 @@
#include <sys/types.h>
#include <aio.h>
-#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc)
+#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) || defined(__NetBSD__)
#else
#include <sys/timers.h>
#endif
@@ -119,7 +119,7 @@
#include <stdlib.h>
#endif
-#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD)
+#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD) || defined(__NetBSD__)
/* If we are building for 64-bit Solaris, all functions that return pointers
* must be declared before they are used; otherwise the compiler will assume
* that they return ints and the top 32 bits of the pointer will be lost,

View File

@@ -0,0 +1,95 @@
$NetBSD: patch-makefile,v 1.1 2015/07/13 14:05:56 ryoon Exp $
--- makefile.orig 2015-01-07 20:43:10.000000000 +0000
+++ makefile
@@ -57,6 +57,7 @@ all:
@echo " -> linux-sparc (32bit) <-"
@echo " -> macosx (32bit) <-"
@echo " -> netbsd (32bit) <-"
+ @echo " -> netbsd-AMD64 (64bit) <-"
@echo " -> openbsd (32bit) <-"
@echo " -> openbsd-threads (32bit) <-"
@echo " -> OSFV3 (64bit) <-"
@@ -207,7 +208,7 @@ linux-powerpc64: iozone_linux-powerpc64.
-lrt $(FLAG64BIT) -o iozone
$(CC) -O3 -Dlinux fileop_linux-ppc64.o $(FLAG64BIT) -o fileop
$(CC) -O3 -Dlinux pit_server-linux-powerpc64.o $(FLAG64BIT) -o pit_server
-
+
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
@@ -587,15 +588,25 @@ SCO_Unixware_gcc: iozone_SCO_Unixware_gc
-lsocket -lthread -o iozone
#
-# GNU C compiler NetBSD build with no threads, no largefiles, no async I/O
+# GNU C compiler NetBSD build with threads, no largefiles, async I/O
#
-netbsd: iozone_netbsd.o libbif.o fileop_netbsd.o pit_server.o
- $(CC) -O $(LDFLAGS) iozone_netbsd.o libbif.o -o iozone
+netbsd: iozone_netbsd.o libbif.o libasync.o fileop_netbsd.o pit_server.o
+ $(CC) -O $(LDFLAGS) iozone_netbsd.o libbif.o libasync.o \
+ -lrt -lpthread -o iozone
$(CC) -O fileop_netbsd.o -o fileop
$(CC) -O pit_server.o -o pit_server
#
+# GNU C compiler NetBSD/amd64 build with threads, no largefiles, async I/O
+#
+netbsd-AMD64: iozone_netbsd-AMD64.o libbif.o libasync.o fileop_netbsd-AMD64.o pit_server.o
+ $(CC) -O $(LDFLAGS) iozone_netbsd-AMD64.o libbif.o libasync.o \
+ -lrt -lpthread -o iozone
+ $(CC) -O fileop_netbsd-AMD64.o -o fileop
+ $(CC) -O pit_server.o -o pit_server
+
+#
#
# Now for the machine specific stuff
#
@@ -777,7 +788,6 @@ iozone_linux-powerpc64.o: iozone.c libbi
-DSHARED_MEM -Dlinux $(CFLAGS) libbif.c $(FLAG64BIT) -o libbif.o
$(CC) -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c $(FLAG64BIT) -o libasync.o
-
iozone_linux-sparc.o: iozone.c libbif.c libasync.c
@echo ""
@@ -851,6 +861,12 @@ fileop_netbsd.o: fileop.c
@echo ""
$(CC) -c -O $(CFLAGS) fileop.c -o fileop_netbsd.o
+fileop_netbsd-AMD64.o: fileop.c
+ @echo ""
+ @echo "Building fileop for NetBSD/AMD64"
+ @echo ""
+ $(CC) -Wall -c -O $(CFLAGS) fileop.c -o fileop_netbsd-AMD64.o
+
fileop_Solaris.o: fileop.c
@echo ""
@echo "Building fileop for Solaris"
@@ -1461,7 +1477,21 @@ iozone_netbsd.o: iozone.c libbif.c
@echo ""
@echo "Building iozone NetBSD "
@echo ""
- $(CC) -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \
-DNAME='"netbsd"' -DSHARED_MEM $(CFLAGS) iozone.c -o iozone_netbsd.o
- $(CC) -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
+ -DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
+ $(CFLAGS) libasync.c -o libasync.o
+
+iozone_netbsd-AMD64.o: iozone.c libbif.c libasync.c
+ @echo ""
+ @echo "Building iozone for NetBSD/amd64"
+ @echo ""
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DNAME='"netbsd-AMD64"' \
+ -D__AMD64__ -DSHARED_MEM \
+ -DHAVE_PREAD $(CFLAGS) iozone.c -o iozone_netbsd-AMD64.o
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
-DSHARED_MEM $(CFLAGS) libbif.c -o libbif.o
+ $(CC) -c -O -Dunix -DHAVE_ANSIC_C -DASYNC_IO \
+ $(CFLAGS) libasync.c -o libasync.o

View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2012/09/11 22:37:13 asau Exp $
# $NetBSD: Makefile,v 1.7 2015/08/16 06:39:45 mef Exp $
#
DISTNAME= nbench-byte-2.2.2
DISTNAME= nbench-byte-2.2.3
PKGNAME= ${DISTNAME:S/-byte//}
CATEGORIES= benchmarks
MASTER_SITES= http://www.tux.org/~mayer/linux/

View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.3 2011/12/19 13:21:39 wiz Exp $
$NetBSD: distinfo,v 1.4 2015/08/16 06:39:45 mef Exp $
SHA1 (nbench-byte-2.2.2.tar.gz) = 2ad7c76fb88f80e475650dd3802c187195cc80c1
RMD160 (nbench-byte-2.2.2.tar.gz) = 78b8e1eaf3c24ca8c619a90693265402a4f8be68
Size (nbench-byte-2.2.2.tar.gz) = 111751 bytes
SHA1 (nbench-byte-2.2.3.tar.gz) = f2a03c56dc2bf26e478c2a1828debcafd83983ef
RMD160 (nbench-byte-2.2.3.tar.gz) = a07d2a9f1a6162a5071602e89e6360c13521e463
Size (nbench-byte-2.2.3.tar.gz) = 111791 bytes
SHA1 (patch-aa) = 5beabbb962fc2a56b5561b6d5a3eaa882af3dbd1
SHA1 (patch-ab) = 6308ca09483da37a72e17503ba8d6f342692e508
SHA1 (patch-sysinfo.sh) = 56ec31e921b199c1926180acde87b30336bb4d1d
SHA1 (patch-sysinfo.sh) = 6846c6cc8d323f83c60fb95a9e6c0cd7b1e2ff5f

View File

@@ -1,15 +1,15 @@
$NetBSD: patch-sysinfo.sh,v 1.1 2011/12/19 13:21:39 wiz Exp $
$NetBSD: patch-sysinfo.sh,v 1.2 2015/08/16 06:39:45 mef Exp $
Avoid matching too many lines (trouble with gcc-4.5.3 on NetBSD)
--- sysinfo.sh.orig 2004-12-30 02:58:29.000000000 +0000
+++ sysinfo.sh
@@ -18,7 +18,7 @@ fi
--- sysinfo.sh~ 2015-08-16 15:10:42.000000000 +0900
+++ sysinfo.sh 2015-08-16 15:11:19.000000000 +0900
@@ -19,7 +19,7 @@ fi
compiler=`echo $* | sed -e 's/-static//g' -e 's/-Bstatic//g'`
if $TEST `basename $1` = "gcc" && ($compiler -v) >/dev/null 2>&1 ; then
- gccversion=`$compiler -v 2>&1 | sed -e "/version/!d"`
+ gccversion=`$compiler -v 2>&1 | sed -e "/ version/!d"`
# Cygwin writes more than one line with "version" in it
- gccversion=`$compiler -v 2>&1 | sed -e "/version/!d" | tail -n 1`
+ gccversion=`$compiler -v 2>&1 | sed -e "/ version/!d" | tail -n 1`
else
gccversion="$1"
fi

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2014/04/01 11:13:27 adam Exp $
# $NetBSD: Makefile,v 1.11 2015/08/16 01:05:09 mef Exp $
DISTNAME= netperf-2.6.0
DISTNAME= netperf-2.7.0
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.netperf.org/netperf/
EXTRACT_SUFX= .tar.bz2

View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.9 2014/09/23 13:55:00 jperkin Exp $
$NetBSD: distinfo,v 1.10 2015/08/16 01:05:09 mef Exp $
SHA1 (netperf-2.6.0.tar.bz2) = 3e1be4e7c3f7a838c4d5c00c6d20a619b320bfef
RMD160 (netperf-2.6.0.tar.bz2) = c3adf0b67e1d8e8a51c229910aa7347182991df2
Size (netperf-2.6.0.tar.bz2) = 1032953 bytes
SHA1 (netperf-2.7.0.tar.bz2) = 415ecd4877cf8e24cefe6943564e511e6f1e2215
RMD160 (netperf-2.7.0.tar.bz2) = a3b9b89999362ae4077efcffa509140683d2982b
Size (netperf-2.7.0.tar.bz2) = 1024430 bytes
SHA1 (patch-ab) = 096eed1eccf6a2f7003898711384ed67019800d7
SHA1 (patch-ah) = b2ee5c6312ed987d6b796fa462dcc3557146580f
SHA1 (patch-ak) = 68628408979f164f2843bbe0eac0cb122af3b4fc

View File

@@ -1,15 +0,0 @@
$NetBSD: patch-ab,v 1.4 2014/04/01 11:13:27 adam Exp $
* sendfile(2) of DragonFly is FreeBSD in origin.
--- src/nettest_bsd.c.orig 2012-06-19 20:32:47.000000000 +0000
+++ src/nettest_bsd.c
@@ -4560,7 +4560,7 @@ Size (bytes)\n\
sv.sfv_off = send_ring->offset;
sv.sfv_len = send_ring->length;
if ((len = sendfilev(send_socket, &sv, 1, &scratch_len)) != send_size)
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
/* so close to HP-UX and yet so far away... :) */
if ((sendfile(send_ring->fildes,
send_socket,

View File

@@ -1,17 +1,18 @@
# $NetBSD: Makefile,v 1.3 2015/06/12 10:48:25 wiz Exp $
# $NetBSD: Makefile,v 1.4 2015/08/16 02:21:45 mef Exp $
DISTNAME= Benchmark-Timer-0.7102
DISTNAME= Benchmark-Timer-0.7107
PKGNAME= p5-${DISTNAME}
PKGREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Benchmark/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Benchmark-Timer/
COMMENT= Benchmarking with statistical confidence
#LICENSE= GPL but not clear which version
LICENSE= gnu-gpl-v2
DEPENDS+= p5-Statistics-TTest-[0-9]*:../../math/p5-Statistics-TTest
# for make test
BUILD_DEPENDS+= p5-URI-Escape-XS-[0-9]*:../../www/p5-URI-Escape-XS
PERL5_PACKLIST= auto/Benchmark/Timer/.packlist
REPLACE_PERL= delta.pl

View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1 2014/08/13 20:39:16 wiz Exp $
$NetBSD: distinfo,v 1.2 2015/08/16 02:21:45 mef Exp $
SHA1 (Benchmark-Timer-0.7102.tar.gz) = d977d5473b06ad12141c57ec628caa89de9181d3
RMD160 (Benchmark-Timer-0.7102.tar.gz) = 6b9231c6aee1df85dbd2733a9248072de6090b2d
Size (Benchmark-Timer-0.7102.tar.gz) = 31219 bytes
SHA1 (Benchmark-Timer-0.7107.tar.gz) = 24132bf428edca54d86cc17f9d0ab598f6099516
RMD160 (Benchmark-Timer-0.7107.tar.gz) = 1232a7ff2b2a4cd2464c90f2276d73464943cc31
Size (Benchmark-Timer-0.7107.tar.gz) = 45734 bytes

View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:00 wiz Exp $
# $NetBSD: Makefile,v 1.23 2015/07/04 16:11:53 bsiegert Exp $
DISTNAME= ttcp
PKGNAME= ${DISTNAME}-1.12
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= benchmarks net
#MASTER_SITES= ftp://ftp.ptb.de/pub/benchmarks/
EXTRACT_SUFX= .tar.Z

View File

@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.12 2013/12/17 15:05:23 tron Exp $
$NetBSD: distinfo,v 1.13 2015/07/04 16:11:53 bsiegert Exp $
SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
Size (ttcp.tar.Z) = 18163 bytes
SHA1 (patch-aa) = 96e3a9136bae4057682d2b3cfea2ec8c8bb21eaa
SHA1 (patch-ab) = 265c19e05e22ce9fff7596b7b1efca0c07a7f4e0
SHA1 (patch-ab) = 5d04ee46ae5bb015c8834e18fe2f2e301c5059b4

View File

@@ -1,10 +1,10 @@
$NetBSD: patch-ab,v 1.9 2013/12/17 15:05:23 tron Exp $
$NetBSD: patch-ab,v 1.10 2015/07/04 16:11:53 bsiegert Exp $
Fix build.
--- ttcp.c.orig 1997-02-27 21:30:23.000000000 +0000
+++ ttcp.c 2005-12-21 11:40:39.000000000 +0000
@@ -44,17 +44,19 @@
+++ ttcp.c
@@ -44,17 +44,19 @@ static char RCSid[] = "ttcp.c $Revision:
/* #define BSD41a */
/* #define SYSV */ /* required on SGI IRIX releases before 3.3 */
@@ -28,7 +28,7 @@ Fix build.
#if defined(SYSV)
#include <sys/times.h>
@@ -71,7 +73,8 @@
@@ -71,7 +73,8 @@ struct sockaddr_in sinme;
struct sockaddr_in sinhim;
struct sockaddr_in frominet;
@@ -38,7 +38,7 @@ Fix build.
int fd; /* fd of network socket */
int buflen = 8 * 1024; /* length of buffer */
@@ -99,7 +102,6 @@
@@ -99,7 +102,6 @@ char fmt = 'K'; /* output format: k =
int touchdata = 0; /* access data after reading */
struct hostent *addr;
@@ -46,7 +46,7 @@ Fix build.
extern int optind;
extern char *optarg;
@@ -151,7 +153,7 @@
@@ -151,7 +153,7 @@ main(argc,argv)
int argc;
char **argv;
{
@@ -55,7 +55,7 @@ Fix build.
int c;
if (argc < 2) goto usage;
@@ -263,29 +265,30 @@
@@ -263,29 +265,30 @@ char **argv;
if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL)
err("malloc");
if (bufalign != 0)
@@ -93,7 +93,7 @@ Fix build.
err("bind");
#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
@@ -326,7 +329,7 @@
@@ -326,7 +329,7 @@ char **argv;
mes("nodelay");
}
#endif
@@ -102,7 +102,7 @@ Fix build.
err("connect");
mes("connect");
} else {
@@ -348,11 +351,11 @@
@@ -348,11 +351,11 @@ char **argv;
}
fromlen = sizeof(frominet);
domain = AF_INET;
@@ -117,7 +117,7 @@ Fix build.
&peerlen) < 0) {
err("getpeername");
}
@@ -412,25 +415,25 @@
@@ -412,25 +415,25 @@ char **argv;
}
if( cput <= 0.0 ) cput = 0.001;
if( realt <= 0.0 ) realt = 0.001;
@@ -148,7 +148,24 @@ Fix build.
"ttcp%s: buffer address %#x\n",
trans?"-t":"-r",
buf);
@@ -749,10 +752,10 @@
@@ -488,13 +491,13 @@ double b;
sprintf(obuf, "%.2f MB", b / 1024.0 / 1024.0);
break;
case 'g':
- sprintf(obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
+ sprintf(obuf, "%.2f Gbit", b * 8.0 / 1000.0 / 1000.0 / 1000.0);
break;
case 'k':
- sprintf(obuf, "%.2f Kbit", b * 8.0 / 1024.0);
+ sprintf(obuf, "%.2f Kbit", b * 8.0 / 1000.0);
break;
case 'm':
- sprintf(obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
+ sprintf(obuf, "%.2f Mbit", b * 8.0 / 1000.0 / 1000.0);
break;
}
return obuf;
@@ -749,10 +752,10 @@ void *buf;
int count;
{
struct sockaddr_in from;
@@ -161,7 +178,7 @@ Fix build.
numCalls++;
} else {
if( b_flag )
@@ -782,7 +785,7 @@
@@ -782,7 +785,7 @@ int count;
register int cnt;
if( udp ) {
again:
@@ -170,7 +187,7 @@ Fix build.
numCalls++;
if( cnt<0 && errno == ENOBUFS ) {
delay(18000);
@@ -803,7 +806,7 @@
@@ -803,7 +806,7 @@ delay(us)
tv.tv_sec = 0;
tv.tv_usec = us;

View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.21 2013/09/04 12:31:24 obache Exp $
# $NetBSD: Makefile,v 1.22 2015/06/30 09:57:34 ryoon Exp $
#
DISTNAME= zelibm
PKGNAME= zelibm-0
PKGREVISION= 14
PKGREVISION= 15
CATEGORIES= benchmarks
MASTER_SITES= http://people.redhat.com/drepper/libm/