Mon May 13 01:16:27 PDT 2013

11 files changed, 35 insertions, 62 deletions

diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index f7958abdd..2f1f91bae 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79125 2012-10-30 23:07:13Z heftig $
+# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=18
+pkgrel=21
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -18,52 +18,61 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         '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 pam-env-vars.patch industrial-greeterui.patch
-        rc.d lxdm-pam service)
+		lxdm.pam  lxdm.service
+		lxdm-0.4.1-Xsession-source-profile.patch
+		lxdm-0.4.1-conf.patch
+		lxdm-0.4.1-event-check-bug.patch
+		lxdm-0.4.1-industrial-greeter-ui.patch
+		lxdm-0.4.1-modern-systems.patch
+		lxdm-0.4.1-nolang-show-sessions.patch
+		lxdm-0.4.1-pam-env-vars.patch)
+
+prepare(){
+    cd $srcdir/$pkgname-$pkgver
+    patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch
+}
 
 build() {
     cd $srcdir/$pkgname-$pkgver
 
-    patch -Np1 -i $srcdir/glib2-2.32.0.patch
-    patch -Np1 -i $srcdir/greeter-session.patch
-    patch -Np1 -i $srcdir/pam-env-vars.patch
 
-    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
+    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin
     make
   	
-    patch -Np0 -i $srcdir/lxdm.patch
-    patch -Np0 -i $srcdir/lxdm.conf.patch
-    patch -Np0 -i $srcdir/Xsession.patch
-    patch -Np0 -i $srcdir/industrial-greeterui.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-modern-systems.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-conf.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-Xsession-source-profile.patch
+    patch -Np0 -i $srcdir/lxdm-0.4.1-industrial-greeter-ui.patch
 }
 
 
 package() {
     cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
+    make DESTDIR=$pkgdir sbindir=/usr/bin install
 
-    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 -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm
+    install -Dm644 $srcdir/lxdm.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 's:sbin:bin:' $pkgdir/usr/bin/lxdm
 
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
 }
 
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         '9cc734228696a3c6f06d91bba61b03c1'
+         'b86317143ae44d7ed38c150fe4f25502'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         'c50dd01b715b0a236407d48066191601'
          'a1e3c46a8bef691bc544028f5b6cfe22'
+         '2c4afdbe3532be4f90d8f6240d352766'
          'baed9055e8825a5511712bc095197519'
-         'c50dd01b715b0a236407d48066191601'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
          '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         '705f394052fdd0dec22e95321d170de0'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'e8cc66eb1a2405d2d9d184a727cbd9d8')
-
+         '4c1d43e81e9a256e8d1ea7686c24b3d3')
diff --git a/community/lxdm/Xsession.patch b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
index 035ff0383..035ff0383 100644
--- a/community/lxdm/Xsession.patch
+++ b/community/lxdm/lxdm-0.4.1-Xsession-source-profile.patch
diff --git a/community/lxdm/lxdm.conf.patch b/community/lxdm/lxdm-0.4.1-conf.patch
index 1744e557e..1744e557e 100644
--- a/community/lxdm/lxdm.conf.patch
+++ b/community/lxdm/lxdm-0.4.1-conf.patch
diff --git a/community/lxdm/glib2-2.32.0.patch b/community/lxdm/lxdm-0.4.1-event-check-bug.patch
index cebfc6133..cebfc6133 100644
--- a/community/lxdm/glib2-2.32.0.patch
+++ b/community/lxdm/lxdm-0.4.1-event-check-bug.patch
diff --git a/community/lxdm/industrial-greeterui.patch b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
index a2a366809..a2a366809 100644
--- a/community/lxdm/industrial-greeterui.patch
+++ b/community/lxdm/lxdm-0.4.1-industrial-greeter-ui.patch
diff --git a/community/lxdm/lxdm.patch b/community/lxdm/lxdm-0.4.1-modern-systems.patch
index a703a386d..a703a386d 100644
--- a/community/lxdm/lxdm.patch
+++ b/community/lxdm/lxdm-0.4.1-modern-systems.patch
diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
index f3b94a57a..f3b94a57a 100644
--- a/community/lxdm/greeter-session.patch
+++ b/community/lxdm/lxdm-0.4.1-nolang-show-sessions.patch
diff --git a/community/lxdm/pam-env-vars.patch b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
index ab8605ff1..ab8605ff1 100644
--- a/community/lxdm/pam-env-vars.patch
+++ b/community/lxdm/lxdm-0.4.1-pam-env-vars.patch
diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm.pam
index 57f33b221..57f33b221 100644
--- a/community/lxdm/lxdm-pam
+++ b/community/lxdm/lxdm.pam
diff --git a/community/lxdm/service b/community/lxdm/lxdm.service
index e1840476c..026d62b50 100644
--- a/community/lxdm/service
+++ b/community/lxdm/lxdm.service
@@ -3,7 +3,7 @@ Description=LXDE Display Manager
 After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/sbin/lxdm
+ExecStart=/usr/bin/lxdm
 
 [Install]
 Alias=display-manager.service
diff --git a/community/lxdm/rc.d b/community/lxdm/rc.d
deleted file mode 100644
index 68eb6225d..000000000
--- a/community/lxdm/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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