3 files changed, 51 insertions, 21 deletions
diff --git a/abs/core/fluxbox/ChangeLog b/abs/core/fluxbox/ChangeLog
new file mode 100644
index 0000000..f2f2e81
--- /dev/null
+++ b/abs/core/fluxbox/ChangeLog
@@ -0,0 +1,10 @@
+2008-09-19  Eric Belanger  <eric@archlinux.org>
+
+	* fluxbox 1.1.1-1
+	* Upstream update
+
+2008-09-05  Eric Belanger  <eric@archlinux.org>
+
+	* fluxbox 1.1.0.1-1
+	* Upstream update
+        * Added ChangeLog
diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD
index 9d09c63..b3a9a41 100644
--- a/abs/core/fluxbox/PKGBUILD
+++ b/abs/core/fluxbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 1350 2008-05-05 22:19:58Z eric $
+# $Id: PKGBUILD 12779 2008-09-20 06:42:07Z eric $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor:  John Proctor <jproctor@prium.net>
 
 pkgname=fluxbox
-pkgver=1.0.0
-pkgrel=1
+pkgver=1.1.1
+pkgrel=6
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -12,27 +12,20 @@ license=('MIT')
 depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2')
 makedepends=('pkgconfig')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
-        $pkgname.desktop fluxbox-1.0.0-gcc43.patch)
-md5sums=('990e276ead0d04421dce4080f485caca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed'\
-         '9ddb3fcd5f080574a44f394282132b3c')
-sha1sums=('7985e35fbb170fda24b9e04610690cd04c7a8748'
-          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
-          '51de3957bacfc4848529ba7df80bddca59b1a20b')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+        fluxbox.desktop keys)
 
 build() {
-  cd $startdir/src/$pkgname-${pkgver}
-  patch -p1 < ../fluxbox-1.0.0-gcc43.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-   --enable-kde --enable-gnome \
-   --enable-xft --enable-xinerama \
-   --enable-imlib2 --enable-nls
+    --enable-kde --enable-gnome \
+    --enable-xft --enable-xinerama \
+    --enable-imlib2 --enable-nls || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${pkgdir} install || return 1
  # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-(
-  sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide:  True|' \
-    $startdir/pkg/usr/share/fluxbox/init
-  install -D -m644 ../$pkgname.desktop \
-    $startdir/pkg/etc/X11/sessions/$pkgname.desktop
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
+  sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide:  True|' ${pkgdir}/usr/share/fluxbox/init || return 1
+  install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1
+  install -D -m644 ../keys ${pkgdir}/usr/share/fluxbox/keys || return 1
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
 }
diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys
new file mode 100644
index 0000000..fbacf75
--- /dev/null
+++ b/abs/core/fluxbox/keys
@@ -0,0 +1,27 @@
+OnDesktop Mouse1 :HideMenus
+OnDesktop Mouse2 :WorkspaceMenu
+OnDesktop Mouse3 :RootMenu
+OnDesktop Mouse4 :NextWorkspace
+OnDesktop Mouse5 :PrevWorkspace
+
+Mod1 Tab :NextWindow
+Mod1 Shift Tab :PrevWindow
+Mod1 F1 :Workspace 1
+Mod1 F2 :Workspace 2
+Mod1 F3 :Workspace 3
+Mod1 F4 :Workspace 4
+Mod1 F5 :Workspace 5
+Mod1 F6 :Workspace 6
+Mod1 F8 :Workspace 8
+Mod1 F9 :Workspace 9
+Mod1 F10 :Workspace 10
+Mod1 F11 :Workspace 11
+Mod1 F12 :Workspace 12
+Mod1 x :ExecCommand xterm -fn *18*
+Mod1 s :ExecCommand sudo taskset -c 0 mythtv-setup
+Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log
+Mod1 1 :ExecCommand sudo sv start mythbackend
+Mod1 2 :ExecCommand sudo sv stop mythbackend
+Mod1 3 :ExecCommand sudo sv restart mythbackend
+Mod1 h :ExecCommand MythVantage -h
+Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh