9 files changed, 29 insertions, 131 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
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 48c359a20..322bb94e6 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $
+# $Id: PKGBUILD 186756 2013-05-31 04:03:04Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.84
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
@@ -16,11 +16,11 @@ md5sums=('df61096ae1b18b27f915feeb907ae48c')
 build() {
     cp -r  $pkgbase-$pkgver $pkgbase-cli
     cd mtr-cli
-    ./configure --prefix=/usr --without-gtk
+    ./configure --prefix=/usr --without-gtk --sbindir=/usr/bin
     make
 
     cd "$srcdir/$pkgbase-$pkgver"
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --sbindir=/usr/bin
     make
 }
 
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 97e98dc0d..9d2733395 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,46 +1,42 @@
-# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $
+# $Id: PKGBUILD 186770 2013-05-31 05:42:13Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
-backup=('etc/conf.d/tftpd')
 source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz 
-       tftpd.rc 
-       tftpd.conf 
        LICENSE
        tftpd.service
        tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
 md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         'f41f484f94e91175e9183e872a2bff3b'
          '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         '165b98f814f74568635a720e674d7f18'
+         'ffeac33192eac4c526657b6789cace21'
          'a23369ea33be8b4a5427ec2cfc5373dd'
          '22e8629ef19bc276a102c5d4d284c1bd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   # fix #28103
   patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers 
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --without-tcpwrappers 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
+  cd ${pkgname}-${pkgver}
   make INSTALLROOT="${pkgdir}" install
-  install -d "${pkgdir}/etc/rc.d"
   install -d "${pkgdir}/srv/tftp"
-  install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
-  install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
   install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
   install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf
deleted file mode 100644
index a4329f608..000000000
--- a/extra/tftp-hpa/tftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to TFTPD
-#
-TFTPD_ARGS="-l -s /srv/tftp/"
diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc
deleted file mode 100755
index 0222d1693..000000000
--- a/extra/tftp-hpa/tftpd.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-TFTPD_ARGS=
-[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd
-
-PID=$(pidof -o %PPID /usr/sbin/in.tftpd)
-case "$1" in
-  start)
-    stat_busy "Starting TFTPD"
-    [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon tftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping TFTPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service
index 62562343d..293e0370b 100644
--- a/extra/tftp-hpa/tftpd.service
+++ b/extra/tftp-hpa/tftpd.service
@@ -2,7 +2,7 @@
 Description=hpa's original TFTP daemon
 
 [Service]
-ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+ExecStart=/usr/bin/in.tftpd -s /srv/tftp/
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal