ports/181109: Maintainer update of net-mgmt/collectd5

[Krzysztof Stryjek]

>Number:         181109
>Category:       ports
>Synopsis:       Maintainer update of net-mgmt/collectd5
>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:   Wed Aug 07 10:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Krzysztof Stryjek
>Release:        FreeBSD 7.4-RELEASE-p12 amd64
>Organization:
private
>Environment:
System: FreeBSD cmd.bsdserwis.com 7.4-RELEASE-p12 FreeBSD 7.4-RELEASE-p12 #0: Mon May 20 11:38:42 CEST 2013 toor at cmd.bsdserwis.com:/usr/obj/usr/src/sys/AQQ amd64
>Description:
	There is option to enable notify_email plugin. Currently there is
libnotify dependency added which is dedicated to workstation, not server.
This patch adds NOTIFYDESKTOP option as separate one. Also NOTIFYEMAIL
depends only on libesmtp (as required).
This update includes new version of collect5 branch.

>How-To-Repeat:
	Just enter a port and make all.
>Fix:

diff -ruN collectd5/Makefile collectd5.new/Makefile
--- collectd5/Makefile	2013-08-04 15:05:44.000000000 +0200
+++ collectd5.new/Makefile	2013-08-07 11:34:42.000000000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: net-mgmt/collectd5/Makefile 324229 2013-08-04 13:05:44Z wg $
 
 PORTNAME=	collectd
-PORTVERSION=	5.3.0
-PORTREVISION=	4
+PORTVERSION=	5.3.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -17,7 +16,12 @@
 
 LATEST_LINK=	collectd5
 
-OPTIONS_DEFINE=		CGI CURL DEBUG DBI GCRYPT JSON MEMCACHEC MODBUS MYSQL NOTIFYEMAIL NUTUPS PGSQL PING PYTHON REDIS ROUTEROS RRDTOOL SNMP STATGRAB TOKYOTYRANT VIRT XML XMMS
+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 \
+			NUTUPS PGSQL PING PYTHON REDIS ROUTEROS \
+			SNMP STATGRAB TOKYOTYRANT XML XMMS
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
@@ -28,6 +32,8 @@
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
 MYSQL_DESC=		Enable mysql-based plugins
+NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
+NOTIFYDESKTOP_DESC=	Email notifications (libnotify)
 NUTUPS_DESC=		Enable nut (ups) plugin
 PGSQL_DESC=		Enable postgresql-based plugins
 PING_DESC=		Enable ping plugin
@@ -237,11 +243,18 @@
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MNOTIFYDESKTOP}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--with-libnotify=${LOCALBASE} \
+		--enable-notify_desktop
+PLIST_SUB+=	NOTIFYDESKTOP=""
+.else
+PLIST_SUB+=	NOTIFYDESKTOP="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MNOTIFYEMAIL}
 LIB_DEPENDS+=	esmtp:${PORTSDIR}/mail/libesmtp
-LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--with-libesmtp=${LOCALBASE} \
-		--with-libnotify=${LOCALBASE} \
 		--enable-notify_email
 PLIST_SUB+=	NOTIFYEMAIL=""
 .else
@@ -401,4 +414,7 @@
 	fi
 .endif
 
+pre-configure:
+	@(cd ${WRKSRC} && ${AUTORECONF})
+
 .include <bsd.port.mk>
diff -ruN collectd5/distinfo collectd5.new/distinfo
--- collectd5/distinfo	2013-06-20 05:02:07.000000000 +0200
+++ collectd5.new/distinfo	2013-08-07 10:34:41.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.3.0.tar.bz2) = 5b04150f3c79f90f1a610ed22a2287ef5d8a07dcc2d0fa7a6a650edd9dc1ea01
-SIZE (collectd-5.3.0.tar.bz2) = 1501308
+SHA256 (collectd-5.3.1.tar.bz2) = 8e9e0aff6712a37af10029bfa3dbd7a26776b9e33fe3744c59f1c1ab9b68c0cf
+SIZE (collectd-5.3.1.tar.bz2) = 1472237
diff -ruN collectd5/files/patch-version-gen.sh collectd5.new/files/patch-version-gen.sh
--- collectd5/files/patch-version-gen.sh	2013-06-20 05:02:07.000000000 +0200
+++ collectd5.new/files/patch-version-gen.sh	2013-08-07 10:53:17.000000000 +0200
@@ -1,9 +1,10 @@
---- ./version-gen.sh.orig	2013-05-21 21:22:23.000000000 +0000
-+++ ./version-gen.sh	2013-05-21 21:23:19.000000000 +0000
+--- version-gen.sh.orig	2013-07-13 11:44:08.056130000 +0200
++++ version-gen.sh	2013-08-07 10:52:39.000000000 +0200
 @@ -1,13 +1,3 @@
 -#!/usr/bin/env bash
--
--DEFAULT_VERSION="5.3.0.git"
++#!/bin/sh
+ 
+-DEFAULT_VERSION="5.3.1.git"
 -
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 -
@@ -12,7 +13,6 @@
 -fi
 -
 -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
-+#!/bin/sh
- 
+-
 -echo -n "$VERSION"
-+echo -n "5.3.0.git"
++echo -n "5.3.1.git"
diff -ruN collectd5/pkg-plist collectd5.new/pkg-plist
--- collectd5/pkg-plist	2013-06-20 05:02:07.000000000 +0200
+++ collectd5.new/pkg-plist	2013-08-07 10:48:06.000000000 +0200
@@ -82,6 +82,10 @@
 lib/collectd/network.la
 %%CURL%%lib/collectd/nginx.so
 %%CURL%%lib/collectd/nginx.la
+%%NOTIFYDESKTOP%%/notify_desktop.la
+%%NOTIFYDESKTOP%%/notify_desktop.so
+%%NOTIFYEMAIL%%/notify_email.la
+%%NOTIFYEMAIL%%/notify_email.so
 lib/collectd/ntpd.so
 lib/collectd/ntpd.la
 %%NUTUPS%%lib/collectd/nut.so
>Release-Note:
>Audit-Trail:
>Unformatted: