Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Apr 2010 07:40:06 GMT
From:      Krzysztof Stryjek <wtp@bsdserwis.com>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/145239: net-mgmt/collectd update to new version
Message-ID:  <201004010740.o317e6um008689@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/145239; it has been noted by GNATS.

From: Krzysztof Stryjek <wtp@bsdserwis.com>
To: bug-followup@FreeBSD.org, ports@bsdserwis.com
Cc:  
Subject: Re: ports/145239: net-mgmt/collectd update to new version
Date: Thu, 1 Apr 2010 09:19:25 +0200

 --CdrF4e02JqNVZeln
 Content-Type: text/plain; charset=iso-8859-2
 Content-Disposition: inline
 
 As current maintainer asked, I'm attaching diff -ruN of collectd
 directory
 
 Greetings,
 -- 
 Krzysztof Stryjek
 UNIX administrator/Juniper Networks Specialist
 email: wtp (at) bsdserwis (dot) com
 http://www.linkedin.com/in/KrzysztofStryjek
 GPG fingerprint: 8BD7 40CE 8994 0BBE CE6C  91CD 1292 8959 DC61 0E76
 
 In theory, there is no difference between theory and practice.
 In practice, there is.
 
 --CdrF4e02JqNVZeln
 Content-Type: text/x-diff; charset=iso-8859-2
 Content-Disposition: attachment; filename="_collectd.patch"
 
 diff -ruN collectd.orig/Makefile collectd/Makefile
 --- collectd.orig/Makefile	2010-03-28 08:41:51.000000000 +0200
 +++ collectd/Makefile	2010-04-01 09:04:46.000000000 +0200
 @@ -6,13 +6,11 @@
  #
  
  PORTNAME=	collectd
 -PORTVERSION=	4.5.1
 -PORTREVISION=	2
 +PORTVERSION=	4.9.1
  CATEGORIES=	net-mgmt
 -MASTER_SITES=	http://collectd.org/files/ \
 -		http://mirror.roe.ch/dist/${PORTNAME}/
 +MASTER_SITES=	http://collectd.org/files/
  
 -MAINTAINER=	daniel@roe.ch
 +MAINTAINER=	ports@bsdserwis.com
  COMMENT=	Systems & network statistics collection daemon
  
  USE_GMAKE=	yes
 @@ -23,10 +21,14 @@
  		DEBUG	"Enable debugging" Off \
  		APACHE	"Input: Apache mod_status (libcurl)" Off \
  		APCUPS	"Input: APC UPS (apcupsd)" Off \
 +		CURL	"Input: CURL generic web statistics" Off \
  		NUTUPS	"Input: NUT UPS daemon" Off \
  		INTERFACE "Input: Network interfaces (libstatgrab)" On \
  		MBMON	"Input: MBMon" Off \
  		MYSQL	"Input: MySQL" Off \
 +		NGINX	"Input: Nginx" Off \
 +		PDNS	"Input: PowerDNS" Off \
 +		PGSQL	"Input: PostgreSQL" Off \
  		PING	"Input: Network latency (liboping)" On \
  		SNMP	"Input: SNMP" On \
  		XMMS	"Input: XMMS" Off \
 @@ -53,35 +55,66 @@
  #       these are Linux specific, but others will probably run on
  #       FreeBSD as well, given a bit of careful attention.
  CONFIGURE_ARGS=	--localstatedir=/var \
 +		--disable-getifaddrs \
  		--disable-apple_sensors \
  		--disable-ascent \
  		--disable-battery \
 +		--disable-bind \
 +		--disable-conntrack \
 +		--disable-contextswitch \
  		--disable-cpufreq \
 +		--disable-curl_json \
 +		--disable-dbi \
  		--disable-disk \
  		--disable-entropy \
 +		--disable-fscache \
 +		--disable-gmond \
  		--disable-hddtemp \
  		--disable-iptables \
  		--disable-ipmi \
  		--disable-ipvs \
  		--disable-irq \
 +		--disable-java \
  		--disable-libvirt \
 +		--disable-madwifi \
 +		--disable-match_empty_counter \
 +		--disable-match_hashed \
 +		--disable-match_regex \
 +		--disable-match_timediff \
 +		--disable-match_value \
 +		--disable-memcachec \
  		--disable-multimeter \
 +		--disable-netapp \
  		--disable-netlink \
  		--disable-nfs \
 -		--disable-nginx \
  		--disable-notify_desktop \
  		--disable-notify_email \
 +		--disable-olsrd \
  		--disable-onewire \
 +		--disable-openvpn \
 +		--disable-oracle \
  		--disable-perl \
 -		--disable-postgresql \
 +		--disable-python \
 +		--disable-protocols \
 +		--disable-routeros \
 +		--disable-rrdcached \
  		--disable-sensors \
  		--disable-serial \
 +		--disable-table \
  		--disable-tape \
 +		--disable-target_notification \
 +		--disable-target_replace \
 +		--disable-target_scale \
 +		--disable-target_set \
 +		--disable-ted \
  		--disable-thermal \
 +		--disable-tokyotyrant \
  		--disable-users \
  		--disable-vmem \
  		--disable-vserver \
  		--disable-wireless \
 +		--disable-write_http \
 +		--disable-zfs_arc \
  		--without-perl-bindings
  
  .if defined(WITH_DEBUG)
 @@ -115,6 +148,16 @@
  PLIST_SUB+=	APCUPS="@comment "
  .endif
  
 +.if defined(WITH_CURL)
 +CONFIGURE_ARGS+=--enable-curl
 +LIB_DEPENDS+=   curl:${PORTSDIR}/ftp/curl
 +CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 +PLIST_SUB+=	CURL=""
 +.else
 +CONFIGURE_ARGS+=--disable-curl
 +PLIST_SUB+=	CURL="@comment "
 +.endif
 +
  .if defined(WITH_NUTUPS)
  CONFIGURE_ARGS+=--enable-nut
  BUILD_DEPENDS+=	${LOCALBASE}/include/upsclient.h:${PORTSDIR}/sysutils/nut
 @@ -153,6 +196,34 @@
  PLIST_SUB+=	MYSQL="@comment "
  .endif
  
 +.if defined(WITH_NGINX)
 +USE_NGINX=	yes
 +LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
 +CONFIGURE_ARGS+=--enable-nginx
 +PLIST_SUB+=	NGINX=""
 +.else
 +CONFIGURE_ARGS+=--disable-nginx
 +PLIST_SUB+=	NGINX="@comment "
 +.endif
 +
 +.if defined(WITH_PDNS)
 +USE_PDNS=	yes
 +CONFIGURE_ARGS+=--enable-powerdns
 +PLIST_SUB+=	PDNS=""
 +.else
 +CONFIGURE_ARGS+=--disable-powerdns
 +PLIST_SUB+=	PDNS="@comment "
 +.endif
 +
 +.if defined(WITH_PGSQL)
 +USE_PGSQL=	yes
 +CONFIGURE_ARGS+=--enable-postgresql
 +PLIST_SUB+=	PGSQL=""
 +.else
 +CONFIGURE_ARGS+=--disable-postgresql
 +PLIST_SUB+=	PGSQL="@comment "
 +.endif
 +
  .if defined(WITH_PING)
  LIB_DEPENDS+=	oping:${PORTSDIR}/net/liboping
  CONFIGURE_ARGS+=--enable-ping
 diff -ruN collectd.orig/distinfo collectd/distinfo
 --- collectd.orig/distinfo	2008-11-01 23:19:09.000000000 +0100
 +++ collectd/distinfo	2010-04-01 09:05:00.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (collectd-4.5.1.tar.gz) = ab900d15662859b8793abf99eda15c29
 -SHA256 (collectd-4.5.1.tar.gz) = 9ab967b7909d9c229cfcd4d1a5503da42f38a1246a53fc5cfaaf1dfde6fae8a1
 -SIZE (collectd-4.5.1.tar.gz) = 1279434
 +MD5 (collectd-4.9.1.tar.gz) = 31a63d8e3a796dee247024f70426ed1c
 +SHA256 (collectd-4.9.1.tar.gz) = 7c746795b5b796dfd591c662b35b394e505ec4e6ccabaeebec4ab473743561bc
 +SIZE (collectd-4.9.1.tar.gz) = 1687106
 diff -ruN collectd.orig/pkg-plist collectd/pkg-plist
 --- collectd.orig/pkg-plist	2009-09-24 16:25:51.000000000 +0200
 +++ collectd/pkg-plist	2010-04-01 09:04:50.000000000 +0200
 @@ -10,72 +10,116 @@
  %%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi
  %%CGI%%@dirrmtry %%WWWDIR%%
  bin/collectd-nagios
 -lib/collectd/types.db
 +%%APACHE%%lib/collectd/apache.a
  %%APACHE%%lib/collectd/apache.la
  %%APACHE%%lib/collectd/apache.so
 +%%APCUPS%%lib/collectd/apcups.a
  %%APCUPS%%lib/collectd/apcups.la
  %%APCUPS%%lib/collectd/apcups.so
 +lib/collectd/cpu.a
  lib/collectd/cpu.la
  lib/collectd/cpu.so
 +lib/collectd/csv.a
  lib/collectd/csv.la
  lib/collectd/csv.so
 +%%CURL%%lib/collectd/curl.a
 +%%CURL%%lib/collectd/curl.la
 +%%CURL%%lib/collectd/curl.so
 +lib/collectd/df.a
  lib/collectd/df.la
  lib/collectd/df.so
 +lib/collectd/dns.a
  lib/collectd/dns.la
  lib/collectd/dns.so
 +lib/collectd/email.a
  lib/collectd/email.la
  lib/collectd/email.so
 +lib/collectd/exec.a
  lib/collectd/exec.la
  lib/collectd/exec.so
  lib/collectd/filecount.so
  lib/collectd/filecount.la
 +lib/collectd/filecount.a
 +%%INTERFACE%%lib/collectd/interface.a
  %%INTERFACE%%lib/collectd/interface.la
  %%INTERFACE%%lib/collectd/interface.so
 +lib/collectd/load.a
  lib/collectd/load.la
  lib/collectd/load.so
 +lib/collectd/logfile.a
  lib/collectd/logfile.la
  lib/collectd/logfile.so
 +%%MBMON%%lib/collectd/mbmon.a
  %%MBMON%%lib/collectd/mbmon.la
  %%MBMON%%lib/collectd/mbmon.so
  lib/collectd/memcached.so
  lib/collectd/memcached.la
 +lib/collectd/memcached.a
 +lib/collectd/memory.a
  lib/collectd/memory.la
  lib/collectd/memory.so
 +%%MYSQL%%lib/collectd/mysql.a
  %%MYSQL%%lib/collectd/mysql.la
  %%MYSQL%%lib/collectd/mysql.so
 +%%NGINX%%lib/collectd/nginx.a
 +%%NGINX%%lib/collectd/nginx.la
 +%%NGINX%%lib/collectd/nginx.so
 +lib/collectd/network.a
  lib/collectd/network.la
  lib/collectd/network.so
 +%%NUTUPS%%lib/collectd/nut.a
  %%NUTUPS%%lib/collectd/nut.la
  %%NUTUPS%%lib/collectd/nut.so
 +lib/collectd/ntpd.a
  lib/collectd/ntpd.la
  lib/collectd/ntpd.so
 +%%PGSQL%%lib/collectd/postgresql.a
 +%%PGSQL%%lib/collectd/postgresql.la
 +%%PGSQL%%lib/collectd/postgresql.so
 +%%PING%%lib/collectd/ping.a
  %%PING%%lib/collectd/ping.la
  %%PING%%lib/collectd/ping.so
 -lib/collectd/powerdns.so
 -lib/collectd/powerdns.la
 +%%PDNS%%lib/collectd/powerdns.so
 +%%PDNS%%lib/collectd/powerdns.a
 +%%PDNS%%lib/collectd/powerdns.la
  lib/collectd/processes.so
  lib/collectd/processes.la
 +lib/collectd/processes.a
 +%%RRD%%lib/collectd/rrdtool.a
  %%RRD%%lib/collectd/rrdtool.la
  %%RRD%%lib/collectd/rrdtool.so
 +%%SNMP%%lib/collectd/snmp.a
  %%SNMP%%lib/collectd/snmp.la
  %%SNMP%%lib/collectd/snmp.so
 +lib/collectd/swap.a
  lib/collectd/swap.la
  lib/collectd/swap.so
 +lib/collectd/syslog.a
  lib/collectd/syslog.la
  lib/collectd/syslog.so
  lib/collectd/tail.so
  lib/collectd/tail.la
 +lib/collectd/tail.a
  lib/collectd/tcpconns.so
  lib/collectd/tcpconns.la
 +lib/collectd/tcpconns.a
  lib/collectd/teamspeak2.so
  lib/collectd/teamspeak2.la
 +lib/collectd/teamspeak2.a
 +lib/collectd/unixsock.a
  lib/collectd/unixsock.la
  lib/collectd/unixsock.so
 +lib/collectd/uptime.so
 +lib/collectd/uptime.la
 +lib/collectd/uptime.a
  lib/collectd/uuid.so
  lib/collectd/uuid.la
 +lib/collectd/uuid.a
 +%%XMMS%%lib/collectd/xmms.a
  %%XMMS%%lib/collectd/xmms.la
  %%XMMS%%lib/collectd/xmms.so
  share/collectd/postgresql_default.conf
 +share/collectd/types.db
  @dirrm lib/collectd
  @dirrm share/collectd
  @exec mkdir -p /var/db/collectd
 
 --CdrF4e02JqNVZeln--



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