Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

3 files changed, 31 insertions, 28 deletions

diff --git a/abs/core-testing/fluxbox/ChangeLog b/abs/core-testing/fluxbox/ChangeLog
new file mode 100644
index 0000000..f2f2e81
--- /dev/null
+++ b/abs/core-testing/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-testing/fluxbox/PKGBUILD b/abs/core-testing/fluxbox/PKGBUILD
index 6735ad0..6e1c9c0 100644
--- a/abs/core-testing/fluxbox/PKGBUILD
+++ b/abs/core-testing/fluxbox/PKGBUILD
@@ -1,9 +1,10 @@
-#add custom keys
-
+# $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=5
+pkgver=1.1.1
+pkgrel=2
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -11,30 +12,22 @@ 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 keys)
-
-md5sums=('990e276ead0d04421dce4080f485caca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed'\
-         '9ddb3fcd5f080574a44f394282132b3c')
-sha1sums=('7985e35fbb170fda24b9e04610690cd04c7a8748'
-          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
-          '51de3957bacfc4848529ba7df80bddca59b1a20b')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+        fluxbox.desktop keys)
+md5sums=('fa9fa8fe9a44f86522de5754f8b285ca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' 'f5e10bf230728190830717ed9d17770c')
+sha1sums=('6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 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
-  install -D -m655 $startdir/src/keys $startdir/pkg/usr/share/fluxbox/keys
-
+  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-testing/fluxbox/keys b/abs/core-testing/fluxbox/keys
index 06e5f21..b412cbd 100644
--- a/abs/core-testing/fluxbox/keys
+++ b/abs/core-testing/fluxbox/keys
@@ -20,9 +20,9 @@ Mod1 F12 :Workspace 12
 Mod1 x :ExecCommand xterm -fn *18*
 Mod1 s :ExecCommand mythtv-setup
 Mod1 m :ExecCommand mythfrontend
-Mod1 1 :ExecCommand sudo /etc/rc.d/mythtv-backend start
-Mod1 2 :ExecCommand sudo /etc/rc.d/mythtv-backend stop
-Mod1 3 :ExecCommand sudo /etc/rc.d/mythtv-backend restart
+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 killall -9 unclutter