Date: Saturday, March 9, 2013 @ 01:29:43
Author: bisson
Revision: 85922
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
collectd/repos/community-staging-i686/PKGBUILD
(from rev 85921, collectd/trunk/PKGBUILD)
collectd/repos/community-staging-i686/install
(from rev 85921, collectd/trunk/install)
collectd/repos/community-staging-i686/libperl.patch
(from rev 85921, collectd/trunk/libperl.patch)
collectd/repos/community-staging-i686/rc.d
(from rev 85921, collectd/trunk/rc.d)
collectd/repos/community-staging-i686/service
(from rev 85921, collectd/trunk/service)
collectd/repos/community-staging-x86_64/PKGBUILD
(from rev 85921, collectd/trunk/PKGBUILD)
collectd/repos/community-staging-x86_64/install
(from rev 85921, collectd/trunk/install)
collectd/repos/community-staging-x86_64/libperl.patch
(from rev 85921, collectd/trunk/libperl.patch)
collectd/repos/community-staging-x86_64/rc.d
(from rev 85921, collectd/trunk/rc.d)
collectd/repos/community-staging-x86_64/service
(from rev 85921, collectd/trunk/service)
Deleted:
collectd/repos/community-staging-i686/PKGBUILD
collectd/repos/community-staging-i686/install
collectd/repos/community-staging-i686/libperl.patch
collectd/repos/community-staging-i686/rc.d
collectd/repos/community-staging-i686/service
collectd/repos/community-staging-x86_64/PKGBUILD
collectd/repos/community-staging-x86_64/install
collectd/repos/community-staging-x86_64/libperl.patch
collectd/repos/community-staging-x86_64/rc.d
collectd/repos/community-staging-x86_64/service
----------------------------------------+
community-staging-i686/PKGBUILD | 160 +++++++++++++++----------------
community-staging-i686/install | 16 +--
community-staging-i686/libperl.patch | 58 +++++------
community-staging-i686/rc.d | 78 +++++++--------
community-staging-i686/service | 26 ++---
community-staging-x86_64/PKGBUILD | 160 +++++++++++++++----------------
community-staging-x86_64/install | 16 +--
community-staging-x86_64/libperl.patch | 58 +++++------
community-staging-x86_64/rc.d | 78 +++++++--------
community-staging-x86_64/service | 26 ++---
10 files changed, 338 insertions(+), 338 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-i686/PKGBUILD 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Gerhard Brauer <[email protected]>
-
-pkgname=collectd
-pkgver=5.2.0
-pkgrel=3
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-
-optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
- 'libdbi: dbi plugin'
- 'libesmtp: notify_email plugin'
- 'libgcrypt: encryption and authentication for network plugin'
- 'libmemcached: memcachec plugin'
- 'libmariadbclient: mysql plugin'
- 'iproute2: netlink plugin'
- 'net-snmp: snmp plugin'
- 'libnotify: notify_desktop plugin'
- 'liboping: ping plugin'
- 'libpcap: dns plugin'
- 'perl: perl plugin'
- 'postgresql-libs: postgresql plugin'
- 'python2: python plugin'
- 'rrdtool: rrdtool and rrdcached plugins'
- 'lm_sensors: lm_sensors and sensors plugins'
- 'libvirt: libvirt plugin'
- 'libxml2: ascent and libvirt plugins'
- 'xmms: xmms plugin'
- 'yajl: curl_json plugin')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
- 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
- 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
- 'libvirt' 'libxml2' 'xmms' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.gz"
- 'libperl.patch'
- 'service'
- 'rc.d')
-sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b'
- '245c098d121a4a05594553583310953b3a2f6461'
- 'b56907f532b9174e1b6995aadb518228d7464d3b'
- '0f441718d5519cb043b1130e5a1d0379078adbcc')
-
-backup=('etc/collectd.conf')
-options=('!libtool')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../libperl.patch
- autoconf
-
- ./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
-}
Copied: collectd/repos/community-staging-i686/PKGBUILD (from rev 85921,
collectd/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Gerhard Brauer <[email protected]>
+
+pkgname=collectd
+pkgver=5.2.1
+pkgrel=1
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' 'x86_64')
+license=('GPL')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+ 'libdbi: dbi plugin'
+ 'libesmtp: notify_email plugin'
+ 'libgcrypt: encryption and authentication for network plugin'
+ 'libmemcached: memcachec plugin'
+ 'libmariadbclient: mysql plugin'
+ 'iproute2: netlink plugin'
+ 'net-snmp: snmp plugin'
+ 'libnotify: notify_desktop plugin'
+ 'liboping: ping plugin'
+ 'libpcap: dns plugin'
+ 'perl: perl plugin'
+ 'postgresql-libs: postgresql plugin'
+ 'python2: python plugin'
+ 'rrdtool: rrdtool and rrdcached plugins'
+ 'lm_sensors: lm_sensors and sensors plugins'
+ 'libvirt: libvirt plugin'
+ 'libxml2: ascent and libvirt plugins'
+ 'xmms: xmms plugin'
+ 'yajl: curl_json plugin')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+ 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+ 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+ 'libvirt' 'libxml2' 'xmms' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
+ 'libperl.patch'
+ 'service'
+ 'rc.d')
+sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39'
+ '245c098d121a4a05594553583310953b3a2f6461'
+ 'b56907f532b9174e1b6995aadb518228d7464d3b'
+ '0f441718d5519cb043b1130e5a1d0379078adbcc')
+
+backup=('etc/collectd.conf')
+options=('!libtool')
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../libperl.patch
+ autoconf
+
+ ./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 magic
ignores datarootdir
+}
Deleted: community-staging-i686/install
===================================================================
--- community-staging-i686/install 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-i686/install 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,8 +0,0 @@
-post_install() {
- cat <<EOF
-==> Customize your /etc/collectd.conf (you really want to).
-==> Then start and stop the daemon using: /etc/rc.d/collectd
-==> To see some result of collected data, use the Perl script:
-==> /usr/share/collectd/collectd2html.pl
-EOF
-}
Copied: collectd/repos/community-staging-i686/install (from rev 85921,
collectd/trunk/install)
===================================================================
--- community-staging-i686/install (rev 0)
+++ community-staging-i686/install 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+==> Customize your /etc/collectd.conf (you really want to).
+==> Then start and stop the daemon using: /etc/rc.d/collectd
+==> To see some result of collected data, use the Perl script:
+==> /usr/share/collectd/collectd2html.pl
+EOF
+}
Deleted: community-staging-i686/libperl.patch
===================================================================
--- community-staging-i686/libperl.patch 2013-03-09 00:28:50 UTC (rev
85921)
+++ community-staging-i686/libperl.patch 2013-03-09 00:29:43 UTC (rev
85922)
@@ -1,29 +0,0 @@
-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 @@
- then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
-+ SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string)
- PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
- PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
- CFLAGS="$CFLAGS $PERL_CFLAGS"
- LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
-
- AC_CACHE_CHECK([for libperl],
- [c_cv_have_libperl],
-@@ -2833,7 +2835,10 @@
- Nullsv);
- ]]),
- [c_cv_have_libperl="yes"],
-- [c_cv_have_libperl="no"]
-+ [
-+ c_cv_have_libperl="no"
-+ LIBS="$SAVE_LIBS"
-+ ]
- )
- )
-
Copied: collectd/repos/community-staging-i686/libperl.patch (from rev 85921,
collectd/trunk/libperl.patch)
===================================================================
--- community-staging-i686/libperl.patch (rev 0)
+++ community-staging-i686/libperl.patch 2013-03-09 00:29:43 UTC (rev
85922)
@@ -0,0 +1,29 @@
+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 @@
+ then
+ SAVE_CFLAGS="$CFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
++ SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string)
+ PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+ PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+ CFLAGS="$CFLAGS $PERL_CFLAGS"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
+
+ AC_CACHE_CHECK([for libperl],
+ [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ Nullsv);
+ ]]),
+ [c_cv_have_libperl="yes"],
+- [c_cv_have_libperl="no"]
++ [
++ c_cv_have_libperl="no"
++ LIBS="$SAVE_LIBS"
++ ]
+ )
+ )
+
Deleted: community-staging-i686/rc.d
===================================================================
--- community-staging-i686/rc.d 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-i686/rc.d 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- [[ -z "$PID" ]] && $prog \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 2
- $0 start
- ;;
-reload)
- stat_busy "Sending SIGHUP to $name daemon"
- [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
- && { stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-*)
- echo "usage: $0 {start|stop|restart|reload}"
- exit 1
- ;;
-esac
Copied: collectd/repos/community-staging-i686/rc.d (from rev 85921,
collectd/trunk/rc.d)
===================================================================
--- community-staging-i686/rc.d (rev 0)
+++ community-staging-i686/rc.d 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=collectd
+prog="/usr/sbin/collectdmon"
+
+PID=$(pidof -o %PPID $prog)
+
+case "$1" in
+start)
+ stat_busy "Starting $name daemon"
+ [[ -z "$PID" ]] && $prog \
+ && { add_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+stop)
+ stat_busy "Stopping $name daemon"
+ [[ -n "$PID" ]] && kill $PID &>/dev/null \
+ && { rm_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+restart)
+ $0 stop
+ sleep 2
+ $0 start
+ ;;
+reload)
+ stat_busy "Sending SIGHUP to $name daemon"
+ [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+ && { stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+*)
+ echo "usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
+esac
Deleted: community-staging-i686/service
===================================================================
--- community-staging-i686/service 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-i686/service 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,13 +0,0 @@
-[Unit]
-Description=System statistics collection daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: collectd/repos/community-staging-i686/service (from rev 85921,
collectd/trunk/service)
===================================================================
--- community-staging-i686/service (rev 0)
+++ community-staging-i686/service 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,13 @@
+[Unit]
+Description=System statistics collection daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/collectdmon.pid
+ExecStart=/usr/sbin/collectdmon
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-x86_64/PKGBUILD 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Gerhard Brauer <[email protected]>
-
-pkgname=collectd
-pkgver=5.2.0
-pkgrel=3
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-
-optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
- 'libdbi: dbi plugin'
- 'libesmtp: notify_email plugin'
- 'libgcrypt: encryption and authentication for network plugin'
- 'libmemcached: memcachec plugin'
- 'libmariadbclient: mysql plugin'
- 'iproute2: netlink plugin'
- 'net-snmp: snmp plugin'
- 'libnotify: notify_desktop plugin'
- 'liboping: ping plugin'
- 'libpcap: dns plugin'
- 'perl: perl plugin'
- 'postgresql-libs: postgresql plugin'
- 'python2: python plugin'
- 'rrdtool: rrdtool and rrdcached plugins'
- 'lm_sensors: lm_sensors and sensors plugins'
- 'libvirt: libvirt plugin'
- 'libxml2: ascent and libvirt plugins'
- 'xmms: xmms plugin'
- 'yajl: curl_json plugin')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
- 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
- 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
- 'libvirt' 'libxml2' 'xmms' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.gz"
- 'libperl.patch'
- 'service'
- 'rc.d')
-sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b'
- '245c098d121a4a05594553583310953b3a2f6461'
- 'b56907f532b9174e1b6995aadb518228d7464d3b'
- '0f441718d5519cb043b1130e5a1d0379078adbcc')
-
-backup=('etc/collectd.conf')
-options=('!libtool')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i ../libperl.patch
- autoconf
-
- ./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
-}
Copied: collectd/repos/community-staging-x86_64/PKGBUILD (from rev 85921,
collectd/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Gerhard Brauer <[email protected]>
+
+pkgname=collectd
+pkgver=5.2.1
+pkgrel=1
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' 'x86_64')
+license=('GPL')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+ 'libdbi: dbi plugin'
+ 'libesmtp: notify_email plugin'
+ 'libgcrypt: encryption and authentication for network plugin'
+ 'libmemcached: memcachec plugin'
+ 'libmariadbclient: mysql plugin'
+ 'iproute2: netlink plugin'
+ 'net-snmp: snmp plugin'
+ 'libnotify: notify_desktop plugin'
+ 'liboping: ping plugin'
+ 'libpcap: dns plugin'
+ 'perl: perl plugin'
+ 'postgresql-libs: postgresql plugin'
+ 'python2: python plugin'
+ 'rrdtool: rrdtool and rrdcached plugins'
+ 'lm_sensors: lm_sensors and sensors plugins'
+ 'libvirt: libvirt plugin'
+ 'libxml2: ascent and libvirt plugins'
+ 'xmms: xmms plugin'
+ 'yajl: curl_json plugin')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+ 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+ 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+ 'libvirt' 'libxml2' 'xmms' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
+ 'libperl.patch'
+ 'service'
+ 'rc.d')
+sha1sums=('2c51c21d339c221bd9f94b1ee2b44b1e388d6b39'
+ '245c098d121a4a05594553583310953b3a2f6461'
+ 'b56907f532b9174e1b6995aadb518228d7464d3b'
+ '0f441718d5519cb043b1130e5a1d0379078adbcc')
+
+backup=('etc/collectd.conf')
+options=('!libtool')
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../libperl.patch
+ autoconf
+
+ ./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 magic
ignores datarootdir
+}
Deleted: community-staging-x86_64/install
===================================================================
--- community-staging-x86_64/install 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-x86_64/install 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,8 +0,0 @@
-post_install() {
- cat <<EOF
-==> Customize your /etc/collectd.conf (you really want to).
-==> Then start and stop the daemon using: /etc/rc.d/collectd
-==> To see some result of collected data, use the Perl script:
-==> /usr/share/collectd/collectd2html.pl
-EOF
-}
Copied: collectd/repos/community-staging-x86_64/install (from rev 85921,
collectd/trunk/install)
===================================================================
--- community-staging-x86_64/install (rev 0)
+++ community-staging-x86_64/install 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+==> Customize your /etc/collectd.conf (you really want to).
+==> Then start and stop the daemon using: /etc/rc.d/collectd
+==> To see some result of collected data, use the Perl script:
+==> /usr/share/collectd/collectd2html.pl
+EOF
+}
Deleted: community-staging-x86_64/libperl.patch
===================================================================
--- community-staging-x86_64/libperl.patch 2013-03-09 00:28:50 UTC (rev
85921)
+++ community-staging-x86_64/libperl.patch 2013-03-09 00:29:43 UTC (rev
85922)
@@ -1,29 +0,0 @@
-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 @@
- then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
-+ SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string)
- PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
- PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
- CFLAGS="$CFLAGS $PERL_CFLAGS"
- LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
-
- AC_CACHE_CHECK([for libperl],
- [c_cv_have_libperl],
-@@ -2833,7 +2835,10 @@
- Nullsv);
- ]]),
- [c_cv_have_libperl="yes"],
-- [c_cv_have_libperl="no"]
-+ [
-+ c_cv_have_libperl="no"
-+ LIBS="$SAVE_LIBS"
-+ ]
- )
- )
-
Copied: collectd/repos/community-staging-x86_64/libperl.patch (from rev 85921,
collectd/trunk/libperl.patch)
===================================================================
--- community-staging-x86_64/libperl.patch (rev 0)
+++ community-staging-x86_64/libperl.patch 2013-03-09 00:29:43 UTC (rev
85922)
@@ -0,0 +1,29 @@
+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 @@
+ then
+ SAVE_CFLAGS="$CFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
++ SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string)
+ PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+ PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+ CFLAGS="$CFLAGS $PERL_CFLAGS"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
+
+ AC_CACHE_CHECK([for libperl],
+ [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ Nullsv);
+ ]]),
+ [c_cv_have_libperl="yes"],
+- [c_cv_have_libperl="no"]
++ [
++ c_cv_have_libperl="no"
++ LIBS="$SAVE_LIBS"
++ ]
+ )
+ )
+
Deleted: community-staging-x86_64/rc.d
===================================================================
--- community-staging-x86_64/rc.d 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-x86_64/rc.d 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- [[ -z "$PID" ]] && $prog \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 2
- $0 start
- ;;
-reload)
- stat_busy "Sending SIGHUP to $name daemon"
- [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
- && { stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-*)
- echo "usage: $0 {start|stop|restart|reload}"
- exit 1
- ;;
-esac
Copied: collectd/repos/community-staging-x86_64/rc.d (from rev 85921,
collectd/trunk/rc.d)
===================================================================
--- community-staging-x86_64/rc.d (rev 0)
+++ community-staging-x86_64/rc.d 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=collectd
+prog="/usr/sbin/collectdmon"
+
+PID=$(pidof -o %PPID $prog)
+
+case "$1" in
+start)
+ stat_busy "Starting $name daemon"
+ [[ -z "$PID" ]] && $prog \
+ && { add_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+stop)
+ stat_busy "Stopping $name daemon"
+ [[ -n "$PID" ]] && kill $PID &>/dev/null \
+ && { rm_daemon $name; stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+restart)
+ $0 stop
+ sleep 2
+ $0 start
+ ;;
+reload)
+ stat_busy "Sending SIGHUP to $name daemon"
+ [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
+ && { stat_done; } \
+ || { stat_fail; exit 1; }
+ ;;
+*)
+ echo "usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
+esac
Deleted: community-staging-x86_64/service
===================================================================
--- community-staging-x86_64/service 2013-03-09 00:28:50 UTC (rev 85921)
+++ community-staging-x86_64/service 2013-03-09 00:29:43 UTC (rev 85922)
@@ -1,13 +0,0 @@
-[Unit]
-Description=System statistics collection daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: collectd/repos/community-staging-x86_64/service (from rev 85921,
collectd/trunk/service)
===================================================================
--- community-staging-x86_64/service (rev 0)
+++ community-staging-x86_64/service 2013-03-09 00:29:43 UTC (rev 85922)
@@ -0,0 +1,13 @@
+[Unit]
+Description=System statistics collection daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/collectdmon.pid
+ExecStart=/usr/sbin/collectdmon
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
