From wtp@bsdserwis.com  Wed Aug  7 07:16:53 2013
Return-Path: <wtp@bsdserwis.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id D7C34418
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Aug 2013 07:16:53 +0000 (UTC)
	(envelope-from wtp@bsdserwis.com)
Received: from mx1.bsdserwis.com (ns37332.ovh.net [91.121.4.86])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 6EC882C4E
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Aug 2013 07:16:52 +0000 (UTC)
Received: by mx1.bsdserwis.com (Postfix, from userid 1000)
	id 6D38A2CA807F; Wed,  7 Aug 2013 09:16:45 +0200 (CEST)
Message-Id: <20130807071645.6D38A2CA807F@mx1.bsdserwis.com>
Date: Wed,  7 Aug 2013 09:16:45 +0200 (CEST)
From: Krzysztof Stryjek <ports@bsdserwis.com>
Reply-To: Krzysztof Stryjek <ports@bsdserwis.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update of net-mgmt/collectd
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         181103
>Category:       ports
>Synopsis:       Maintainer update of net-mgmt/collectd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 07 07:20:00 UTC 2013
>Closed-Date:    Sat Aug 10 17:01:25 UTC 2013
>Last-Modified:  Sat Aug 10 17:10:00 UTC 2013
>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@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).

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

diff -ruN collectd.orig/Makefile collectd/Makefile
--- collectd.orig/Makefile	2013-07-11 18:26:26.000000000 +0200
+++ collectd/Makefile	2013-08-07 00:04:20.000000000 +0200
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -19,7 +19,7 @@
 
 OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT LIBVIRT
 OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL
+OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL NOTIFYDESKTOP
 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 \
@@ -41,7 +41,8 @@
 MBMON_DESC=		MBMon
 MEMCACHED_DESC=		Memcached
 NGINX_DESC=		Nginx
-NOTIFYEMAIL_DESC=	Email notifications (libesmtp, libnotify)
+NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
+NOTIFYDESKTOP_DESC=	Email notifications (libnotify)
 OPENVPN_DESC=		OpenVPN statistics
 PDNS_DESC=		PowerDNS
 PING_DESC=		Network latency (liboping)
@@ -102,7 +103,6 @@
 		--disable-netapp \
 		--disable-netlink \
 		--disable-nfs \
-		--disable-notify_desktop \
 		--disable-olsrd \
 		--disable-onewire \
 		--disable-oracle \
@@ -299,9 +299,16 @@
 PLIST_SUB+=	NGINX="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MNOTIFYDESKTOP}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-notify_desktop \
+PLIST_SUB+=	NOTIFYDESKTOP=""
+.else
+CONFIGURE_ARGS+=--disable-notify_desktop
+PLIST_SUB+=	NOTIFYDESKTOP="@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=""
diff -ruN collectd.orig/files/patch-src__Makefile.am collectd/files/patch-src__Makefile.am
--- collectd.orig/files/patch-src__Makefile.am	2013-02-23 16:36:53.000000000 +0100
+++ collectd/files/patch-src__Makefile.am	2013-08-07 00:27:20.000000000 +0200
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	2012-11-11 11:43:05.000000000 +0100
-+++ src/Makefile.am	2012-12-30 23:34:44.000000000 +0100
+--- src/Makefile.am.orig	2013-04-08 08:26:17.000000000 +0200
++++ src/Makefile.am	2013-08-07 00:23:31.036813410 +0200
 @@ -7,7 +7,7 @@
  endif
  
@@ -9,6 +9,15 @@
  endif
  
  AM_CPPFLAGS = -DPREFIX='"${prefix}"'
+@@ -720,7 +720,7 @@
+ pkglib_LTLIBRARIES += notify_email.la
+ notify_email_la_SOURCES = notify_email.c
+ notify_email_la_LDFLAGS = -module -avoid-version
+-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
++notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
+ collectd_LDADD += "-dlopen" notify_email.la
+ collectd_DEPENDENCIES += notify_email.la
+ endif
 @@ -1198,7 +1198,7 @@
  zfs_arc_la_SOURCES = zfs_arc.c
  zfs_arc_la_CFLAGS = $(AM_CFLAGS)
diff -ruN collectd.orig/pkg-plist collectd/pkg-plist
--- collectd.orig/pkg-plist	2013-02-23 16:36:53.000000000 +0100
+++ collectd/pkg-plist	2013-08-07 00:31:50.000000000 +0200
@@ -61,6 +61,10 @@
 %%NGINX%%lib/collectd/nginx.so
 lib/collectd/network.la
 lib/collectd/network.so
