4 files changed, 13 insertions, 45 deletions
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index 6f526c274..a24c78732 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $
+# $Id: PKGBUILD 91949 2013-05-30 09:42:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=3
+pkgrel=6
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
@@ -14,17 +14,20 @@ depends=('gcc-libs' 'bash')
 install=incron.install
 options=('emptydirs')
 source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
-	'incron.init'
 	'incrond.service')
 md5sums=('67f8b671db8169edccc8ef11c7d2c8be'
-         '648e1ca1a4b1e624401d9d71aa3756b3'
-         '859a90af9e4efe40db381ea07167a66a')
+         '4be206ba6ecacd9d2006cdc72b4604db')
 
-build() {
+prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp
   sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp
   sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp
+  sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
   make
 }
 
@@ -39,6 +42,6 @@ package() {
     CFGDIR="${pkgdir}"/etc \
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
-  install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond
   install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/incron/incron.init b/community/incron/incron.init
deleted file mode 100644
index 337c0fa0b..000000000
--- a/community/incron/incron.init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting Incrond"
-        /usr/sbin/incrond
-        add_daemon incrond
-        stat_done
-        ;;
-    stop)
-        stat_busy "Stopping Incrond"
-        PID=`pidof -o %PPID /usr/sbin/incrond`
-	[ -z "$PID" ] || kill $PID
-        if [ $? -gt 0 ]; then
-            stat_fail        	
-        else
-            rm_daemon incrond
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/incron/incron.install b/community/incron/incron.install
index fa42d9cdc..9cb53bbe6 100644
--- a/community/incron/incron.install
+++ b/community/incron/incron.install
@@ -8,7 +8,6 @@ post_install () {
 
 pre_remove() {
   [ -h /var/service/incron ] && rm /var/service/incron
-  /etc/rc.d/incron stop
-  usr/sbin/userdel incron >& /dev/null
-  usr/sbin/groupdel incron >& /dev/null
+  userdel incron >& /dev/null
+  groupdel incron >& /dev/null
 }
diff --git a/community/incron/incrond.service b/community/incron/incrond.service
index 54fcfa9d2..d46814bf3 100644
--- a/community/incron/incrond.service
+++ b/community/incron/incrond.service
@@ -4,7 +4,7 @@ Description=Inotify System Scheduler
 [Service]
 Type=forking
 PIDFile=/run/incrond.pid
-ExecStart=/usr/sbin/incrond
+ExecStart=/usr/bin/incrond
 
 [Install]
 WantedBy=multi-user.target