On Mon Oct 17, 2016 at 11:12:01PM +0200, Jeremie Courreges-Anglas wrote: > Rafael Sadowski <raf...@sizeofvoid.org> writes: > > > Hi ports@, > > > > simple update to the last stable release (found by unreachable > > homepage). > > > > - HOMEPAGE / MASTER_SITES update > > - cleanup > > - remove unnecessary patch > > > > OK? Comments? > > Here's an updated diff. > - fix PKGNAME (duplicated DISTNAME lines) > - unneeded EXTRACT_SUFX & WRKSRC > - -DHAVE_GETRUSAGE now useless in CFLAGS > - use MAKE_FILE instead of renameing makefile > - also build and install the IPv6 version
Great! I add GPLv2 as licence-tag. > > Sadly NPtcp now shows erratic behavior, most of the time the client > doesn't get a proper handshake from the server. Tested with NPtcp -r > and NPtcp -h 127.0.0.1. > My test-case works as described in netpipe(1): $SHELL1: doas NPtcp $SHELL2: doas NPtcp -h 127.0.0.1 Output from $SHELL2: Send and receive buffers are 16384 and 16384 bytes (A bug in Linux doubles the requested buffer sizes) Now starting the main loop 0: 1 bytes 3452 times --> 0.32 Mbps in 23.69 usec 1: 2 bytes 4221 times --> 0.66 Mbps in 23.15 usec 2: 3 bytes 4319 times --> 0.98 Mbps in 23.34 usec 3: 4 bytes 2855 times --> 1.28 Mbps in 23.85 usec .... Index: Makefile =================================================================== RCS file: /cvs/ports/benchmarks/netpipe/Makefile,v retrieving revision 1.27 diff -u -p -u -p -r1.27 Makefile --- Makefile 22 Jan 2015 17:47:50 -0000 1.27 +++ Makefile 18 Oct 2016 21:09:47 -0000 @@ -2,26 +2,30 @@ COMMENT= self-scaling network benchmark -DISTNAME= netpipe-2.4 -DISTFILES= NetPIPE_2.4.tar.gz -REVISION= 0 +DISTNAME= NetPIPE-3.7.2 +PKGNAME= netpipe-3.7.2 CATEGORIES= benchmarks net -HOMEPAGE= http://www.scl.ameslab.gov/netpipe/ +HOMEPAGE= http://bitspjoule.org/netpipe/ +# GPLv2 PERMIT_PACKAGE_CDROM= Yes WANTLIB= c MASTER_SITES= ${HOMEPAGE}/code/ -MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_GETRUSAGE" -ALL_TARGET= NPtcp +MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" NO_TEST= Yes +MAKE_FILE= makefile + +ALL_TARGET= tcp tcp6 + do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp ${PREFIX}/bin - ${INSTALL_MAN} ${WRKBUILD}/netpipe.1 ${PREFIX}/man/man1 cd ${PREFIX}/bin && ln -sf NPtcp netpipe - + ${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp6 ${PREFIX}/bin + ${INSTALL_MAN} ${WRKBUILD}/dox/netpipe.1 ${PREFIX}/man/man1 + .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/benchmarks/netpipe/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 18 Jan 2015 03:12:51 -0000 1.5 +++ distinfo 18 Oct 2016 21:09:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (NetPIPE_2.4.tar.gz) = LUYjlHvxj0Qd6Dd+EOC76pTLN2RgcrssQ0qN8V30/nE= -SIZE (NetPIPE_2.4.tar.gz) = 23009 +SHA256 (NetPIPE-3.7.2.tar.gz) = E9rIhP9SlRY29lHEIfX/SoUyGKlaoopKhSQC7jhaKrg= +SIZE (NetPIPE-3.7.2.tar.gz) = 400248 Index: patches/patch-netpipe_h =================================================================== RCS file: /cvs/ports/benchmarks/netpipe/patches/patch-netpipe_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-netpipe_h --- patches/patch-netpipe_h 8 Jul 2011 09:33:25 -0000 1.1 +++ patches/patch-netpipe_h 18 Oct 2016 21:09:47 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-netpipe_h,v 1.1 2011/07/08 09:33:25 jasper Exp $ ---- netpipe.h.orig Tue Apr 27 22:55:57 1999 -+++ netpipe.h Fri Jul 8 11:32:28 2011 -@@ -20,6 +20,7 @@ - #include <stdlib.h> /* malloc(3) */ - #include <string.h> - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/time.h> /* struct timeval */ - #ifdef HAVE_GETRUSAGE - #include <sys/resource.h> -@@ -38,8 +39,12 @@ - #define MAXINT 2147483647 - - #define ABS(x) (((x) < 0)?(-(x)):(x)) -+#ifndef MIN - #define MIN(x,y) (((x) < (y))?(x):(y)) -+#endif -+#ifndef MAX - #define MAX(x,y) (((x) > (y))?(x):(y)) -+#endif - - /* Need to include the protocol structure header file. */ - /* Change this to reflect the protocol */ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/benchmarks/netpipe/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 6 Aug 2004 14:37:29 -0000 1.3 +++ pkg/PLIST 18 Oct 2016 21:09:47 -0000 @@ -1,4 +1,4 @@ @comment $OpenBSD: PLIST,v 1.3 2004/08/06 14:37:29 espie Exp $ -bin/NPtcp -bin/netpipe +@bin bin/NPtcp +@bin bin/NPtcp6 @man man/man1/netpipe.1
