Sat Apr 9 14:42:55 UTC 2011

2 files changed, 34 insertions, 36 deletions

diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index de2865f60..ddc286ee0 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 40102 2011-02-20 03:59:25Z svenstaro $
+# $Id: PKGBUILD 44559 2011-04-08 22:50:52Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64')
 url="http://mumble.sourceforge.net"
@@ -14,53 +14,48 @@ depends=('avahi' 'lsb-release' 'protobuf' 'qt>=4.4.0')
 makedepends=('boost')
 conflicts=('murmur-ice' 'murmur-static' 'murmur-git')
 backup=("etc/murmur.ini"
-    "etc/logrotate.d/murmur"
-    "etc/conf.d/murmur" )
+        "etc/logrotate.d/murmur"
+        "etc/conf.d/murmur" )
 install="murmur.install"
 source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
-    "murmur.rc.d"
-    "murmur.conf.d"
-    "murmur.dbus.conf"
-    "murmur.logrotate.d"
-)
+        "murmur.rc.d"
+        "murmur.conf.d"
+        "murmur.dbus.conf"
+        "murmur.logrotate.d")
 md5sums=('55804e3dfe98b16eeb40abca6c254625'
-         'b99061be67c54bf0bb4a061fd1280281'
+         'eec4ac14524be18738f7caf8140a3611'
          '11c1cc875e8021739ec2087252cf0533'
          'eddea4cdbd0bde4b960a67e16b5d5478'
-         'c56726cb267ead68f37f35c28e36e6fa'
-)
+         'c56726cb267ead68f37f35c28e36e6fa')
 
 build() {
-    cd ${srcdir}/mumble-$pkgver
+  cd ${srcdir}/mumble-$pkgver
 
-    qmake main.pro CONFIG+="no-client no-ice"
-    make
+  qmake main.pro CONFIG+="no-client no-ice"
+  make release
 }
 
 package() {
-    cd ${srcdir}/mumble-$pkgver
+  cd ${srcdir}/mumble-$pkgver
 
-    sed -e "1i# vi:ft=cfg" \
-        -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \
-        -e "s|dbus=session|#dbus=system|" \
-        -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \
-        -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \
-        -e "s|#uname=|uname=murmur|" \
-        -i scripts/murmur.ini
+  sed -e "1i# vi:ft=cfg" \
+    -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \
+    -e "s|dbus=session|#dbus=system|" \
+    -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \
+    -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \
+    -e "s|#uname=|uname=murmur|" \
+    -i scripts/murmur.ini
 
-    install -dm755 ${pkgdir}/var/lib/murmur
-    install -dm755 ${pkgdir}/var/log/murmur
-    install -dm755 ${pkgdir}/var/run/murmur
-    install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd
-    install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini
-    install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur
-    install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur
-    install -Dm644 ${srcdir}/murmur.dbus.conf \
-                      ${pkgdir}/etc/dbus-1/system.d/murmur.conf
-    install -Dm644 ${srcdir}/murmur.logrotate.d \
-                      ${pkgdir}/etc/logrotate.d/murmur
-    install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
-    install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
+  install -dm755 ${pkgdir}/var/lib/murmur
+  install -dm755 ${pkgdir}/var/log/murmur
+  install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd
+  install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini
+  install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur
+  install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur
+  install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf
+  install -Dm644 ${srcdir}/murmur.logrotate.d ${pkgdir}/etc/logrotate.d/murmur
+  install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
+  install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/community/murmur/murmur.rc.d b/community/murmur/murmur.rc.d
index 7a41e77da..c4307f406 100644
--- a/community/murmur/murmur.rc.d
+++ b/community/murmur/murmur.rc.d
@@ -11,6 +11,9 @@ PID=$(pidof -o %PPID /usr/sbin/murmurd)
 case "$1" in
   start)
     stat_busy "Starting murmur"
+
+    [ -d /var/run/murmur ] || mkdir -p /var/run/murmur
+
     [ -z "$PID" ] && /usr/sbin/murmurd $PARAMS
     if [ $? -gt 0 ]; then
       stat_fail