diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-27 12:44:19 +0200 |
| commit | 830afd54d0d990fdb982292bed4c97f577dc195d (patch) | |
| tree | 5c081214c4d28eae5e46c33094131ecc555b4a8f /community/collectd | |
| parent | 06dc337f60287526f4db95ce79a2ea506023bffa (diff) | |
| parent | 5ea071a53492ec9512f8d08a8b8ff8e08499209d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/libgexiv2/PKGBUILD
community/monica/PKGBUILD
community/neatx/PKGBUILD
community/qstardict/PKGBUILD
community/shell-fm/PKGBUILD
core/isl/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/kdetoys/PKGBUILD
extra/pkgfile/PKGBUILD
extra/pyqt4/PKGBUILD
extra/sip/PKGBUILD
extra/sqlite/PKGBUILD
Diffstat (limited to 'community/collectd')
| -rw-r--r-- | community/collectd/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/collectd/libperl.patch | 14 |
2 files changed, 14 insertions, 15 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 9f8449bbb..c7fe00c3b 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $ +# $Id: PKGBUILD 96266 2013-08-23 04:10:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.3.0 -pkgrel=3 +pkgver=5.4.0 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -38,11 +38,11 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached' depends=('libltdl' 'iptables') -source=("${url}files/${pkgname}-${pkgver}.tar.gz" +source=("${url}files/${pkgname}-${pkgver}.tar.bz2" 'libperl.patch' 'service') -sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' - '245c098d121a4a05594553583310953b3a2f6461' +sha1sums=('c2bc3ca3c62cfba4499c4eb14066a4c78301cc2c' + '5364ea1330bc56c3b7cfb6d7f19a627c0053279e' '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') @@ -50,10 +50,9 @@ options=('!libtool') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - + sed 's/-Werror//g' -i *.in */*.in */*/*.in patch -p1 -i ../libperl.patch autoconf - sed 's/-Werror//g' -i src/Makefile.in } build() { diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch index baa9c5397..31b269a41 100644 --- a/community/collectd/libperl.patch +++ b/community/collectd/libperl.patch @@ -1,7 +1,7 @@ -diff -aur old/configure.in new/configure.in ---- old/configure.in 2011-09-29 20:38:56.725672831 +1000 -+++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 -@@ -2810,11 +2810,13 @@ +diff -Naur old/configure.in new/configure.in +--- old/configure.in 2013-08-18 22:24:25.049973054 +1200 ++++ new/configure.in 2013-08-23 15:58:24.552240546 +1200 +@@ -3101,11 +3101,13 @@ then SAVE_CFLAGS="$CFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -15,9 +15,9 @@ diff -aur old/configure.in new/configure.in AC_CACHE_CHECK([for libperl], [c_cv_have_libperl], -@@ -2833,7 +2835,10 @@ - Nullsv); - ]]), +@@ -3124,7 +3126,10 @@ + ]]] + )], [c_cv_have_libperl="yes"], - [c_cv_have_libperl="no"] + [ |