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

Conflicts:
	community/bin2iso/PKGBUILD
	community/espeak/PKGBUILD
	community/gnash/PKGBUILD
	community/gtk2hs-buildtools/PKGBUILD
	community/haskell-binary/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/kmess/PKGBUILD
	community/libident/PKGBUILD
	community/lwm/PKGBUILD
	core/dialog/PKGBUILD
	core/gcc/PKGBUILD
	core/libtool/PKGBUILD
	core/ppl/PKGBUILD
	extra/boost/PKGBUILD
	extra/dnsmasq/PKGBUILD
	extra/ghc/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/pekwm/PKGBUILD
	extra/soprano/PKGBUILD
	extra/udisks/PKGBUILD
	multilib-testing/lib32-libpciaccess/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
	multilib/lib32-glibc/glibc-2.15-ifunc.patch
	multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
	multilib/lib32-glibc/glibc-2.15-scanf.patch
	multilib/libtool-multilib/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	testing/libpciaccess/PKGBUILD
	testing/mkinitcpio-busybox/PKGBUILD
	testing/xorg-server/PKGBUILD

2 files changed, 17 insertions, 33 deletions

diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index e12f7ee0c..df25eb4d9 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58411 2011-11-12 17:18:08Z ibiru $
-# Maintainer:
+# $Id: PKGBUILD 67264 2012-03-06 01:23:37Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=2
+pkgrel=3
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,9 +11,18 @@ url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
 depends=('ffmpeg' 'libjpeg' 'v4l-utils')
 backup=('etc/motion/motion.conf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	rc.motion
+	ffmpeg-0.8.patch
+	linux-headers.patch)
+md5sums=('1ba0065ed50509aaffb171594c689f46'
+         '77be944e4466ab66836d50ea216af3b6'
+         'd36687710837d69fbce4608b1345fa34'
+         'd8c3c4fdded5cfbd729710475559a21d')
+sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
+          'e092b0d880d0169feb56ed1e8a3c95729a7896f7'
+          '6912448db0711f85322505ee6f8052f8f98ae634'
+          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -33,29 +42,3 @@ package(){
 
   install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
 }
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '2f422c268337dce583b9dac344005e93')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '7b41c8c273980c147694d82af7c9cb9e51302dd9')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '5db295d7c2e4c38f36e861a3c4dfdd8d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '2b12df6d9053d17f6ac1969e3510dd50c6fe6667')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34'
-         'd8c3c4fdded5cfbd729710475559a21d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634'
-          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
diff --git a/community/motion/rc.motion b/community/motion/rc.motion
index 6ae95d17b..b6057744a 100755
--- a/community/motion/rc.motion
+++ b/community/motion/rc.motion
@@ -7,6 +7,7 @@ PID=`pidof -o %PPID /usr/bin/motion`
 case "$1" in
   start)
     stat_busy "Starting Motion"
+    mkdir -p /var/run/motion
     [ -z "$PID" ] && /usr/bin/motion
     if [ $? -gt 0 ]; then
       stat_fail
@@ -31,6 +32,6 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0