Bug 178825 - update net-mgmt/collectd port
Summary: update net-mgmt/collectd port
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-21 23:00 UTC by Krzysztof
Modified: 2013-05-24 11:20 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Krzysztof 2013-05-21 23:00:00 UTC
	It is net-mgmt/collectd update. Also there is modification to correct
libnotify depends.

Fix: There is patch to build new version

-------------------------- cut ---------------------------------


Greetings,--7BiZszjgaqkXK85eA488yWoau4KASFrFQH1qoxeHWBuVNUVQ
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

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 ---------------------------------
How-To-Repeat: 	cd /usr/ports/net-mgmt/collectd && make all install clean
Comment 1 William Grzybowski freebsd_committer freebsd_triage 2013-05-22 12:02:22 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-05-24 11:11:02 UTC
Author: wg
Date: Fri May 24 10:10:16 2013
New Revision: 318948
URL: http://svnweb.freebsd.org/changeset/ports/318948

Log:
  - Update to 4.10.9 [1]
  - Add option for notify email [1]
  - Fix libnotify dependency [1]
  - Add LICENSE (GPLv2)
  - Remove options descriptions found in bsd.options.desc.mk
  - Rename VIRT option to LIBVIRT
  
  PR:		ports/178825 [1]
  Submitted by:	Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)
  Approved by:	culot (mentor)

Modified:
  head/net-mgmt/collectd/Makefile
  head/net-mgmt/collectd/distinfo

Modified: head/net-mgmt/collectd/Makefile
==============================================================================
--- head/net-mgmt/collectd/Makefile	Fri May 24 10:07:22 2013	(r318947)
+++ head/net-mgmt/collectd/Makefile	Fri May 24 10:10:16 2013	(r318948)
@@ -2,34 +2,31 @@
 # $FreeBSD$
 
 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
+LICENSE=	GPLv2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf autoheader automake libltdl
 WANT_GNOME=	yes
 
-OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT VIRT
+OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT LIBVIRT
 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)
 BIND_DESC=		Enable BIND 9.5+ statistics
-DEBUG_DESC=		Enable debugging
-GCRYPT_DESC=		Build with libgcrypt
-VIRT_DESC=		Build with libvirt
 # INPUT
 APACHE_DESC=		Apache mod_status (libcurl)
 APCUPS_DESC=		APC UPS (apcupsd)
@@ -42,15 +39,12 @@ NUTUPS_DESC=		NUT UPS daemon
 INTERFACE_DESC=		Network interfaces (libstatgrab)
 MBMON_DESC=		MBMon
 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
 PING_DESC=		Network latency (liboping)
-PYTHON_DESC=		Python plugin
 ROUTEROS_DESC=		RouterOS plugin
-SNMP_DESC=		SNMP
 TOKYOTYRANT_DESC=	Tokyotyrant database
 XMMS_DESC=		XMMS
 # OUTPUT
@@ -108,7 +102,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-netlink \
 		--disable-nfs \
 		--disable-notify_desktop \
-		--disable-notify_email \
 		--disable-olsrd \
 		--disable-onewire \
 		--disable-oracle \
@@ -297,6 +290,17 @@ CONFIGURE_ARGS+=--disable-nginx
 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
@@ -387,7 +391,7 @@ CONFIGURE_ARGS+=--disable-tokyotyrant --
 PLIST_SUB+=	TOKYOTYRANT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MVIRT}
+.if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=--enable-libvirt
 LIB_DEPENDS+=	virt.1000:${PORTSDIR}/devel/libvirt
 PLIST_SUB+=	VIRT=""

Modified: head/net-mgmt/collectd/distinfo
==============================================================================
--- head/net-mgmt/collectd/distinfo	Fri May 24 10:07:22 2013	(r318947)
+++ head/net-mgmt/collectd/distinfo	Fri May 24 10:10:16 2013	(r318948)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-05-24 11:20:38 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!