- Update to 4.10.8

- Fix one portlint warning

PR:		ports/174233
Submitted by:	Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)

5 files changed, 11 insertions, 47 deletions

diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 6f8486e0d09c..c92b2be3c610 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	collectd
-PORTVERSION=	4.10.4
-PORTREVISION=	7
+PORTVERSION=	4.10.8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
diff --git a/net-mgmt/collectd/distinfo b/net-mgmt/collectd/distinfo
index b6d38f063627..11851584e684 100644
--- a/net-mgmt/collectd/distinfo
+++ b/net-mgmt/collectd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (collectd-4.10.4.tar.gz) = ee63dfbd519dd4cae3b682e7379c5e01ac3a615d48ec5871b6ab4921ec0a9b12
-SIZE (collectd-4.10.4.tar.gz) = 1632601
+SHA256 (collectd-4.10.8.tar.gz) = 018e28747e6dd1c581ec61636e178b067fee88c2cc72de0e6c1a801478f00969
+SIZE (collectd-4.10.8.tar.gz) = 1644712
diff --git a/net-mgmt/collectd/files/patch-src__network.c b/net-mgmt/collectd/files/patch-src__network.c
deleted file mode 100644
index b037bd523d55..000000000000
--- a/net-mgmt/collectd/files/patch-src__network.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/network.c.orig	2011-07-14 15:41:32.000000000 +0200
-+++ src/network.c	2011-07-14 15:41:37.000000000 +0200
-@@ -58,7 +58,9 @@
- #endif
- 
- #if HAVE_LIBGCRYPT
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- # include <gcrypt.h>
-+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
- GCRY_THREAD_OPTION_PTHREAD_IMPL;
- #endif
- 
---- src/network.c
-+++ src/network.c
-@@ -704,7 +704,7 @@ static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len,
- 
- 	exp_size = 3 * sizeof (uint16_t)
- 		+ pkg_numval * (sizeof (uint8_t) + sizeof (value_t));
--	if ((buffer_len < 0) || (buffer_len < exp_size))
-+	if (buffer_len < exp_size)
- 	{
- 		WARNING ("network plugin: parse_part_values: "
- 				"Packet too short: "
-@@ -789,7 +789,7 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len,
- 
- 	uint16_t pkg_length;
- 
--	if ((buffer_len < 0) || ((size_t) buffer_len < exp_size))
-+	if (buffer_len < exp_size)
- 	{
- 		WARNING ("network plugin: parse_part_number: "
- 				"Packet too short: "
-@@ -828,7 +828,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len,
- 
- 	uint16_t pkg_length;
- 
--	if ((buffer_len < 0) || (buffer_len < header_size))
-+	if (buffer_len < header_size)
- 	{
- 		WARNING ("network plugin: parse_part_string: "
- 				"Packet too short: "
diff --git a/net-mgmt/collectd/files/patch-version-gen.sh b/net-mgmt/collectd/files/patch-version-gen.sh
new file mode 100644
index 000000000000..0294450a34bb
--- /dev/null
+++ b/net-mgmt/collectd/files/patch-version-gen.sh
@@ -0,0 +1,7 @@
+--- version-gen.sh.orig	2012-11-11 11:43:05.000000000 +0100
++++ version-gen.sh	2012-12-06 14:49:39.204586447 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/env sh
+ 
+ DEFAULT_VERSION="4.10.8.git"
diff --git a/net-mgmt/collectd/pkg-plist b/net-mgmt/collectd/pkg-plist
index 565c06cfe296..8583bdd2f4ea 100644
--- a/net-mgmt/collectd/pkg-plist
+++ b/net-mgmt/collectd/pkg-plist
@@ -116,5 +116,4 @@ libdata/pkgconfig/libcollectdclient.pc
 @dirrm include/collectd
 @dirrm %%DATADIR%%
 @exec mkdir -p /var/db/collectd
-@cwd /
-@dirrmtry /var/db/collectd
+@unexec rmdir /var/db/collectd 2>/dev/null || true