- Update net/dpinger to 0.0.1.20151129 (commit c0adc9e57f)

- Remove patches already applied upstream
- Fix build on FreeBSD 9

4 files changed, 41 insertions, 23 deletions

diff --git a/net/dpinger/Makefile b/net/dpinger/Makefile
index 5160d915cd21..1e00844a87df 100644
--- a/net/dpinger/Makefile
+++ b/net/dpinger/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpinger
-PORTVERSION=	0.0.1.20151125
+PORTVERSION=	0.0.1.20151129
 CATEGORIES=	net
 
 MAINTAINER=	garga@FreeBSD.org
@@ -13,7 +13,7 @@ USES=		uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	dennypage
 GH_PROJECT=	dpinger
-GH_TAGNAME=	21942bac3a
+GH_TAGNAME=	c0adc9e57f
 
 PLIST_FILES=	bin/dpinger
 
diff --git a/net/dpinger/distinfo b/net/dpinger/distinfo
index 9ab37b0b7074..63300627b093 100644
--- a/net/dpinger/distinfo
+++ b/net/dpinger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dennypage-dpinger-0.0.1.20151125-21942bac3a_GH0.tar.gz) = 6b4f1911dfc38d35f103df61cd776f74def536ebc260b6b00832f5724c754701
-SIZE (dennypage-dpinger-0.0.1.20151125-21942bac3a_GH0.tar.gz) = 6073
+SHA256 (dennypage-dpinger-0.0.1.20151129-c0adc9e57f_GH0.tar.gz) = b7108784ff2170bdbf4bd1cb677248a7f12098a7aa2292e3df9f76965214ccac
+SIZE (dennypage-dpinger-0.0.1.20151129-c0adc9e57f_GH0.tar.gz) = 7372
diff --git a/net/dpinger/files/patch-Makefile b/net/dpinger/files/patch-Makefile
deleted file mode 100644
index fe5d03c6ca98..000000000000
--- a/net/dpinger/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2015-11-25 04:21:35 UTC
-+++ Makefile
-@@ -4,7 +4,7 @@ MAN=
- BINDIR=	${PREFIX}/bin
- WARNS=	6
- 
--CFLAGS=	-g
-+#CFLAGS=	-g
- LDADD=	-lpthread
- 
- .include <bsd.prog.mk>
diff --git a/net/dpinger/files/patch-dpinger.c b/net/dpinger/files/patch-dpinger.c
index 61af896128ab..bb4e7e1e28f5 100644
--- a/net/dpinger/files/patch-dpinger.c
+++ b/net/dpinger/files/patch-dpinger.c
@@ -1,11 +1,40 @@
---- dpinger.c.orig	2015-11-25 04:21:35 UTC
+--- dpinger.c.orig	2015-11-30 00:12:21 UTC
 +++ dpinger.c
-@@ -164,7 +164,7 @@ cksum(
+@@ -497,7 +497,7 @@ alert_thread(
+     unsigned int		latency_alarm_decay = 0;
+     unsigned int		loss_alarm_decay = 0;
+     unsigned int		alert = 0;
+-    unsigned int		alarm;
++    unsigned int		alarm_on;
+     int				r;
  
-     if (len == 1)
-     {
--	sum += (uint16_t) *((uint8_t *) p);
-+	sum += (uint16_t) *((const uint8_t *) p);
-     }
+     // Set up the timespec for nanosleep
+@@ -599,12 +599,12 @@ alert_thread(
+ 	{
+ 	    alert = 0;
+ 
+-	    alarm = latency_alarm_decay || loss_alarm_decay;
+-	    logger("%s: latency %luus loss %lus\n", alarm ? "Alarm" : "Clear", average_latency, average_loss);
++	    alarm_on = latency_alarm_decay || loss_alarm_decay;
++	    logger("%s: latency %luus loss %lus\n", alarm_on ? "Alarm" : "Clear", average_latency, average_loss);
  
-     sum = (sum >> 16) + (sum & 0xFFFF);
+ 	    if (alert_cmd)
+ 	    {
+-		r = snprintf(alert_cmd + alert_cmd_offset, ALERT_CMD_OUTPUT_MAX, " %u %lu %lu", alarm, average_latency, average_loss);
++		r = snprintf(alert_cmd + alert_cmd_offset, ALERT_CMD_OUTPUT_MAX, " %u %lu %lu", alarm_on, average_latency, average_loss);
+ 		if (r < 0 || r >= (int) ALERT_CMD_OUTPUT_MAX)
+ 		{
+ 		    logger("error formatting alert command\n");
+@@ -891,9 +891,9 @@ parse_args(
+ 		fatal("Invalid bind IP address %s\n", bind_arg);
+ 	    }
+ 
+-	    struct sockaddr_in * bind = (struct sockaddr_in *) &bind_addr;
+-	    bind->sin_family = AF_INET;
+-	    bind->sin_addr = addr;
++	    struct sockaddr_in * bind4 = (struct sockaddr_in *) &bind_addr;
++	    bind4->sin_family = AF_INET;
++	    bind4->sin_addr = addr;
+ 	    bind_addr_len = sizeof(struct sockaddr_in);
+ 	}
+     }