+%%NOTIFYDESKTOP%%/notify_desktop.la
+%%NOTIFYDESKTOP%%/notify_desktop.so
+%%NOTIFYEMAIL%%/notify_email.la
+%%NOTIFYEMAIL%%/notify_email.so
 %%NUTUPS%%lib/collectd/nut.la
 %%NUTUPS%%lib/collectd/nut.so
 lib/collectd/ntpd.la
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vg 
Responsible-Changed-By: vg 
Responsible-Changed-When: Wed Aug 7 11:07:13 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181103 
State-Changed-From-To: open->closed 
State-Changed-By: vg 
State-Changed-When: Sat Aug 10 17:01:23 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181103 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181103: commit references a PR
Date: Sat, 10 Aug 2013 17:00:54 +0000 (UTC)

 Author: vg
 Date: Sat Aug 10 17:00:46 2013
 New Revision: 324556
 URL: http://svnweb.freebsd.org/changeset/ports/324556
 
 Log:
   - Added new options NOTIFYDESKTOP and NOTIFYEMAIL
   - Bump portrevision
   - BIND removed from default because depended by CURL option
   
   PR:		ports/181103
   Submitted by:	Krzysztof Stryjek <ports@bsdserwis.com>
   Approved by:	eadler (mentor)
 
 Modified:
   head/net-mgmt/collectd/Makefile
   head/net-mgmt/collectd/files/patch-src__Makefile.am   (contents, props changed)
   head/net-mgmt/collectd/pkg-plist
 
 Modified: head/net-mgmt/collectd/Makefile
 ==============================================================================
 --- head/net-mgmt/collectd/Makefile	Sat Aug 10 16:53:41 2013	(r324555)
 +++ head/net-mgmt/collectd/Makefile	Sat Aug 10 17:00:46 2013	(r324556)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	collectd
  PORTVERSION=	4.10.9
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	net-mgmt
  MASTER_SITES=	http://collectd.org/files/
  
 @@ -19,12 +19,12 @@ WANT_GNOME=	yes
  
  OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT LIBVIRT
  OPTIONS_GROUP=		INPUT OUTPUT
 -OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL
 +OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL NOTIFYDESKTOP
  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
 -OPTIONS_DEFAULT=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
 +OPTIONS_DEFAULT=	INTERFACE PING SNMP RRDTOOL RRDCACHED
  
  CGI_DESC=		Install collection.cgi (requires RRDTOOL)
  BIND_DESC=		Enable BIND 9.5+ statistics
 @@ -41,7 +41,8 @@ INTERFACE_DESC=		Network interfaces (lib
  MBMON_DESC=		MBMon
  MEMCACHED_DESC=		Memcached
  NGINX_DESC=		Nginx
 -NOTIFYEMAIL_DESC=	Email notifications (libesmtp, libnotify)
 +NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
 +NOTIFYDESKTOP_DESC=	Email notifications (libnotify)
  OPENVPN_DESC=		OpenVPN statistics
  PDNS_DESC=		PowerDNS
  PING_DESC=		Network latency (liboping)
 @@ -102,7 +103,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
  		--disable-netapp \
  		--disable-netlink \
  		--disable-nfs \
 -		--disable-notify_desktop \
  		--disable-olsrd \
  		--disable-onewire \
  		--disable-oracle \
 @@ -299,9 +299,16 @@ CONFIGURE_ARGS+=--disable-nginx
  PLIST_SUB+=	NGINX="@comment "
  .endif
  
 +.if ${PORT_OPTIONS:MNOTIFYDESKTOP}
 +LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 +CONFIGURE_ARGS+=--enable-notify_desktop \
 +PLIST_SUB+=	NOTIFYDESKTOP=""
 +.else
 +CONFIGURE_ARGS+=--disable-notify_desktop
 +PLIST_SUB+=	NOTIFYDESKTOP="@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=""
 
 Modified: head/net-mgmt/collectd/files/patch-src__Makefile.am
 ==============================================================================
 --- head/net-mgmt/collectd/files/patch-src__Makefile.am	Sat Aug 10 16:53:41 2013	(r324555)
 +++ head/net-mgmt/collectd/files/patch-src__Makefile.am	Sat Aug 10 17:00:46 2013	(r324556)
 @@ -1,5 +1,5 @@
 ---- src/Makefile.am.orig	2012-11-11 11:43:05.000000000 +0100
 -+++ src/Makefile.am	2012-12-30 23:34:44.000000000 +0100
 +--- src/Makefile.am.orig	2013-04-08 08:26:17.000000000 +0200
 ++++ src/Makefile.am	2013-08-07 00:23:31.036813410 +0200
  @@ -7,7 +7,7 @@
   endif
   
 @@ -9,6 +9,15 @@
   endif
   
   AM_CPPFLAGS = -DPREFIX='"${prefix}"'
 +@@ -720,7 +720,7 @@
 + pkglib_LTLIBRARIES += notify_email.la
 + notify_email_la_SOURCES = notify_email.c
 + notify_email_la_LDFLAGS = -module -avoid-version
 +-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
 ++notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
 + collectd_LDADD += "-dlopen" notify_email.la
 + collectd_DEPENDENCIES += notify_email.la
 + endif
  @@ -1198,7 +1198,7 @@
   zfs_arc_la_SOURCES = zfs_arc.c
   zfs_arc_la_CFLAGS = $(AM_CFLAGS)
 
 Modified: head/net-mgmt/collectd/pkg-plist
 ==============================================================================
 --- head/net-mgmt/collectd/pkg-plist	Sat Aug 10 16:53:41 2013	(r324555)
 +++ head/net-mgmt/collectd/pkg-plist	Sat Aug 10 17:00:46 2013	(r324556)
 @@ -61,6 +61,10 @@ lib/collectd/memory.so
  %%NGINX%%lib/collectd/nginx.so
  lib/collectd/network.la
  lib/collectd/network.so
 +%%NOTIFYDESKTOP%%/notify_desktop.la
 +%%NOTIFYDESKTOP%%/notify_desktop.so
 +%%NOTIFYEMAIL%%/notify_email.la
 +%%NOTIFYEMAIL%%/notify_email.so
  %%NUTUPS%%lib/collectd/nut.la
  %%NUTUPS%%lib/collectd/nut.so
  lib/collectd/ntpd.la
 _______________________________________________
 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"
 
>Unformatted:
