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

Conflicts:
	community-testing/nginx/PKGBUILD
	community-testing/nginx/nginx.install
	community/chrony/PKGBUILD
	community/lxdm/PKGBUILD
	community/oidentd/PKGBUILD
	community/oss/PKGBUILD
	community/pdnsd/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/subtle/PKGBUILD
	core/kmod/PKGBUILD
	core/lvm2/PKGBUILD
	core/openldap/PKGBUILD
	core/systemd/PKGBUILD
	extra/smartmontools/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 58 insertions, 11 deletions

diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 04ecbcdd0..ef4a3a4b7 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 72159 2012-06-09 08:34:59Z bpiotrowski $
+# $Id: PKGBUILD 72804 2012-06-22 13:10:36Z dreisner $
 # Maintainer: Bartłomiej Piotrowski
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=11
-pkgdesc="Lightweight Display Manager (part of LXDE)"
+pkgrel=12
+pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
 license=('GPL')
@@ -19,7 +19,7 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
         glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        greeter-session.patch lxdm-daemon lxdm-pam)
+        greeter-session.patch rc.d lxdm-pam service)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'a1e3c46a8bef691bc544028f5b6cfe22'
          'baed9055e8825a5511712bc095197519'
@@ -27,7 +27,8 @@ md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'd2e4a4a22ee2aa1a986be154c647b6c6'
          '28475239d0c8b4fd778ec49f5ec72962'
          '705f394052fdd0dec22e95321d170de0'
-         'b20fe3c8487a039050986d60e45233a9')
+         'b20fe3c8487a039050986d60e45233a9'
+         '4aaa9a7175cf327d9f7651c2586ef922')
 
 build() {
   	cd $srcdir/$pkgname-$pkgver
@@ -46,15 +47,16 @@ build() {
 
 package() {
   	cd $srcdir/$pkgname-$pkgver
-  	make DESTDIR="${pkgdir}" install
+  	make DESTDIR=$pkgdir install
 
-	install -m644 ${srcdir}/lxdm-pam ${pkgdir}/etc/pam.d/lxdm
-	install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm
-    install -d ${pkgdir}/var/{lib,run}/lxdm
+	install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
+	install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
+	install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
+    install -d $pkgdir/var/{lib,run}/lxdm
 
 	# fix the greeter location
-	sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf
+	sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
 
     # avoid conflict with filesystem>=2012.06
-    rm -r "$pkgdir/var/run"
+    rm -r $pkgdir/var/run
 }
diff --git a/community/lxdm/rc.d b/community/lxdm/rc.d
new file mode 100644
index 000000000..68eb6225d
--- /dev/null
+++ b/community/lxdm/rc.d
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID `which lxdm-binary`)
+case "$1" in
+  start)
+    stat_busy "Starting LXDM Display Manager"
+    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon lxdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping LXDM Display Manager"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon lxdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/lxdm/service b/community/lxdm/service
new file mode 100644
index 000000000..b76e1190e
--- /dev/null
+++ b/community/lxdm/service
@@ -0,0 +1,9 @@
+[Unit]
+Description=LXDE Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lxdm
+
+[Install]
+WantedBy=graphical.target