Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 May 2013 23:59:37 +0200 (CEST)
From:      Krzysztof Stryjek <ports@bsdserwis.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/178825: update collectd port
Message-ID:  <20130521215937.CA1302CBCBE8@mx1.bsdserwis.com>
Resent-Message-ID: <201305212200.r4LM01V6012237@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178825
>Category:       ports
>Synopsis:       update collectd port
>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:   Tue May 21 22:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Krzysztof Stryjek
>Release:        FreeBSD 7.4-RELEASE-p12 amd64
>Organization:
private
>Environment:
System: FreeBSD cmd.bsdserwis.local 7.4-RELEASE-p12 FreeBSD 7.4-RELEASE-p12 #0: Mon May 20 11:38:42 CEST 2013 toor@cmd.bsdserwis.local:/usr/obj/usr/src/sys/AQQ amd64

>Description:
	It is net-mgmt/collectd update. Also there is modification to correct
libnotify depends.

>How-To-Repeat:
	cd /usr/ports/net-mgmt/collectd && make all install clean
>Fix:

There is patch to build new version

-------------------------- cut ---------------------------------
diff -ruN collectd/Makefile collectd.new/Makefile
--- collectd/Makefile	2013-05-15 13:38:21.000000000 +0200
+++ collectd.new/Makefile	2013-05-21 15:32:51.000000000 +0200
@@ -2,16 +2,13 @@
 # $FreeBSD: net-mgmt/collectd/Makefile 318238 2013-05-15 11:38:21Z bsam $
 
 PORTNAME=	collectd
-PORTVERSION=	4.10.8
-PORTREVISION=	5
+PORTVERSION=	4.10.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf autoheader automake libltdl
@@ -19,10 +16,11 @@
 
 OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP
+OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL
 OPTIONS_GROUP_INPUT=	APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
-			NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX OPENVPN \
-			PDNS PGSQL PING PYTHON ROUTEROS SNMP TOKYOTYRANT XMMS
+			NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX \
+			OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \
+			TOKYOTYRANT XMMS
 OPTIONS_DEFAULT=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
 
 CGI_DESC=		Install collection.cgi (requires RRDTOOL)
@@ -44,6 +42,7 @@
 MEMCACHED_DESC=		Memcached
 MYSQL_DESC=		MySQL
 NGINX_DESC=		Nginx
+NOTIFYEMAIL_DESC=	Email notifications (libesmtp, libnotify)
 OPENVPN_DESC=		OpenVPN statistics
 PDNS_DESC=		PowerDNS
 PGSQL_DESC=		PostgreSQL
@@ -108,7 +107,6 @@
 		--disable-netlink \
 		--disable-nfs \
 		--disable-notify_desktop \
-		--disable-notify_email \
 		--disable-olsrd \
 		--disable-onewire \
 		--disable-oracle \
@@ -297,6 +295,17 @@
 PLIST_SUB+=	NGINX="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MNOTIFYEMAIL}
+LIB_DEPENDS+=	esmtp:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-notify_email
+CONFIGURE_ARGS+=--with-libesmtp=${PREFIX}
+PLIST_SUB+=	NOTIFYEMAIL=""
+.else
+CONFIGURE_ARGS+=--disable-notify_email
+PLIST_SUB+=	NOTIFYEMAIL="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MOPENVPN}
 CONFIGURE_ARGS+=--enable-openvpn
 RUN_DEPENDS+=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
diff -ruN collectd/distinfo collectd.new/distinfo
--- collectd/distinfo	2012-12-11 00:42:37.000000000 +0100
+++ collectd.new/distinfo	2013-05-20 23:52:28.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (collectd-4.10.8.tar.gz) = 018e28747e6dd1c581ec61636e178b067fee88c2cc72de0e6c1a801478f00969
-SIZE (collectd-4.10.8.tar.gz) = 1644712
+SHA256 (collectd-4.10.9.tar.gz) = 6fd43f04ed009cce7fd16296eb348ce78b859d8f32de48a10f1af8a09b3151d9
+SIZE (collectd-4.10.9.tar.gz) = 1602028
-------------------------- cut ---------------------------------

Greetings,
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130521215937.CA1302CBCBE8>