Fri May 31 06:21:01 PDT 2013

4 files changed, 13 insertions, 69 deletions

diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index a513b3c66..1be0e239e 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,36 +1,30 @@
-# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $
+# $Id: PKGBUILD 186745 2013-05-31 01:44:03Z eric $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metalog
 pkgver=3.0
-pkgrel=0
-pkgdesc="Metalog is a modern replacement for syslogd and klogd"
+pkgrel=2
+pkgdesc="A modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('pcre')
 provides=('logger')
-backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd'  'metalog.service')
+backup=('etc/metalog.conf')
+source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog.service')
 md5sums=('6fe404e49764fa24108fd090417bacb5'
-         '9e73301a7f0be291749ee30638527cb9'
-         '86bccd5a02996921e29eff8a0394d11f'
-         'f005e6970c25bfdaf0596791e9135f98')
+         '42b8138e8868ecdf0616f73efca7b339')
 
 build() {
-  cd $srcdir/$pkgname-3
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd $pkgname-3
+  ./configure --prefix=/usr --sysconfdir=/etc --sbin=/usr/bin
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-3
-  make DESTDIR=$pkgdir install
-  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
-  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
-  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
-
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/
+  cd $pkgname-3
+  make DESTDIR="$pkgdir" install
+  install -D -m644 metalog.conf "$pkgdir/etc/metalog.conf"
+  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/metalog.service
 }
diff --git a/extra/metalog/metalog b/extra/metalog/metalog
deleted file mode 100644
index 211002401..000000000
--- a/extra/metalog/metalog
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-if [ -f /var/run/metalog.pid ]; then
-    PID=$(cat /var/run/metalog.pid) 2>/dev/null
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Metalog"
-    [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon metalog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Metalog"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon metalog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}" 
-esac
-exit 0 
diff --git a/extra/metalog/metalog.confd b/extra/metalog/metalog.confd
deleted file mode 100644
index 3d76ffab3..000000000
--- a/extra/metalog/metalog.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters to be passed to metalog
-#
-
-# NOTE: Since v.0.7, metalog disables buffering by default.
-# Add '-a' if you want buffering.
-
-METALOG_OPTS=""
diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service
index 5982c8804..82a81ea98 100644
--- a/extra/metalog/metalog.service
+++ b/extra/metalog/metalog.service
@@ -2,7 +2,7 @@
 Description=System Logger Daemon
 
 [Service]
-ExecStart=/usr/sbin/metalog
+ExecStart=/usr/bin/metalog
 
 [Install]
 WantedBy=multi-user.target