5 files changed, 54 insertions, 12 deletions

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 3381327713df..05612beb3f89 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	collectd
-PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTVERSION=	5.1.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -42,11 +41,12 @@ OPTIONS=	CGI		"Install collection.cgi (requires RRDTOOL)" 	Off \
 		PDNS		"Input: PowerDNS" 				Off \
 		PGSQL		"Input: PostgreSQL" 				Off \
 		PING		"Input: Network latency (liboping)" 		On  \
-		PYTHON		"Input: Python plugin"				Off  \
+		PYTHON		"Input: Python plugin"				Off \
+		ROUTEROS	"Input: RouterOS plugin"			Off \
 		SNMP		"Input: SNMP" 					On  \
 		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
 		XMMS		"Input: XMMS" 					Off \
-		RRDTOOL		"Output: RRDTool"				On \
+		RRDTOOL		"Output: RRDTool"				On  \
 		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
 
 MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
@@ -110,8 +110,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-perl \
 		--disable-pinba \
 		--disable-protocols \
-		--disable-routeros \
-		--without-librouteros \
 		--disable-sensors \
 		--disable-serial \
 		--disable-table \
@@ -267,7 +265,7 @@ PLIST_SUB+=	MBMON="@comment "
 .endif
 
 .if defined(WITH_MEMCACHED)
-LIB_DEPENDS+=	memcached.8:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
 CONFIGURE_ARGS+=--enable-memcached
 CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
 PLIST_SUB+=	MEMCACHED=""
@@ -340,6 +338,15 @@ CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.if defined(WITH_ROUTEROS)
+LIB_DEPENDS+=	routeros:${PORTSDIR}/net/librouteros
+CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
+PLIST_SUB+=	ROUTEROS=""
+.else
+CONFIGURE_ARGS+=--disable-routeros --without-librouteros
+PLIST_SUB+=	ROUTEROS="@comment "
+.endif
+
 .if defined(WITH_RRDTOOL)
 LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
 CONFIGURE_ARGS+=--enable-rrdtool
diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo
index 481688996fa2..b6a0a004be66 100644
--- a/net-mgmt/collectd5/distinfo
+++ b/net-mgmt/collectd5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.0.1.tar.gz) = 380f98a50eba9453eb84fbb8b847df8ee6eff69bf05a4d61c996cf8256712c42
-SIZE (collectd-5.0.1.tar.gz) = 1680960
+SHA256 (collectd-5.1.0.tar.gz) = 8e06c03c5467f3021565570fc86c931a43579aa6dad25ca5999d66850cd19927
+SIZE (collectd-5.1.0.tar.gz) = 1630323
diff --git a/net-mgmt/collectd5/files/patch-configure.in b/net-mgmt/collectd5/files/patch-configure.in
index cd8b589a8ac3..7f158b4b239a 100644
--- a/net-mgmt/collectd5/files/patch-configure.in
+++ b/net-mgmt/collectd5/files/patch-configure.in
@@ -1,5 +1,14 @@
---- configure.in.orig	2011-10-14 22:49:49.000000000 +0200
-+++ configure.in	2012-01-08 16:04:13.000000000 +0100
+--- configure.in.orig	2011-10-14 12:49:49.000000000 -0800
++++ configure.in	2012-03-20 08:09:25.000000000 -0800
+@@ -98,7 +98,7 @@
+ fi
+ 
+ # Where to install .pc files.
+-pkgconfigdir="${libdir}/pkgconfig"
++pkgconfigdir="${prefix}/libdata/pkgconfig"
+ AC_SUBST(pkgconfigdir)
+ 
+ # Check for standards compliance mode
 @@ -1745,9 +1745,6 @@
  		[with_libgcrypt="yes"],
  		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
@@ -15,7 +24,7 @@
  then
  	AC_MSG_CHECKING([for Python LIBS])
 -	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
-+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
++	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
  	python_config_status=$?
  
  	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh
new file mode 100644
index 000000000000..390b3ed77615
--- /dev/null
+++ b/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -0,0 +1,22 @@
+--- version-gen.sh.orig	2012-04-09 20:04:16.130293641 -0500
++++ version-gen.sh	2012-04-09 20:05:04.927297496 -0500
+@@ -1,17 +1,3 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+-DEFAULT_VERSION="5.1.0.git"
+-
+-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+-
+-if test -z "$VERSION"; then
+-	VERSION="$DEFAULT_VERSION"
+-fi
+-
+-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
+-
+-if test "x`uname -s`" = "xAIX" ; then
+-	echo "$VERSION\c"
+-else 
+-	echo -n "$VERSION"
+-fi
++echo -n "5.1.0.git"
diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index ec736a527a80..54707b1b01a7 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -77,6 +77,8 @@ lib/collectd/ntpd.so
 %%PYTHON%%lib/collectd/python.so
 lib/collectd/processes.la
 lib/collectd/processes.so
+%%ROUTEROS%%lib/collectd/routeros.la
+%%ROUTEROS%%lib/collectd/routeros.so
 %%RRD%%lib/collectd/rrdtool.la
 %%RRD%%lib/collectd/rrdtool.so
 %%RRDCACHED%%lib/collectd/rrdcached.la
@@ -103,6 +105,8 @@ lib/collectd/uptime.la
 lib/collectd/uptime.so
 lib/collectd/uuid.la
 lib/collectd/uuid.so
+lib/collectd/write_graphite.so
+lib/collectd/write_graphite.la
 lib/libcollectdclient.la
 lib/libcollectdclient.so
 lib/libcollectdclient.so.0