diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /community/collectd | |
parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/collectd')
-rw-r--r-- | community/collectd/PKGBUILD | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 5ff60e81c..61ec563ef 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72138 2012-06-09 00:34:11Z dreisner $ +# $Id: PKGBUILD 73395 2012-07-07 05:48:11Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.1.0 -pkgrel=4 +pkgrel=5 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -76,10 +76,8 @@ package() { make DESTDIR="${pkgdir}" install - install -Dm755 "$srcdir"/rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 "$srcdir"/service "${pkgdir}"/usr/lib/systemd/system/collectd.service + 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 - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" } |