Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/libvirt/PKGBUILD
	community/opendkim/opendkim.rc
	core/nfs-utils/blkmapd.service
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-libssh2/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	testing/php/PKGBUILD
	testing/xorg-server/PKGBUILD
	~fauno/notmuch/PKGBUILD

5 files changed, 40 insertions, 37 deletions

diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index d27bbe9b2..c942aeaf7 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68131 2012-03-18 14:31:17Z arodseth $
+# $Id: PKGBUILD 71606 2012-05-30 19:22:00Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
 pkgbase=mfs
 pkgname=('mfs-client' 'mfs-chunkserver' 'mfs-master')
-pkgver=1.6.24
+pkgver=1.6.25
 pkgrel=1
 pkgdesc="MooseFS, fault tolerant, network distributed file system"
 license=("GPL3")
@@ -17,16 +17,16 @@ source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz"
         "mfschunkserver"
         "mfsmetalogger"
         "mfscgiserv")
-sha256sums=('823c2c63d66dc8ba9d409e8af0f6c452cebc3a073f1d89b034e65320104eaa25'
-            '6e75a33996120cb5d240075bcc92522d490892fae5f9f5c4f2d1b020db54c9c1'
-            '48dc7a4e2ba23668456a2593154a850cebca649412f8c11e8f1a94038831638e'
-            'aae5fdf39469eb47bb4962b51bbdb3c51772930f574010c29bb5a36f1820d0ee'
-            '357304173688536ab70b9978ae44317b07de1fdcf3736b31a94b2a6186e8e9fa')
+sha256sums=('64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee'
+            '7c307f7be520644ac5d9c71e39ff7ec7e26800aa77c8a18c51a2d0087e5b2f48'
+            '2d07e544f4bfeb497c24276936d3a8ce9f906597d6b9c898dc491426b21e74e0'
+            'd9c072cbb9d9645e5131d08b08628ccc2a2bef0a4e9c6fd8c3c33e50efce39f3'
+            'a2e1951888887e928e68a3a010047fa3528182e93c086e4addb5abc14ea72c3b')
 
 build() {
   cd "$srcdir"
 
-  # Build the client
+  msg2 "Building client..."
   cp -r $pkgbase-$pkgver $pkgbase-client
   cd $pkgbase-client
   ./configure \
@@ -41,7 +41,7 @@ build() {
   
   cd ..
   
-  # Build the chunkserver
+  msg2 "Building chunkserver..."
   cp -r $pkgbase-$pkgver $pkgbase-chunk
   cd $pkgbase-chunk
   ./configure \
@@ -56,7 +56,7 @@ build() {
 
   cd ..
   
-  # Build the Master
+  msg2 "Building master..."
   cp -r $pkgbase-$pkgver $pkgbase-master
   cd $pkgbase-master
   ./configure \
@@ -72,31 +72,34 @@ package_mfs-client() {
   depends=('zlib' 'fuse' 'bash')
   cd "$srcdir/$pkgbase-client"
   make DESTDIR="$pkgdir" install
-  rm -rf $pkgdir/usr/share/man/man7
+  rm -rf "$pkgdir/usr/share/man/man7"
+  rmdir "$pkgdir/usr/share/man/man5"
 }
 
 package_mfs-chunkserver() {
   depends=('zlib' 'bash')
   cd "$srcdir/$pkgbase-chunk"
   make DESTDIR="$pkgdir" install
-  rm -rf $pkgdir/usr/share/man/man7
-  install -m 755 -D $srcdir/mfschunkserver $pkgdir/etc/rc.d/mfschunkserver
+  rm -rf "$pkgdir/usr/share/man/man7"
+  rmdir "$pkgdir/usr/share/man/man1"
+  install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver"
+  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
 }
 
 package_mfs-master() {
   depends=('zlib' 'python2')
   cd "$srcdir/$pkgbase-master"
   make DESTDIR="$pkgdir" install
-  install -D -m0644 README $pkgdir/usr/share/doc/$pkgbase/README
-  install -D -m0644 INSTALL $pkgdir/usr/share/doc/$pkgbase/INSTALL
-  install -D -m0644 NEWS $pkgdir/usr/share/doc/$pkgbase/NEWS
-  install -D -m0644 UPGRADE $pkgdir/usr/share/doc/$pkgbase/UPGRADE
-  install -m 755 -D $srcdir/mfsmaster $pkgdir/etc/rc.d/mfsmaster
-  install -m 755 -D $srcdir/mfsmetalogger $pkgdir/etc/rc.d/mfsmetalogger
-  install -m 755 -D $srcdir/mfscgiserv $pkgdir/etc/rc.d/mfscgiserv
-  find "$pkgdir" -name 'mfscgiserv' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
+  install -Dm644 README "$pkgdir/usr/share/doc/$pkgbase/README"
+  install -Dm644 INSTALL "$pkgdir/usr/share/doc/$pkgbase/INSTALL"
+  install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgbase/NEWS"
+  install -Dm644 UPGRADE "$pkgdir/usr/share/doc/$pkgbase/UPGRADE"
+  install -Dm755 "$srcdir/mfsmaster" "$pkgdir/etc/rc.d/mfsmaster"
+  install -Dm755 "$srcdir/mfsmetalogger" "$pkgdir/etc/rc.d/mfsmetalogger"
+  install -Dm755 "$srcdir/mfscgiserv" "$pkgdir/etc/rc.d/mfscgiserv"
+  rmdir "$pkgdir/usr/share/man/man1"
+  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
+  sed -i '0,/on/s//on2/' "$pkgdir/usr/bin/mfscgiserv"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/mfs/mfscgiserv b/community/mfs/mfscgiserv
index ea9f00145..2f176d239 100755
--- a/community/mfs/mfscgiserv
+++ b/community/mfs/mfscgiserv
@@ -3,11 +3,11 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=$(ps aux | grep -v grep | grep /usr/sbin/mfscgiserv | awk '{print $2}')
+PID=$(ps aux | grep -v grep | grep /usr/bin/mfscgiserv | awk '{print $2}')
 case "$1" in
   start)
     stat_busy "Starting MooseFS CGI Web Frontend Daemon"
-    [ -z "$PID" ] && /usr/sbin/mfscgiserv &>/dev/null
+    [ -z "$PID" ] && /usr/bin/mfscgiserv &> /dev/null
     if [ $? = 0 ]; then
       add_daemon mfscgiserv
       stat_done
diff --git a/community/mfs/mfschunkserver b/community/mfs/mfschunkserver
index b9567b703..606d00f48 100755
--- a/community/mfs/mfschunkserver
+++ b/community/mfs/mfschunkserver
@@ -3,17 +3,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/mfschunkserver`
+PID=`pidof -o %PPID /usr/bin/mfschunkserver`
 case "$1" in
   start)
     stat_busy "Starting MooseFS Chunkserver Daemon"
     if [ -z "$PID" ]; then 
-       /usr/sbin/mfschunkserver start
+       /usr/bin/mfschunkserver start
     fi
     if [ ! -z "$PID" -o $? -gt 0 ]; then
       stat_fail
     else
-      PID=`pidof -o %PPID /usr/sbin/mfschunkserver`
+      PID=`pidof -o %PPID /usr/bin/mfschunkserver`
       echo $PID > /var/run/mfsmetalogger.pid
       add_daemon mfschunkserver
       stat_done
@@ -21,7 +21,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping MooseFS Chunkserver Daemon"
-    [ ! -z "$PID" ]  && /usr/sbin/mfschunkserver stop &> /dev/null
+    [ ! -z "$PID" ]  && /usr/bin/mfschunkserver stop &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/mfs/mfsmaster b/community/mfs/mfsmaster
index ee1c74c5a..b0cfd8299 100755
--- a/community/mfs/mfsmaster
+++ b/community/mfs/mfsmaster
@@ -3,17 +3,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID -x /usr/sbin/mfsmaster`
+PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
 case "$1" in
   start)
     stat_busy "Starting MooseFS Master Daemon"
     if [ -z "$PID" ]; then 
-       /usr/sbin/mfsmaster start
+       /usr/bin/mfsmaster start
     fi
     if [ ! -z "$PID" -o $? -gt 0 ]; then
       stat_fail
     else
-      PID=`pidof -o %PPID -x /usr/sbin/mfsmaster`
+      PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
       echo $PID > /var/run/mfsmaster.pid
       add_daemon mfsmaster
       stat_done
@@ -21,7 +21,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping MooseFS Master Daemon"
-    [ ! -z "$PID" ]  && /usr/sbin/mfsmaster stop &> /dev/null
+    [ ! -z "$PID" ]  && /usr/bin/mfsmaster stop &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/mfs/mfsmetalogger b/community/mfs/mfsmetalogger
index afa451929..a870cc5a7 100755
--- a/community/mfs/mfsmetalogger
+++ b/community/mfs/mfsmetalogger
@@ -3,17 +3,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/mfsmetalogger`
+PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
 case "$1" in
   start)
     stat_busy "Starting MooseFS Metalogger Daemon"
     if [ -z "$PID" ]; then 
-       /usr/sbin/mfsmetalogger start
+       /usr/bin/mfsmetalogger start
     fi
     if [ ! -z "$PID" -o $? -gt 0 ]; then
       stat_fail
     else
-      PID=`pidof -o %PPID /usr/sbin/mfsmetalogger`
+      PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
       echo $PID > /var/run/mfsmetalogger.pid
       add_daemon mfsmetalogger
       stat_done
@@ -21,7 +21,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping MooseFS Metalogger Daemon"
-    [ ! -z "$PID" ]  && /usr/sbin/mfsmetalogger stop &> /dev/null
+    [ ! -z "$PID" ]  && /usr/bin/mfsmetalogger stop &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else