Merge branch 'master' of gparabola:abslibre-mips64el

2 files changed, 9 insertions, 48 deletions

diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD
index 4e68056b1..2eed8c3ff 100644
--- a/core/rpcbind/PKGBUILD
+++ b/core/rpcbind/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185041 2013-05-10 16:21:46Z tomegun $
+# $Id: PKGBUILD 186778 2013-05-31 07:19:10Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=rpcbind
 pkgver=0.2.0
-pkgrel=11
+pkgrel=12
 pkgdesc="portmap replacement which supports RPC over various protocols"
 arch=(i686 x86_64 'mips64el')
 depends=('bash' 'glibc' 'libtirpc')
@@ -12,17 +12,19 @@ license=('custom')
 replaces=('portmap')
 source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
         rpcbind-sunrpc.patch
-        rpcbind.service
-        rpcbind)
+        rpcbind.service)
 md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
          'c02ac36a98baac70b8a26190524b7b73'
-         'a7b23a32be2eb52d7dec52da36d4eba1'
-         '78a963654f57cbb209e228884767836e')
+         'a7b23a32be2eb52d7dec52da36d4eba1')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   # patch for iana services file
   patch -Np1 -i ../rpcbind-sunrpc.patch
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run
   make
 }
@@ -37,8 +39,6 @@ package() {
   make DESTDIR=$pkgdir install
   # install missing man page - https://bugs.archlinux.org/task/21271
   install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/
-  # install daemon 
-  install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind
   # install systemd service file
   install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
   # install license
diff --git a/core/rpcbind/rpcbind b/core/rpcbind/rpcbind
deleted file mode 100755
index 87c5b50da..000000000
--- a/core/rpcbind/rpcbind
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/bin/rpcbind)"
-case "$1" in
-  start)
-    stat_busy "Starting rpcbind"
-    [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/rpcbind)
-      echo $PID > /var/run/rpcbind.pid
-      add_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping rpcbind"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/rpcbind.pid
-      rm_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0