Enable the ping plugin via liboping.

Update PLISTs while here and add lzma to WANTLIBs (added via curl)
This commit is contained in:
landry 2014-12-01 09:07:12 +00:00
parent 6b77032ea6
commit ba2193a487
3 changed files with 15 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2014/10/26 20:43:56 landry Exp $
# $OpenBSD: Makefile,v 1.26 2014/12/01 09:07:12 landry Exp $
COMMENT-main = system metrics collection engine
COMMENT-mysql = collectd mysql plugin
@ -15,8 +15,8 @@ PKGNAME-rrdtool = collectd-rrdtool-$V
PKGNAME-snmp = collectd-snmp-$V
CATEGORIES = sysutils
REVISION-main = 0
REVISION-rrdtool = 0
REVISION-main = 1
REVISION-rrdtool = 1
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@ -41,7 +41,7 @@ RUN_DEPENDS-pgsql = collectd-$V:${BASE_PKGPATH},-main
WANTLIB-rrdtool = X11 Xext Xrender cairo expat ffi fontconfig \
freetype glib-2.0 gmodule-2.0 gobject-2.0 \
graphite2 gthread-2.0 harfbuzz iconv intl m \
graphite2 gthread-2.0 harfbuzz iconv intl lzma m \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
pixman-1 png pthread pthread-stubs rrd_th xcb \
xcb-render xcb-shm xml2 z
@ -53,12 +53,13 @@ LIB_DEPENDS-snmp = net/net-snmp
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS += net/curl \
net/liboping \
textproc/libxml \
sysutils/libstatgrab \
security/libgcrypt \
devel/libtool,-ltdl
WANTLIB += c crypto gpg-error idn kvm curl xml2 ltdl
WANTLIB += c crypto gpg-error idn kvm curl xml2 ltdl lzma oping
WANTLIB += m pcap pthread ssl xml2 z statgrab gcrypt ${MODGETTEXT_WANTLIB}
CONFIGURE_STYLE = gnu
@ -76,7 +77,7 @@ ENABLED_PLUGINS = apache apcups ascent bind cpu csv curl curl_xml \
df disk dns email exec filecount interface load \
logfile match_empty_counter match_hashed match_regex \
match_timediff match_value memcached memory mysql \
network nginx ntpd olsrd openvpn postgresql powerdns \
network nginx ntpd olsrd openvpn ping postgresql powerdns \
processes rrdtool rrdcached snmp swap syslog table tail tail_csv \
target_notification target_replace target_scale \
target_set target_v5upgrade tcpconns teamspeak2 ted unixsock uptime \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2014/10/26 20:43:57 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2014/12/01 09:07:12 landry Exp $
@newgroup _collectd:652
@newuser _collectd:652:652:daemon:Collectd Daemon:/var/empty:/sbin/nologin
@bin bin/collectd-nagios
@ -70,6 +70,8 @@ lib/collectd/olsrd.so
lib/collectd/openvpn.so
@comment lib/collectd/pf.la
lib/collectd/pf.so
@comment lib/collectd/ping.la
lib/collectd/ping.so
@comment lib/collectd/powerdns.la
lib/collectd/powerdns.so
@comment lib/collectd/processes.la
@ -116,8 +118,8 @@ lib/collectd/write_http.so
@lib lib/libcollectdclient.so.${LIBcollectdclient_VERSION}
lib/pkgconfig/libcollectdclient.pc
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.18.2/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.18.2/perllocal.pod
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.20.1/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.20.1/perllocal.pod
libdata/perl5/site_perl/Collectd/
libdata/perl5/site_perl/Collectd.pm
libdata/perl5/site_perl/Collectd/Plugins/

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-rrdtool,v 1.3 2014/10/26 20:43:57 landry Exp $
@comment lib/collectd/rrdtool.la
lib/collectd/rrdtool.so
@comment $OpenBSD: PLIST-rrdtool,v 1.4 2014/12/01 09:07:12 landry Exp $
@comment lib/collectd/rrdcached.la
lib/collectd/rrdcached.so
@comment lib/collectd/rrdtool.la
lib/collectd/rrdtool.so