summaryrefslogtreecommitdiff
path: root/community/collectd
diff options
context:
space:
mode:
Diffstat (limited to 'community/collectd')
-rw-r--r--community/collectd/PKGBUILD36
-rw-r--r--community/collectd/yajl-2.x.patch4
2 files changed, 22 insertions, 18 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index d801ab20d..193b35857 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 45620 2011-04-26 00:57:42Z dreisner $
+# $Id: PKGBUILD 49776 2011-06-21 04:55:41Z foutrelis $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
pkgname=collectd
pkgver=5.0.0
-pkgrel=3
+pkgrel=5
pkgdesc='Daemon which collects system performance statistics periodically'
arch=('i686' 'x86_64')
url='http://collectd.org/'
@@ -43,26 +43,29 @@ depends=('libtool')
source=("${url}files/$pkgname-$pkgver.tar.gz"
'libnotify-0.7.patch'
- 'rc.d'
- 'yajl-2.x.patch')
+ 'yajl-2.x.patch'
+ 'rc.d')
sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
- '0f441718d5519cb043b1130e5a1d0379078adbcc'
- '2586559fc8d2b54f3d242a3e815ed81e81e0341b')
+ 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+ '0f441718d5519cb043b1130e5a1d0379078adbcc')
install=install
build() {
cd "$srcdir/$pkgname-$pkgver"
- unset LDFLAGS # or perl not found
- patch -p1 -i ../libnotify-0.7.patch
-
- # fixes for yajl 2.x API changes
- patch -Np0 < "$srcdir/yajl-2.x.patch"
+ unset LDFLAGS # or libperl not found
+ patch -p1 -i ../libnotify-0.7.patch
+ patch -p1 -i ../yajl-2.x.patch
sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-static=no --with-python=/usr/bin/python2
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-static=no \
+ --with-python=/usr/bin/python2
# avoid -Werror with gcc 4.6
sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile
@@ -72,8 +75,9 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
+
+ make DESTDIR="$pkgdir" install
+
install -D -m 755 ../rc.d "$pkgdir/etc/rc.d/$pkgname"
- install -D -m 644 contrib/collectd2html.pl \
- "$pkgdir"/usr/share/collectd/collectd2html.pl
+ install -D -m 644 contrib/collectd2html.pl "$pkgdir"/usr/share/collectd/collectd2html.pl
}
diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch
index 6cd208006..b90543dfe 100644
--- a/community/collectd/yajl-2.x.patch
+++ b/community/collectd/yajl-2.x.patch
@@ -1,5 +1,5 @@
---- src/curl_json.c 2011-04-25 20:43:00.972938855 -0400
-+++ src/curl_json.c 2011-04-25 20:46:03.859938860 -0400
+--- old/src/curl_json.c 2011-04-25 20:43:00.972938855 -0400
++++ new/src/curl_json.c 2011-04-25 20:46:03.859938860 -0400
@@ -98,8 +98,7 @@
return (0);