Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

6 files changed, 97 insertions, 32 deletions

diff --git a/abs/extra/alsa-firmware/PKGBUILD b/abs/extra/alsa-firmware/PKGBUILD
index d9c890b..af2c544 100644
--- a/abs/extra/alsa-firmware/PKGBUILD
+++ b/abs/extra/alsa-firmware/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79046 2010-04-30 05:38:39Z tpowa $
+# $Id$
 # Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com>
 # Package Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=alsa-firmware
-pkgver=1.0.23
+pkgver=1.0.24.1
 pkgrel=1
 pkgdesc="ALSA firmware package"
 arch=('i686' 'x86_64')
@@ -14,20 +14,24 @@ options=(!strip)
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   # remove files which conflicts with kernel26-firmware
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin || return 1
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw
+  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp
+  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin
 }
-md5sums=('e3f755331d6d485f6fd697249b90f877')
+md5sums=('d37434dfcfececd8581d2f0bbe2fcf1b')
diff --git a/abs/extra/cambozola/PKGBUILD b/abs/extra/cambozola/PKGBUILD
new file mode 100644
index 0000000..27664f1
--- /dev/null
+++ b/abs/extra/cambozola/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Ernie Brodeur <ebrodeur@ujami.net>
+pkgname=cambozola
+pkgver=0.92
+pkgrel=1
+pkgdesc="A java servlet for streaming JPEG's from ip Cameras."
+url="http://www.charliemouse.com:8080/code/cambozola/"
+arch=('x86_64' 'i686')
+license=('GPL')
+depends=('java-runtime')
+makedepends=('apache-ant')
+source=("${url}${pkgname}-${pkgver}.tar.gz")
+md5sums=('602daba851e726e2399445fda3ca718f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ant
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  mkdir -p ${pkgdir}/usr/share/${pkgname}
+  cp dist/* ${pkgdir}/usr/share/${pkgname}/
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/abs/extra/geoip/PKGBUILD b/abs/extra/geoip/PKGBUILD
index 936aa57..32c5927 100644
--- a/abs/extra/geoip/PKGBUILD
+++ b/abs/extra/geoip/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 40078 2009-05-27 06:04:17Z juergen $
+# $Id$
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
+license=('GPL')
 depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
+backup=('etc/geoip/GeoIP.conf')
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
+md5sums=('05b7300435336231b556df5ab36f326d')
 
 build() {
-  cd ${srcdir}/GeoIP-${pkgver}
+  cd "${srcdir}/GeoIP-${pkgver}"
+
+  autoreconf -i
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
+  make
 }
 
 check() {
-
-  cd ${srcdir}/GeoIP-${pkgver}
-  make check || return 1
-
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make check
 }
 
 package() {
-  cd ${srcdir}/GeoIP-${pkgver}
-  make DESTDIR=${startdir}/pkg install
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('a802175d5b7e2b57b540a7dd308d9205')
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/help2man/help2man.install b/abs/extra/help2man/help2man.install
new file mode 100644
index 0000000..ab6585b
--- /dev/null
+++ b/abs/extra/help2man/help2man.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(help2man.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/abs/extra/htop/htop.c.patch b/abs/extra/htop/htop.c.patch
new file mode 100644
index 0000000..41a2dd3
--- /dev/null
+++ b/abs/extra/htop/htop.c.patch
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old	2010-11-24 20:45:38.000000000 +0200
++++ htop.c	2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+             printVersionFlag();
+             break;
+          case 's':
+-            if (strcmp(optarg, "help")) {
++            if (!strcmp(optarg, "help")) {
+                for (int j = 1; j < LAST_PROCESSFIELD; j++)
+                   printf ("%s\n", Process_fieldNames[j]);
+                exit(0);
diff --git a/abs/extra/mdbtools/PKGBUILD b/abs/extra/mdbtools/PKGBUILD
index c7a562d..870551c 100644
--- a/abs/extra/mdbtools/PKGBUILD
+++ b/abs/extra/mdbtools/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 pkgname=mdbtools
 pkgver=0.5
-pkgrel=8
+pkgrel=9
 pkgdesc="Utilities for viewing data and exporting schema from Microsoft Access Database files"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mdbtools/"