Fri Jun 24 23:06:35 UTC 2011

2 files changed, 42 insertions, 32 deletions

diff --git a/extra/keytouch/PKGBUILD b/extra/keytouch/PKGBUILD
index 34a5c53a6..bfc3d182f 100644
--- a/extra/keytouch/PKGBUILD
+++ b/extra/keytouch/PKGBUILD
@@ -1,46 +1,59 @@
-# $Id: PKGBUILD 56013 2009-10-17 20:37:01Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 128421 2011-06-23 23:07:34Z eric $
+# Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: mouse256 & AndyRTR
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=keytouch
 pkgver=2.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard"
 arch=('i686' 'x86_64')
 url="http://keytouch.sourceforge.net/"
 license=('GPL')
-depends=('libxtst' 'gnome-menus' 'alsa-lib')
-makedepends=('pkgconfig')
+depends=('libxtst' 'gnome-menus' 'alsa-lib' 'gtk2')
+optdepends=('acpid: for ACPI support')
 options=('!makeflags')
 install=keytouch.install
 source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \
         keytouch.daemon keytouch.desktop Xsession)
-md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' 'a35776aee9361577220f718be81c2b4d'\
-         'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9')
-sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' 'af23f4526cb1f3e5b9a3680af6a24d1566dabb7d'\
-         '5bac2f62f1ac26caa32da02a8075dc090d981cfb' '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
+md5sums=('c3a917ae9666c9649d43d9aa09ecc96a'
+         '5bd72f347f56c0524c7a7c8f44fc9a3a'
+         'c5ffe28988dc74fae812ffe204f8883b'
+         '795430001f4fdb6691d0e93b09a241a9')
+sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80'
+          '9c3ff4fd979fd0322014768bec132ddf005c7f7b'
+          '5bac2f62f1ac26caa32da02a8075dc090d981cfb'
+          '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make  || return 1
-  install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} || return 1
-  install -d "${pkgdir}/usr/share/keytouch" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  cd "${srcdir}/${pkgname}-${pkgver}/keytouch-config"
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  cd "${srcdir}/${pkgname}-${pkgver}/keytouch-keyboard"
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  install -D -m755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" || return 1
-  install -D -m644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" || return 1
-  install -D -m755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" || return 1
-  chmod 755  "${pkgdir}"/etc/X11/Xsession.d/* || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+
+  cd keytouch-config
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+
+  cd ../keytouch-keyboard
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d}
+  install -d "${pkgdir}/usr/share/keytouch"
+  make DESTDIR="${pkgdir}" install
+
+  cd keytouch-config
+  make DESTDIR="${pkgdir}" install
+
+  cd ../keytouch-keyboard
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch"
+  install -Dm644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop"
+  install -Dm755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession"
+  chmod 755 "${pkgdir}"/etc/X11/Xsession.d/*
   rm "${pkgdir}"/etc/rc.d/*.sh
 }
diff --git a/extra/keytouch/keytouch.daemon b/extra/keytouch/keytouch.daemon
index e43bea979..d705b3dfc 100755
--- a/extra/keytouch/keytouch.daemon
+++ b/extra/keytouch/keytouch.daemon
@@ -7,9 +7,6 @@ PID=$(pidof -o %PPID /usr/bin/keytouch-acpid)
 case "$1" in
   start)
     stat_busy "Starting keyTouch Daemon"
-    if [ -x /etc/rc.d/acpid ]; then
-      ck_daemon acpid && /etc/rc.d/acpid start
-    fi
     /usr/bin/keytouch-init
     if [ -z "$PID" ]; then
       /usr/bin/keytouch-acpid &> /dev/null &