From e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 21 May 2013 00:28:39 -0700
Subject: Tue May 21 00:28:39 PDT 2013

---
 community/collectd/PKGBUILD | 14 ++++++--------
 community/collectd/rc.d     | 39 ---------------------------------------
 community/collectd/service  |  2 +-
 3 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 community/collectd/rc.d

(limited to 'community/collectd')

diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 07b3708d9..59f594221 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $
+# $Id: PKGBUILD 91248 2013-05-20 14:50:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64')
@@ -40,12 +40,10 @@ depends=('libltdl' 'iptables')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libperl.patch'
-        'service'
-        'rc.d')
+        'service')
 sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
           '245c098d121a4a05594553583310953b3a2f6461'
-          'b56907f532b9174e1b6995aadb518228d7464d3b'
-          '0f441718d5519cb043b1130e5a1d0379078adbcc')
+          '04f676d0b76c34df0bbf94629813e035b1febe04')
 
 backup=('etc/collectd.conf')
 options=('!libtool')
@@ -63,7 +61,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-static=no \
+		--sbindir=/usr/bin \
+		--disable-static \
 		--with-python=/usr/bin/python2
 	make all
 }
@@ -72,7 +71,6 @@ 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
 }
diff --git a/community/collectd/rc.d b/community/collectd/rc.d
deleted file mode 100644
index 442f2324a..000000000
--- a/community/collectd/rc.d
+++ /dev/null
@@ -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
diff --git a/community/collectd/service b/community/collectd/service
index 9581ec0c9..30540645a 100644
--- a/community/collectd/service
+++ b/community/collectd/service
@@ -5,7 +5,7 @@ After=local-fs.target network.target
 [Service]
 Type=forking
 PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
+ExecStart=/usr/bin/collectdmon
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
-- 
cgit v1.2.3-54-g00ecf