From ad84169d66d20378d28533c216b73c9a6646d6d7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 2 Oct 2011 23:14:32 +0000
Subject: Sun Oct  2 23:14:32 UTC 2011

---
 community/collectd/PKGBUILD | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'community/collectd/PKGBUILD')

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 668a9cec5..a0abac0c4 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49792 2011-06-21 05:03:51Z foutrelis $
+# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Daemon which collects system performance statistics periodically'
 arch=('i686' 'x86_64')
 url='http://collectd.org/'
@@ -41,24 +41,28 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached'
 
 depends=('libtool')
 
-source=("${url}files/$pkgname-$pkgver.tar.gz"
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libnotify-0.7.patch'
         'yajl-2.x.patch'
+        'libperl.patch'
         'rc.d')
 sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
           'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
           'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+          'b221352447b2d42cade4a65ced322bcff8a40366'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	unset LDFLAGS # or libperl not found
+	patch -p1 -i ../libperl.patch
+	autoconf
+
+	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
 	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 \
@@ -67,17 +71,16 @@ build() {
 		--enable-static=no \
 		--with-python=/usr/bin/python2
 
-	# avoid -Werror with gcc 4.6
-	sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile
+	sed -i 's/ -Werror//g' */Makefile* */*/Makefile*
 
 	make all
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	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 755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+	install -D -m 644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
 }
-- 
cgit v1.2.3-54-g00ecf