3 files changed, 22 insertions, 34 deletions
diff --git a/abs/core/fluxbox/ChangeLog b/abs/core/fluxbox/ChangeLog
deleted file mode 100644
index f2f2e81..0000000
--- a/abs/core/fluxbox/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-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 08148ac..bd6d497 100644
--- a/abs/core/fluxbox/PKGBUILD
+++ b/abs/core/fluxbox/PKGBUILD
@@ -1,38 +1,35 @@
-# $Id: PKGBUILD 12779 2008-09-20 06:42:07Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor:  John Proctor <jproctor@prium.net>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.1.1
-pkgrel=17
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
 license=('MIT')
-depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2')
-makedepends=('pkgconfig')
+depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi')
+makedepends=('pkg-config')
+optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        fluxbox.desktop keys fluxbox_fullscreen_focus.patch)
+        fluxbox.desktop keys)
 
 build() {
-#  patch < fluxbox_fullscreen_focus.patch ${srcdir}/${pkgname}-${pkgver}/src/Window.cc || return 1
-  cd ${srcdir}/${pkgname}-${pkgver}
-  echo "Patching fluxbox"
-  patch -p1 < $srcdir/fluxbox_fullscreen_focus.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-    --enable-kde --enable-gnome \
-    --enable-xft --enable-xinerama \
-    --enable-imlib2 --enable-nls || return 1
-  make || return 1
-  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|' ${pkgdir}/usr/share/fluxbox/init || return 1
-  install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1
+    --enable-gnome --enable-xft --enable-xinerama \
+    --enable-imlib2 --enable-nls
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
   install -D -m644 ../keys ${pkgdir}/usr/share/$pkgname/keys || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('fa9fa8fe9a44f86522de5754f8b285ca'
+md5sums=('0eaa940a69c0a876a520bb85d67b8bec'
          'eeae9c88a2526ac0bd8afcd9ce97f9ed'
-         'd201812779a3e66c81b9ca753af39396'
-         'd4b1195c78ac08ad41a678a424086420')
+         'd201812779a3e66c81b9ca753af39396')
diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog
index f3f64c2..57b62e9 100644
--- a/abs/core/fluxbox/__changelog
+++ b/abs/core/fluxbox/__changelog
@@ -1,2 +1,3 @@
 2/22/11 - chw - Added keys file.
 2/23/11 - chw - Added fullscreen patch.
+8/21/11 - brf - Removed fullscreen patch; Not needed for v1.3.1