Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

4 files changed, 7 insertions, 122 deletions

diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index f346ed2ac..91105df4a 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $
+# $Id: PKGBUILD 90687 2013-05-13 14:29:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
@@ -13,16 +13,10 @@ backup=('etc/miredo/miredo.conf'
         'etc/miredo/client-hook')
 options=('!libtool')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	isatapd.rc.d
 	miredo.install
-	miredo.rc.d
-	miredo-server.rc.d
 	miredo.service)
 md5sums=('5114debbf9fcab5d292176e4548f8cd1'
-         '51ab6d091192605ee9206944869cb2ab'
          'd1b655d7a851cdb46c91c3418ed1962f'
-         'c5a9be5c3175fecec387f1710bfd2788'
-         '319aba1ae06349b76cb25fda0dba60a9'
          'abd7d8831cab7f3ea6d0d4e51b8f8f6a')
 
 build() {
@@ -35,11 +29,13 @@ build() {
 	--libexecdir=/usr/lib \
 	--with-Judy
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 
-  install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo
-  install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server
-  install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd
   sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
 
   # avoid conflict with filesystem>=2012.06
diff --git a/community/miredo/isatapd.rc.d b/community/miredo/isatapd.rc.d
deleted file mode 100644
index fa7bbd708..000000000
--- a/community/miredo/isatapd.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/isatapd`
-case "$1" in
-  start)
-    stat_busy "Starting userspace ISATAP client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/isatapd
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon isatapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping userspace ISATAP client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon isatapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/miredo/miredo-server.rc.d b/community/miredo/miredo-server.rc.d
deleted file mode 100644
index d05513b23..000000000
--- a/community/miredo/miredo-server.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo-server`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol server"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo-server
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol server"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/miredo/miredo.rc.d b/community/miredo/miredo.rc.d
deleted file mode 100644
index 500374b12..000000000
--- a/community/miredo/miredo.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac