svn commit: r357205 - head/net-mgmt/collectd5

Steve Wills swills at FreeBSD.org
Mon Jun 9 20:43:42 UTC 2014 

Author: swills
Date: Mon Jun  9 20:43:42 2014
New Revision: 357205
URL: http://svnweb.freebsd.org/changeset/ports/357205
QAT: https://qat.redports.org/buildarchive/r357205/

Log:
  - Add perl support [1]
  - Convert to USES=libtool [2]
  - Add LICENSE and LICENSE_FILE [2]
  - Pet portlint [2]
  - Fix build with pkg_tools [2]
  
  PR:		189271 [1]
  Submitted by:	Kevin Bowling <kbowling at llnw.com> [1]
  Approved by:	Krzysztof Stryjek <ports at bsdserwis.com> (maintainer) [1]
  With hat:	portmgr@ [2]

Modified:
  head/net-mgmt/collectd5/Makefile
  head/net-mgmt/collectd5/pkg-plist

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Mon Jun  9 20:42:17 2014	(r357204)
+++ head/net-mgmt/collectd5/Makefile	Mon Jun  9 20:43:42 2014	(r357205)
@@ -3,17 +3,20 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.4.1
-PORTREVISION=	2
-PKGNAMESUFFIX=	5
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
+PKGNAMESUFFIX=	5
 
 MAINTAINER=	ports at bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
-USES=		gmake pkgconfig tar:bzip2
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake pkgconfig tar:bzip2 libtool
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal autoconf autoheader automake libltdl libtool
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake libltdl libtoolize
 
 # Only autoconf stage and sigrok plugin need GLIB:
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
@@ -22,7 +25,7 @@ OPTIONS_DEFINE=		CGI DEBUG GCRYPT VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
 OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
-			NUTUPS PGSQL PING PYTHON RABBITMQ REDIS \
+			NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \
 			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
@@ -38,6 +41,7 @@ MYSQL_DESC=		Enable mysql-based plugins
 NOTIFYEMAIL_DESC=	Enable notifications via email
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
 NUTUPS_DESC=		Enable nut (ups) plugin
+PERL_DESC=		Enable libperl plugin and binding
 PGSQL_DESC=		Enable postgresql-based plugins
 PING_DESC=		Enable ping plugin
 PYTHON_DESC=		Enable python-based plugins
@@ -63,6 +67,8 @@ CONFLICTS=	collectd-4.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PLIST_SUB+=	RESETPREFIX=${PREFIX}
+
 .include <bsd.port.options.mk>
 
 # NOTE: Plugins without dependencies are defined further down.
@@ -82,13 +88,11 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--without-libopenipmi \
 		--without-libowcapi \
 		--without-libperfstat \
-		--without-libperl \
 		--without-libsensors \
 		--without-libvarnish \
 		--without-lvm \
 		--without-mic \
-		--without-oracle \
-		--without-perl-bindings
+		--without-oracle
 
 # NOTE: Plugins without external dependencies
 CONFIGURE_ARGS+=	\
@@ -286,6 +290,15 @@ CONFIGURE_ARGS+=--without-libupsclient -
 PLIST_SUB+=	NUTUPS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPERL}
+USES+=		perl5
+CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl
+PLIST_SUB+=	PERL=""
+.else
+CONFIGURE_ARGS+=--without-perl --without-perl-bindings --disable-perl
+PLIST_SUB+=	PERL="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq
@@ -371,7 +384,7 @@ PLIST_SUB+=	RRDTOOL="@comment "
 .if ${PORT_OPTIONS:MSTATGRAB}
 USES+=		pkgconfig
 LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
-CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`"
+CONFIGURE_ENV+=	LIBS="`pkg-config --libs libstatgrab`"
 CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
 		--enable-disk \
 		--enable-interface
@@ -383,22 +396,22 @@ PLIST_SUB+=	STATGRAB="@comment "
 
 .if ${OSVERSION} >= 900007
 CONFIGURE_ARGS+=--enable-users
-PLIST_SUB+= USERS=""
+PLIST_SUB+=	USERS=""
 .elif ${PORT_OPTIONS:MSTATGRAB}
 CONFIGURE_ARGS+=--enable-users
-PLIST_SUB+= USERS=""
+PLIST_SUB+=	USERS=""
 .else
-PLIST_SUB+= USERS="@comment "
+PLIST_SUB+=	USERS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSIGROK}
 USE_GNOME+=	glib20
 LIB_DEPENDS+=	libsigrok.so:${PORTSDIR}/devel/libsigrok
 CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok
-PLIST_SUB+=     SIGROK=""
+PLIST_SUB+=	SIGROK=""
 .else
 CONFIGURE_ARGS+=--disable-sigrok
-PLIST_SUB+=     SIGROK="@comment "
+PLIST_SUB+=	SIGROK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
@@ -475,4 +488,9 @@ post-install:
 		${STAGEDIR}${WWWDIR}/collection.conf.sample
 .endif
 
+post-stage:
+.if ${PORT_OPTIONS:MPERL}
+	@${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Collectd/.packlist
+.endif
+
 .include <bsd.port.mk>

Modified: head/net-mgmt/collectd5/pkg-plist
==============================================================================
--- head/net-mgmt/collectd5/pkg-plist	Mon Jun  9 20:42:17 2014	(r357204)
+++ head/net-mgmt/collectd5/pkg-plist	Mon Jun  9 20:43:42 2014	(r357205)
@@ -16,238 +16,94 @@ include/collectd/client.h
 include/collectd/lcc_features.h
 include/collectd/network.h
 include/collectd/network_buffer.h
-lib/collectd/aggregation.a
 lib/collectd/aggregation.so
-lib/collectd/aggregation.la
-%%CURL%%lib/collectd/apache.a
 %%CURL%%lib/collectd/apache.so
-%%CURL%%lib/collectd/apache.la
-lib/collectd/apcups.a
 lib/collectd/apcups.so
-lib/collectd/apcups.la
-%%CURL_XML%%lib/collectd/ascent.a
 %%CURL_XML%%lib/collectd/ascent.so
-%%CURL_XML%%lib/collectd/ascent.la
-%%CURL_XML%%lib/collectd/bind.a
 %%CURL_XML%%lib/collectd/bind.so
-%%CURL_XML%%lib/collectd/bind.la
-lib/collectd/contextswitch.a
 lib/collectd/contextswitch.so
-lib/collectd/contextswitch.la
-lib/collectd/cpu.a
 lib/collectd/cpu.so
-lib/collectd/cpu.la
-lib/collectd/csv.a
 lib/collectd/csv.so
-lib/collectd/csv.la
-%%CURL%%lib/collectd/curl.a
 %%CURL%%lib/collectd/curl.so
-%%CURL%%lib/collectd/curl.la
-%%CURL_JSON%%lib/collectd/curl_json.a
 %%CURL_JSON%%lib/collectd/curl_json.so
-%%CURL_JSON%%lib/collectd/curl_json.la
-%%CURL_XML%%lib/collectd/curl_xml.a
 %%CURL_XML%%lib/collectd/curl_xml.so
-%%CURL_XML%%lib/collectd/curl_xml.la
-%%DBI%%lib/collectd/dbi.a
 %%DBI%%lib/collectd/dbi.so
-%%DBI%%lib/collectd/dbi.la
-lib/collectd/df.a
 lib/collectd/df.so
-lib/collectd/df.la
-%%STATGRAB%%lib/collectd/disk.a
 %%STATGRAB%%lib/collectd/disk.so
-%%STATGRAB%%lib/collectd/disk.la
-lib/collectd/dns.a
 lib/collectd/dns.so
-lib/collectd/dns.la
-lib/collectd/email.a
 lib/collectd/email.so
-lib/collectd/email.la
-lib/collectd/exec.a
 lib/collectd/exec.so
-lib/collectd/exec.la
-lib/collectd/filecount.a
 lib/collectd/filecount.so
-lib/collectd/filecount.la
-%%STATGRAB%%lib/collectd/interface.a
 %%STATGRAB%%lib/collectd/interface.so
-%%STATGRAB%%lib/collectd/interface.la
-lib/collectd/load.a
 lib/collectd/load.so
-lib/collectd/load.la
-lib/collectd/logfile.a
 lib/collectd/logfile.so
-lib/collectd/logfile.la
-lib/collectd/match_empty_counter.a
 lib/collectd/match_empty_counter.so
-lib/collectd/match_empty_counter.la
-lib/collectd/match_hashed.a
 lib/collectd/match_hashed.so
-lib/collectd/match_hashed.la
-lib/collectd/match_regex.a
 lib/collectd/match_regex.so
-lib/collectd/match_regex.la
-lib/collectd/match_timediff.a
 lib/collectd/match_timediff.so
-lib/collectd/match_timediff.la
-lib/collectd/match_value.a
 lib/collectd/match_value.so
-lib/collectd/match_value.la
-lib/collectd/mbmon.a
 lib/collectd/mbmon.so
-lib/collectd/mbmon.la
-%%MEMCACHEC%%lib/collectd/memcachec.a
 %%MEMCACHEC%%lib/collectd/memcachec.so
-%%MEMCACHEC%%lib/collectd/memcachec.la
-lib/collectd/memcached.a
 lib/collectd/memcached.so
-lib/collectd/memcached.la
-lib/collectd/memory.a
 lib/collectd/memory.so
-lib/collectd/memory.la
-%%MYSQL%%lib/collectd/mysql.a
 %%MYSQL%%lib/collectd/mysql.so
-%%MYSQL%%lib/collectd/mysql.la
-lib/collectd/network.a
 lib/collectd/network.so
-lib/collectd/network.la
-%%CURL%%lib/collectd/nginx.a
 %%CURL%%lib/collectd/nginx.so
-%%CURL%%lib/collectd/nginx.la
-lib/collectd/ntpd.a
 lib/collectd/ntpd.so
-lib/collectd/ntpd.la
-%%NUTUPS%%lib/collectd/nut.a
 %%NUTUPS%%lib/collectd/nut.so
-%%NUTUPS%%lib/collectd/nut.la
-lib/collectd/openvpn.a
 lib/collectd/openvpn.so
-lib/collectd/openvpn.la
-%%PING%%lib/collectd/ping.a
+%%PERL%%lib/collectd/perl.so
+%%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod.gz
+%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz
+%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm
 %%PING%%lib/collectd/ping.so
-%%PING%%lib/collectd/ping.la
-%%PGSQL%%lib/collectd/postgresql.a
 %%PGSQL%%lib/collectd/postgresql.so
-%%PGSQL%%lib/collectd/postgresql.la
-lib/collectd/powerdns.a
 lib/collectd/powerdns.so
-lib/collectd/powerdns.la
-lib/collectd/pf.a
 lib/collectd/pf.so
-lib/collectd/pf.la
-lib/collectd/processes.a
 lib/collectd/processes.so
-lib/collectd/processes.la
-%%PYTHON%%lib/collectd/python.a
-%%PYTHON%%lib/collectd/python.la
 %%PYTHON%%lib/collectd/python.so
-%%REDIS%%lib/collectd/redis.a
 %%REDIS%%lib/collectd/redis.so
-%%REDIS%%lib/collectd/redis.la
-%%ROUTEROS%%lib/collectd/routeros.a
 %%ROUTEROS%%lib/collectd/routeros.so
-%%ROUTEROS%%lib/collectd/routeros.la
-%%RRDTOOL%%lib/collectd/rrdcached.a
 %%RRDTOOL%%lib/collectd/rrdcached.so
-%%RRDTOOL%%lib/collectd/rrdcached.la
-%%RRDTOOL%%lib/collectd/rrdtool.a
 %%RRDTOOL%%lib/collectd/rrdtool.so
-%%RRDTOOL%%lib/collectd/rrdtool.la
-%%SIGROK%%lib/collectd/sigrok.a
-%%SIGROK%%lib/collectd/sigrok.la
 %%SIGROK%%lib/collectd/sigrok.so
-%%SNMP%%lib/collectd/snmp.a
 %%SNMP%%lib/collectd/snmp.so
-%%SNMP%%lib/collectd/snmp.la
-lib/collectd/statsd.a
 lib/collectd/statsd.so
-lib/collectd/statsd.la
-lib/collectd/swap.a
 lib/collectd/swap.so
-lib/collectd/swap.la
-lib/collectd/syslog.a
 lib/collectd/syslog.so
-lib/collectd/syslog.la
-lib/collectd/table.a
 lib/collectd/table.so
-lib/collectd/table.la
-lib/collectd/tail.a
 lib/collectd/tail.so
-lib/collectd/tail.la
-lib/collectd/target_notification.a
 lib/collectd/target_notification.so
-lib/collectd/target_notification.la
-lib/collectd/target_replace.a
 lib/collectd/target_replace.so
-lib/collectd/target_replace.la
-lib/collectd/target_scale.a
 lib/collectd/target_scale.so
-lib/collectd/target_scale.la
-lib/collectd/target_set.a
 lib/collectd/target_set.so
-lib/collectd/target_set.la
-lib/collectd/target_v5upgrade.a
 lib/collectd/target_v5upgrade.so
-lib/collectd/target_v5upgrade.la
-lib/collectd/tcpconns.a
 lib/collectd/tcpconns.so
-lib/collectd/tcpconns.la
-lib/collectd/teamspeak2.a
 lib/collectd/teamspeak2.so
-lib/collectd/teamspeak2.la
-lib/collectd/ted.a
 lib/collectd/ted.so
-lib/collectd/ted.la
-lib/collectd/threshold.a
 lib/collectd/threshold.so
-lib/collectd/threshold.la
-%%TOKYOTYRANT%%lib/collectd/tokyotyrant.a
 %%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
-%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
-lib/collectd/unixsock.a
 lib/collectd/unixsock.so
-lib/collectd/unixsock.la
-lib/collectd/uptime.a
 lib/collectd/uptime.so
-lib/collectd/uptime.la
-%%USERS%%lib/collectd/users.a
 %%USERS%%lib/collectd/users.so
-%%USERS%%lib/collectd/users.la
-lib/collectd/uuid.a
 lib/collectd/uuid.so
-lib/collectd/uuid.la
-%%VIRT%%lib/collectd/libvirt.a
 %%VIRT%%lib/collectd/libvirt.so
-%%VIRT%%lib/collectd/libvirt.la
-lib/collectd/write_graphite.a
 lib/collectd/write_graphite.so
-lib/collectd/write_graphite.la
-%%CURL%%lib/collectd/write_http.a
 %%CURL%%lib/collectd/write_http.so
-%%CURL%%lib/collectd/write_http.la
-%%MONGODB%%lib/collectd/write_mongodb.a
 %%MONGODB%%lib/collectd/write_mongodb.so
-%%MONGODB%%lib/collectd/write_mongodb.la
-%%REDIS%%lib/collectd/write_redis.a
 %%REDIS%%lib/collectd/write_redis.so
-%%REDIS%%lib/collectd/write_redis.la
-%%RIEMANN%%lib/collectd/write_riemann.a
 %%RIEMANN%%lib/collectd/write_riemann.so
-%%RIEMANN%%lib/collectd/write_riemann.la
-%%XMMS%%lib/collectd/xmms.a
 %%XMMS%%lib/collectd/xmms.so
-%%XMMS%%lib/collectd/xmms.la
-lib/collectd/zfs_arc.a
 lib/collectd/zfs_arc.so
-lib/collectd/zfs_arc.la
-lib/libcollectdclient.la
-lib/libcollectdclient.a
 lib/libcollectdclient.so
 lib/libcollectdclient.so.1
+lib/libcollectdclient.so.1.0.0
 libdata/pkgconfig/libcollectdclient.pc
 %%DATADIR%%/postgresql_default.conf
 %%DATADIR%%/types.db
+%%PERL%%%%SITE_PERL%%/Collectd.pm
+%%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Collectd/.packlist
 man/man1/collectd-nagios.1.gz
 man/man1/collectd-tg.1.gz
 man/man1/collectd.1.gz
@@ -266,6 +122,12 @@ man/man5/types.db.5.gz
 @dirrm lib/collectd
 @dirrm include/collectd
 @dirrm %%DATADIR%%
+%%PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Collectd
+%%PERL%%@dirrmtry %%SITE_PERL%%/Collectd/Plugins
+%%PERL%%@dirrmtry %%SITE_PERL%%/Collectd
 @exec mkdir -p /var/db/collectd
 @cwd /
- at dirrmtry /var/db/collectd
+ at dirrmtry var/db/collectd
+ at dirrmtry var/lib/collectd
+ at dirrmtry var/lib
+ at cwd %%RESETPREFIX%%

More information about the svn-ports-all mailing list