ports/180756: [MAINTAINER] benchmarks/flowgrind: update to 0.6.1

[Lars Eggert]

>Number:         180756
>Category:       ports
>Synopsis:       [MAINTAINER] benchmarks/flowgrind: update to 0.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 23 09:50:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Lars Eggert
>Release:        FreeBSD 9.2-BETA1 amd64
>Organization:
>Environment:
System: FreeBSD stanley.muccbc.hq.netapp.com 9.2-BETA1 FreeBSD 9.2-BETA1 #3: Tue Jul 23 10:35:24 CEST 2013
>Description:
- Update to 0.6.1

Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- flowgrind-0.6.1.patch begins here ---
diff -ruN ../flowgrind.orig/Makefile ./Makefile
--- ../flowgrind.orig/Makefile	2013-07-23 08:48:58.000000000 +0200
+++ ./Makefile	2013-07-23 11:44:18.000000000 +0200
@@ -2,10 +2,10 @@
 # $FreeBSD: benchmarks/flowgrind/Makefile 322318 2013-07-05 11:53:08Z wg $
 
 PORTNAME=	flowgrind
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	0.6.1
+#PORTREVISION=	0
 CATEGORIES=	benchmarks
-MASTER_SITES=	https://launchpad.net/flowgrind/trunk/${PORTNAME}-0.6/+download/
+MASTER_SITES=	https://launchpad.net/flowgrind/trunk/${PORTNAME}-0.6.1/+download/
 
 MAINTAINER=	lars at eggert.org
 COMMENT=	Measure throughput and other metrics for TCP
@@ -13,6 +13,7 @@
 LIB_DEPENDS=	xmlrpc++:${PORTSDIR}/net/xmlrpc-c \
 		gsl:${PORTSDIR}/math/gsl
 BUILD_DEPENDS=	${LOCALBASE}/lib/libpcap.so:${PORTSDIR}/net/libpcap
+RUN_DEPENDS=	${LOCALBASE}/lib/libpcap.so:${PORTSDIR}/net/libpcap
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff -ruN ../flowgrind.orig/distinfo ./distinfo
--- ../flowgrind.orig/distinfo	2013-07-23 08:48:58.000000000 +0200
+++ ./distinfo	2013-07-23 08:51:16.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (flowgrind-0.6.0.tar.bz2) = 8a4018976cdcd63f304436fa25589687f2e2f1adebc67ee0ab4805efc290497a
-SIZE (flowgrind-0.6.0.tar.bz2) = 213142
+SHA256 (flowgrind-0.6.1.tar.bz2) = a0d0f34dc27b4ede320aac913bb2179fc1a307cfb9d3218b9d64d0aeac8a2cef
+SIZE (flowgrind-0.6.1.tar.bz2) = 211922
diff -ruN ../flowgrind.orig/files/patch-fg_socket ./files/patch-fg_socket
--- ../flowgrind.orig/files/patch-fg_socket	2013-07-23 08:48:58.000000000 +0200
+++ ./files/patch-fg_socket	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
---- src/fg_socket.h	2013-07-02 14:09:06.000000000 +0200
-+++ src/fg_socket.h.orig	2013-07-02 14:07:20.000000000 +0200
-@@ -19,7 +19,7 @@
- int set_so_lcd(int fd);
- int set_tcp_mtcp(int fd);
- int set_tcp_nodelay(int fd);
--int set_dscp(int sock, uint8_t dscp);
-+int set_dscp(int sock, int dscp);
- int set_tcp_cork(int fd);
- int toggle_tcp_cork(int fd);
- int set_window_size(int, int);
---- src/fg_socket.c	2013-07-02 14:07:12.000000000 +0200
-+++ src/fg_socket.c.orig	2013-07-02 14:06:41.000000000 +0200
-@@ -132,7 +132,7 @@
- 	return send < receive? send: receive;
- }
- 
--int set_dscp(int fd, uint8_t dscp)
-+int set_dscp(int fd, int dscp)
- {
- 	int optname = IP_TOS;
- 	int optlevel = IPPROTO_IP;
diff -ruN ../flowgrind.orig/files/patch-flowgrind ./files/patch-flowgrind
--- ../flowgrind.orig/files/patch-flowgrind	2013-07-23 08:48:58.000000000 +0200
+++ ./files/patch-flowgrind	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
---- src/flowgrind.c
-+++ src/flowgrind.c
-@@ -1872,7 +1872,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) {
- 
- 					if (extra_rpc) {
- 						/* Now it's getting tricky... */
--						/* 1st case: IPv6 with port, e.g. "[a:b::c]a:5999"  */
-+						/* 1st case: IPv6 with port, e.g. "[a:b::c]:5999"  */
- 						if ((sepptr = strchr(rpc_address, ']'))) {
- 						    is_ipv6 = 1;
- 							*sepptr = '\0';
-@@ -1884,7 +1884,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) {
- 							port = atoi(sepptr);
- 						} else if ((sepptr = strchr(rpc_address, ':'))) {
- 							/* 2nd case: IPv6 without port, e.g. "a:b::c"  */
--							if (strchr(sepptr, ':')) {
-+							if (strchr(sepptr+1, ':')) {
- 								is_ipv6 = 1;
- 							} else {
- 							/* 3rd case: IPv4 or name with port 1.2.3.4:5999*/
-@@ -1910,7 +1910,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) {
- 						fprintf(stderr, "No test host given in argument\n");
- 						usage();
- 					}
--				    if (is_ipv6)
-+					if (is_ipv6)
- 						sprintf(url, "http://[%s]:%d/RPC2", rpc_address, port);
- 					else
- 						sprintf(url, "http://%s:%d/RPC2", rpc_address, port);
--- flowgrind-0.6.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: