Merge branch 'master' of gparabola:abslibre-mips64el

1 files changed, 11 insertions, 12 deletions

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index d4bffed52..ec2720150 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82585 2013-01-21 05:37:10Z bisson $
+# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.3.0
+pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
             'libesmtp: notify_email plugin'
             'libgcrypt: encryption and authentication for network plugin'
             'libmemcached: memcachec plugin'
-            'libmysqlclient: mysql plugin'
+            'libmariadbclient: mysql plugin'
             'iproute2: netlink plugin'
             'net-snmp: snmp plugin'
             'libnotify: notify_desktop plugin'
@@ -32,7 +32,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
             'yajl: curl_json plugin')
 
 makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
-             'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
              'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
              'libvirt' 'libxml2' 'xmms' 'yajl')
 
@@ -42,39 +42,38 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libperl.patch'
         'service'
         'rc.d')
-sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b'
+sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
           '245c098d121a4a05594553583310953b3a2f6461'
           'b56907f532b9174e1b6995aadb518228d7464d3b'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
 backup=('etc/collectd.conf')
 options=('!libtool')
-install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	patch -p1 -i ../libperl.patch
 	autoconf
+	sed 's/-Werror//g' -i src/Makefile.in
+}
 
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-static=no \
 		--with-python=/usr/bin/python2
-
 	make all
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
 	rmdir "${pkgdir}/var/run" # FS#30201
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
 	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-	mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magick ignores datarootdir
 }