From owner-svn-ports-head@freebsd.org Fri Jul 19 18:11:04 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91E5FA888D; Fri, 19 Jul 2019 18:11:04 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7317280446; Fri, 19 Jul 2019 18:11:04 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B1E224E65; Fri, 19 Jul 2019 18:11:04 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6JIB4lx059556; Fri, 19 Jul 2019 18:11:04 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6JIB4kE059555; Fri, 19 Jul 2019 18:11:04 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201907191811.x6JIB4kE059555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Fri, 19 Jul 2019 18:11:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506956 - head/net-mgmt/collectd5 X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: head/net-mgmt/collectd5 X-SVN-Commit-Revision: 506956 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7317280446 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.944,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 19 Jul 2019 18:11:04 -0000 Author: romain Date: Fri Jul 19 18:11:03 2019 New Revision: 506956 URL: https://svnweb.freebsd.org/changeset/ports/506956 Log: net-mgmt/collectd5: Various fixes - Fix build when the CURL_XML option is enabled; - Fix activation/deactivation of a few plugins. PR: 238959 Submitted by: Krzysztof (maintainer) Reported by: Chip Cuccio Modified: head/net-mgmt/collectd5/Makefile Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Fri Jul 19 17:51:08 2019 (r506955) +++ head/net-mgmt/collectd5/Makefile Fri Jul 19 18:11:03 2019 (r506956) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/ PKGNAMESUFFIX= 5 @@ -84,27 +84,24 @@ LIBS+= -L${LOCALBASE}/lib # NOTE: Plugins without dependencies are defined further down. CONFIGURE_ARGS= --disable-all-plugins \ + --disable-amqp \ --disable-ceph \ --disable-cgroups \ --disable-fhcount \ + --disable-lvm \ --disable-static \ --disable-turbostat \ --enable-disk \ --localstatedir=/var \ - --without-amqp \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ - --without-libkstat \ --without-libldap \ --without-liblvm2app \ --without-libmnl \ --without-libnetapp \ - --without-libnetlink \ --without-libowcapi \ - --without-libperfstat \ --without-libsensors \ - --without-lvm \ --without-mic \ --without-oracle @@ -130,13 +127,13 @@ JAVA_CONFIGURE_ENABLE= java JAVA_CONFIGURE_WITH= java=${LOCALBASE} libjvm DBI_LIB_DEPENDS= libdbi.so:databases/libdbi -DBI_CONFIGURE_WITH= libdbi=${LOCALBASE} +DBI_CONFIGURE_ENABLE= libdbi=${LOCALBASE} DBI_CONFIGURE_ENABLE= dbi DBI_CFLAGS= -Wno-deprecated-declarations GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error -GCRYPT_CONFIGURE_WITH= -with-libgcrypt=${LOCALBASE} +GCRYPT_CONFIGURE_WITH= libgcrypt=${LOCALBASE} GCRYPT_LIBS= -lgcrypt IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi @@ -250,8 +247,9 @@ SIGROK_USE= GNOME=glib20 SIGROK_CFLAGS= `pkg-config --cflags glib-2.0` SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok SIGROK_CONFIGURE_ENABLE= sigrok -SIGROK_CONFIGURE_WITH= libsigrok +SIGROK_CONFIGURE_WITH= libsigrok=${LOCALBASE} SIGROK_USES= gettext-runtime +SIGROK_BROKEN= fails to configure with sigrok option SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp @@ -276,8 +274,9 @@ VIRT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ VIRT_CONFIGURE_ENABLE= virt VIRT_CONFIGURE_WITH= virt=${LOCALBASE} +XML_CFLAGS= `pkg-config --cflags libxml-2.0` XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 -XML_CONFIGURE_WITH= libxml2=${LOCALBASE} +XML_CONFIGURE_WITH= libxml2 ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper ZOOKEEPER_CONFIGURE_ENABLE= zookeeper