From owner-svn-ports-head@FreeBSD.ORG Fri May 24 10:10:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6F7DD4D4; Fri, 24 May 2013 10:10:17 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 61E1F116; Fri, 24 May 2013 10:10:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4OAAHA0058873; Fri, 24 May 2013 10:10:17 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4OAAHN6058868; Fri, 24 May 2013 10:10:17 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201305241010.r4OAAHN6058868@svn.freebsd.org> From: William Grzybowski Date: Fri, 24 May 2013 10:10:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318948 - head/net-mgmt/collectd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 May 2013 10:10:17 -0000 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 (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