From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 2 23:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org 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 ESMTPS id F3E3D994 for ; Fri, 2 May 2014 23:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0BDC17C8 for ; Fri, 2 May 2014 23:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s42NU0ss016214 for ; Fri, 2 May 2014 23:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s42NU0es016213; Fri, 2 May 2014 23:30:00 GMT (envelope-from gnats) Resent-Date: Fri, 2 May 2014 23:30:00 GMT Resent-Message-Id: <201405022330.s42NU0es016213@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kevin Bowling Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D907D816 for ; Fri, 2 May 2014 23:20:45 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C6DEB172C for ; Fri, 2 May 2014 23:20:45 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s42NKjI1071477 for ; Fri, 2 May 2014 23:20:45 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s42NKjB4071470; Fri, 2 May 2014 23:20:45 GMT (envelope-from nobody) Message-Id: <201405022320.s42NKjB4071470@cgiserv.freebsd.org> Date: Fri, 2 May 2014 23:20:45 GMT From: Kevin Bowling To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189271: [PATCH] net-mgmt/collectd5: Add perl support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 May 2014 23:30:01 -0000 >Number: 189271 >Category: ports >Synopsis: [PATCH] net-mgmt/collectd5: Add perl support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 02 23:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Kevin Bowling >Release: >Organization: Limelight Networks >Environment: FreeBSD phx8-kev 10.0-RELEASE-p9 FreeBSD 10.0-RELEASE-p9 #0: Tue Apr 8 21:08:42 UTC 2014 root@amd64-builder.pcbsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This patch adds the perl plugin and binding to net-mgmt/collectd5. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.1 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 5 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -22,7 +22,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 +38,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 @@ -82,13 +83,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 +285,15 @@ CONFIGURE_ARGS+=--without-libupsclient --disable-nut 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 diff --git a/pkg-plist b/pkg-plist Index: pkg-plist =================================================================== --- a/pkg-plist +++ b/pkg-plist @@ -124,6 +124,9 @@ lib/collectd/ntpd.la lib/collectd/openvpn.a lib/collectd/openvpn.so lib/collectd/openvpn.la +%%PERL%%lib/collectd/perl.a +%%PERL%%lib/collectd/perl.so +%%PERL%%lib/collectd/perl.la %%PING%%lib/collectd/ping.a %%PING%%lib/collectd/ping.so %%PING%%lib/collectd/ping.la @@ -248,6 +251,9 @@ lib/libcollectdclient.so.1 libdata/pkgconfig/libcollectdclient.pc %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db +%%SITE_PERL%%/Collectd.pm +%%SITE_PERL%%/Collectd/Unixsock.pm +%%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 +272,9 @@ man/man5/types.db.5.gz @dirrm lib/collectd @dirrm include/collectd @dirrm %%DATADIR%% +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Collectd +@dirrmtry %%SITE_PERL%%/Collectd/Plugins +@dirrmtry %%SITE_PERL%%/Collectd @exec mkdir -p /var/db/collectd @cwd / @dirrmtry /var/db/collectd >Release-Note: >Audit-Trail: >Unformatted: