- Update to 4.10.3 [1]
While here, pacify portlint by removing CPPFLAGS from CONFIGURE_ENV; the former is passed to underlying configure scripts via bsd.port.mk. PR: ports/156943 [1] Submitted by: Benjamin Lee <ben@b1c1l1.com> Approved by: Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)
This commit is contained in:
Sahil Tandon
parent
10ce60facd
commit
c2e9b4e7ea
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=274207
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= collectd
|
||||
PORTVERSION= 4.9.5
|
||||
PORTVERSION= 4.10.3
|
||||
CATEGORIES= net-mgmt
|
||||
MASTER_SITES= http://collectd.org/files/
|
||||
|
||||
@ -24,6 +24,8 @@ OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \
|
||||
APACHE "Input: Apache mod_status (libcurl)" Off \
|
||||
APCUPS "Input: APC UPS (apcupsd)" Off \
|
||||
CURL "Input: CURL generic web statistics" Off \
|
||||
CURL_JSON "Input: CURL JSON generic web statistics" Off \
|
||||
CURL_XML "Input: CURL XML generic web statistics" Off \
|
||||
DBI "Input: database abstraction library" Off \
|
||||
DISK "Input: Disk performance statistics" Off \
|
||||
NUTUPS "Input: NUT UPS daemon" Off \
|
||||
@ -47,8 +49,9 @@ USE_RC_SUBR= collectd collectdmon
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CPPFLAGS= -I${LOCALBASE}/include
|
||||
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
@ -73,7 +76,6 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-conntrack \
|
||||
--disable-contextswitch \
|
||||
--disable-cpufreq \
|
||||
--disable-curl_json \
|
||||
--disable-entropy \
|
||||
--disable-fscache \
|
||||
--disable-gmond \
|
||||
@ -91,6 +93,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-match_timediff \
|
||||
--disable-match_value \
|
||||
--disable-memcachec \
|
||||
--disable-modbus \
|
||||
--disable-multimeter \
|
||||
--disable-netapp \
|
||||
--disable-netlink \
|
||||
@ -101,6 +104,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-onewire \
|
||||
--disable-oracle \
|
||||
--disable-perl \
|
||||
--disable-pinba \
|
||||
--disable-python \
|
||||
--disable-protocols \
|
||||
--disable-routeros \
|
||||
@ -185,6 +189,30 @@ CONFIGURE_ARGS+=--disable-curl
|
||||
PLIST_SUB+= CURL="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CURL_JSON)
|
||||
.if !defined(WITH_CURL)
|
||||
IGNORE= using CURL_JSON requires CURL support
|
||||
.endif
|
||||
CONFIGURE_ARGS+=--enable-curl_json
|
||||
LIB_DEPENDS+= yajl:${PORTSDIR}/devel/yajl
|
||||
PLIST_SUB+= CURL_JSON=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-curl_json
|
||||
PLIST_SUB+= CURL_JSON="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CURL_XML)
|
||||
.if !defined(WITH_CURL)
|
||||
IGNORE= using CURL_XML requires CURL support
|
||||
.endif
|
||||
CONFIGURE_ARGS+=--enable-curl_xml
|
||||
LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
|
||||
PLIST_SUB+= CURL_XML=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-curl_xml
|
||||
PLIST_SUB+= CURL_XML="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DBI)
|
||||
CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
|
||||
LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (collectd-4.9.5.tar.gz) = a9ea4aabc2a65ecbf8bc1ed80d4510b40e188b82dec4ba232582880072b02359
|
||||
SIZE (collectd-4.9.5.tar.gz) = 1701068
|
||||
SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033
|
||||
SIZE (collectd-4.10.3.tar.gz) = 1743443
|
||||
|
||||
@ -25,6 +25,10 @@ lib/collectd/csv.la
|
||||
lib/collectd/csv.so
|
||||
%%CURL%%lib/collectd/curl.la
|
||||
%%CURL%%lib/collectd/curl.so
|
||||
%%CURL_JSON%%lib/collectd/curl_json.la
|
||||
%%CURL_JSON%%lib/collectd/curl_json.so
|
||||
%%CURL_XML%%lib/collectd/curl_xml.la
|
||||
%%CURL_XML%%lib/collectd/curl_xml.so
|
||||
%%DBI%%lib/collectd/dbi.la
|
||||
%%DBI%%lib/collectd/dbi.so
|
||||
%%DISK%%lib/collectd/disk.la
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= collectd
|
||||
PORTVERSION= 4.9.5
|
||||
PORTVERSION= 4.10.3
|
||||
CATEGORIES= net-mgmt
|
||||
MASTER_SITES= http://collectd.org/files/
|
||||
|
||||
@ -24,6 +24,8 @@ OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \
|
||||
APACHE "Input: Apache mod_status (libcurl)" Off \
|
||||
APCUPS "Input: APC UPS (apcupsd)" Off \
|
||||
CURL "Input: CURL generic web statistics" Off \
|
||||
CURL_JSON "Input: CURL JSON generic web statistics" Off \
|
||||
CURL_XML "Input: CURL XML generic web statistics" Off \
|
||||
DBI "Input: database abstraction library" Off \
|
||||
DISK "Input: Disk performance statistics" Off \
|
||||
NUTUPS "Input: NUT UPS daemon" Off \
|
||||
@ -47,8 +49,9 @@ USE_RC_SUBR= collectd collectdmon
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CPPFLAGS= -I${LOCALBASE}/include
|
||||
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
@ -73,7 +76,6 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-conntrack \
|
||||
--disable-contextswitch \
|
||||
--disable-cpufreq \
|
||||
--disable-curl_json \
|
||||
--disable-entropy \
|
||||
--disable-fscache \
|
||||
--disable-gmond \
|
||||
@ -91,6 +93,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-match_timediff \
|
||||
--disable-match_value \
|
||||
--disable-memcachec \
|
||||
--disable-modbus \
|
||||
--disable-multimeter \
|
||||
--disable-netapp \
|
||||
--disable-netlink \
|
||||
@ -101,6 +104,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--disable-onewire \
|
||||
--disable-oracle \
|
||||
--disable-perl \
|
||||
--disable-pinba \
|
||||
--disable-python \
|
||||
--disable-protocols \
|
||||
--disable-routeros \
|
||||
@ -185,6 +189,30 @@ CONFIGURE_ARGS+=--disable-curl
|
||||
PLIST_SUB+= CURL="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CURL_JSON)
|
||||
.if !defined(WITH_CURL)
|
||||
IGNORE= using CURL_JSON requires CURL support
|
||||
.endif
|
||||
CONFIGURE_ARGS+=--enable-curl_json
|
||||
LIB_DEPENDS+= yajl:${PORTSDIR}/devel/yajl
|
||||
PLIST_SUB+= CURL_JSON=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-curl_json
|
||||
PLIST_SUB+= CURL_JSON="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CURL_XML)
|
||||
.if !defined(WITH_CURL)
|
||||
IGNORE= using CURL_XML requires CURL support
|
||||
.endif
|
||||
CONFIGURE_ARGS+=--enable-curl_xml
|
||||
LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
|
||||
PLIST_SUB+= CURL_XML=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-curl_xml
|
||||
PLIST_SUB+= CURL_XML="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DBI)
|
||||
CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
|
||||
LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (collectd-4.9.5.tar.gz) = a9ea4aabc2a65ecbf8bc1ed80d4510b40e188b82dec4ba232582880072b02359
|
||||
SIZE (collectd-4.9.5.tar.gz) = 1701068
|
||||
SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033
|
||||
SIZE (collectd-4.10.3.tar.gz) = 1743443
|
||||
|
||||
@ -25,6 +25,10 @@ lib/collectd/csv.la
|
||||
lib/collectd/csv.so
|
||||
%%CURL%%lib/collectd/curl.la
|
||||
%%CURL%%lib/collectd/curl.so
|
||||
%%CURL_JSON%%lib/collectd/curl_json.la
|
||||
%%CURL_JSON%%lib/collectd/curl_json.so
|
||||
%%CURL_XML%%lib/collectd/curl_xml.la
|
||||
%%CURL_XML%%lib/collectd/curl_xml.so
|
||||
%%DBI%%lib/collectd/dbi.la
|
||||
%%DBI%%lib/collectd/dbi.so
|
||||
%%DISK%%lib/collectd/disk.la
|
||||
|
||||
Loading…
Reference in New Issue
Block a user