7 files changed, 30 insertions, 64 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index a08d06bfaa9a..c7f6755025d9 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	collectd
-PORTVERSION=	5.4.0
-PORTREVISION=	3
+PORTVERSION=	5.4.1
 PKGNAMESUFFIX=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
@@ -11,8 +10,7 @@ MASTER_SITES=	http://collectd.org/files/
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal autoconf autoheader automake libltdl libtool
 
@@ -22,7 +20,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/gli
 OPTIONS_DEFINE=		CGI DEBUG GCRYPT VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP
-OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MYSQL \
+OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
 			NUTUPS PGSQL PING PYTHON RABBITMQ REDIS \
 			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
 
@@ -34,6 +32,7 @@ GCRYPT_DESC=		Build with libgcrypt
 JSON_DESC=		Enable JSON plugins
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
+MONGODB_DESC=		Enable MongoDB-based plugins
 MYSQL_DESC=		Enable mysql-based plugins
 NOTIFYEMAIL_DESC=	Enable notifications via email
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
@@ -68,13 +67,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-all-plugins \
 		--disable-static \
+		--without-amqp \
 		--without-java \
+		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
 		--without-libjvm \
 		--without-libkstat \
 		--without-libmodbus \
-		--without-libmongoc \
 		--without-libnetlink \
 		--without-libnetapp \
 		--without-libopenipmi \
@@ -83,6 +83,8 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--without-libperl \
 		--without-libsensors \
 		--without-libvarnish \
+		--without-lvm \
+		--without-mic \
 		--without-oracle \
 		--without-perl-bindings
 
@@ -233,6 +235,17 @@ PLIST_SUB+=	MODBUS=""
 PLIST_SUB+=	MODBUS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MMONGODB}
+LIB_DEPENDS+=	libmongoc.so:${PORTSDIR}/devel/mongo-c-driver
+CONFIGURE_ARGS+=--with-libmongoc=${LOCALBASE} \
+		--enable-write_mongodb
+PLIST_SUB+=	MONGODB=""
+.else
+CONFIGURE_ARGS+=--without-libcmongoc \
+		--disable-write_mongodb
+PLIST_SUB+=	MONGODB="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql
@@ -441,9 +454,6 @@ post-patch:
 		-e 's;/opt/collectd/var/lib;/var/db;' \
 		-e 's;/opt/collectd/lib;${PREFIX}/lib;' \
 		${WRKSRC}/contrib/collection.conf
-	@${REINPLACE_CMD} \
-		-e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \
-		${WRKSRC}/configure.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/collectd
diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo
index 6115301377f8..4cf0c5021eab 100644
--- a/net-mgmt/collectd5/distinfo
+++ b/net-mgmt/collectd5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.4.0.tar.bz2) = 90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e
-SIZE (collectd-5.4.0.tar.bz2) = 1506520
+SHA256 (collectd-5.4.1.tar.bz2) = 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0
+SIZE (collectd-5.4.1.tar.bz2) = 1521907
diff --git a/net-mgmt/collectd5/files/patch-configure.in b/net-mgmt/collectd5/files/patch-configure.ac
index 00cc06022d7c..65b9577d32e0 100644
--- a/net-mgmt/collectd5/files/patch-configure.in
+++ b/net-mgmt/collectd5/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- configure.in.orig	2013-08-18 04:24:25.049973000 -0600
-+++ configure.in	2013-08-19 10:46:53.000000000 -0600
+--- configure.ac.orig	2013-08-18 04:24:25.049973000 -0600
++++ configure.ac	2013-08-19 10:46:53.000000000 -0600
 @@ -110,7 +110,7 @@
  fi
  
diff --git a/net-mgmt/collectd5/files/patch-src-curl_xml.c b/net-mgmt/collectd5/files/patch-src-curl_xml.c
deleted file mode 100644
index 2bf78a9241ae..000000000000
--- a/net-mgmt/collectd5/files/patch-src-curl_xml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/curl_xml.c.orig	2013-08-18 14:24:25.069973000 +0400
-+++ src/curl_xml.c	2014-01-03 00:25:17.000000000 +0400
-@@ -607,7 +607,7 @@
-   int status;
-   long rc;
-   char *ptr;
--  char *url;
-+  char *url = NULL;
- 
-   db->buffer_fill = 0; 
-   status = curl_easy_perform (curl);
diff --git a/net-mgmt/collectd5/files/patch-src-interface.c b/net-mgmt/collectd5/files/patch-src-interface.c
deleted file mode 100644
index f2ad3d2bb601..000000000000
--- a/net-mgmt/collectd5/files/patch-src-interface.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/interface.c.orig	2014-01-05 00:36:58.000000000 +0400
-+++ src/interface.c	2014-01-05 00:45:10.000000000 +0400
-@@ -212,20 +212,19 @@ static int interface_read (void)
- 		return (-1);
- 
- 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
--	{
--		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
--			continue;
--
--		if_submit (if_ptr->ifa_name, "if_octets",
--				if_data->IFA_RX_BYTES,
--				if_data->IFA_TX_BYTES);
--		if_submit (if_ptr->ifa_name, "if_packets",
--				if_data->IFA_RX_PACKT,
--				if_data->IFA_TX_PACKT);
--		if_submit (if_ptr->ifa_name, "if_errors",
--				if_data->IFA_RX_ERROR,
--				if_data->IFA_TX_ERROR);
--	}
-+        if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
-+            if_data = (struct IFA_DATA *) if_ptr->ifa_data;
-+            
-+            if_submit (if_ptr->ifa_name, "if_octets",
-+                       if_data->IFA_RX_BYTES,
-+                       if_data->IFA_TX_BYTES);
-+            if_submit (if_ptr->ifa_name, "if_packets",
-+                       if_data->IFA_RX_PACKT,
-+                       if_data->IFA_TX_PACKT);
-+            if_submit (if_ptr->ifa_name, "if_errors",
-+                       if_data->IFA_RX_ERROR,
-+                       if_data->IFA_TX_ERROR);
-+        }
- 
- 	freeifaddrs (if_list);
- /* #endif HAVE_GETIFADDRS */
diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh
index 7aa632cfbf91..93a5736d8389 100644
--- a/net-mgmt/collectd5/files/patch-version-gen.sh
+++ b/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -1,10 +1,10 @@
---- version-gen.sh.orig	2013-08-19 10:57:47.000000000 -0600
-+++ version-gen.sh	2013-08-19 10:58:15.000000000 -0600
+--- version-gen.sh.orig	2014-01-26 12:09:23.540560000 +0400
++++ version-gen.sh	2014-04-06 14:44:48.000000000 +0400
 @@ -1,13 +1,3 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
  
--DEFAULT_VERSION="5.4.0.git"
+-DEFAULT_VERSION="5.4.1.git"
 -
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 -
@@ -15,4 +15,4 @@
 -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
 -
 -echo -n "$VERSION"
-+echo -n '5.4.0.git'
++echo -n "5.4.1.git"
diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index e3a30cbdc019..9bec24478af0 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -226,6 +226,9 @@ lib/collectd/write_graphite.la
 %%CURL%%lib/collectd/write_http.a
 %%CURL%%lib/collectd/write_http.so
 %%CURL%%lib/collectd/write_http.la
+%%MONGODB%%lib/collectd/write_mongodb.a
+%%MONGODB%%lib/collectd/write_mongodb.so
+%%MONGODB%%lib/collectd/write_mongodb.la
 %%REDIS%%lib/collectd/write_redis.a
 %%REDIS%%lib/collectd/write_redis.so
 %%REDIS%%lib/collectd/write_redis.la