Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

1 files changed, 30 insertions, 17 deletions

diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 562b2df9d..cc0fdb7d7 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,32 +1,45 @@
-# $Id: PKGBUILD 36515 2011-01-03 19:26:37Z kchen $
+# $Id: PKGBUILD 56757 2011-10-11 21:02:19Z arodseth $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
-# Originally contributed by champus, madeye, Ranguvar and ninja_pt
-
+# Contributor: champus
+# Contributor: madeye
+# Contributor: Ranguvar
+# Contributor: ninja_pt
 pkgname=hwinfo
-pkgver=18.1
-_pkgver=$pkgver-3.5
-pkgrel=9
-pkgdesc='The hardware detection tool from openSUSE'
+pkgver=19.0
+pkgrel=2
+pkgdesc='Hardware detection tool from openSUSE'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opensuse.org/'
 license=('GPL2')
 depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm"
-        'kbd.patch')
-md5sums=('17c2a703643d1f007859c5e743589bb8'
+source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.1.src.rpm"
+        'custom_ioctl.patch')
+md5sums=('751238feaa13449324593ee5e145cd56'
          '1500ecfa26f6aaf4d7967eea74e86e5d')
 
 build() {
   cd "${srcdir}"
-  rpmextract.sh "${pkgname}-${_pkgver}.src.rpm"
-  tar -xjf $pkgname-$pkgver.tar.bz2
-  cd "${srcdir}/${pkgname}-${pkgver}"
 
-# Apply patch for custom ioctl
-  patch -p 0 < ../kbd.patch
+  msg2 "Extracting source rpm..."
+  rpmextract.sh "${pkgname}-${pkgver}-1.1.src.rpm"
+  tar jxf ${pkgname}-${pkgver}.tar.bz2
+  cd "${pkgname}-${pkgver}"
+  msg2 "Patching..."
+  patch -p0 < ../custom_ioctl.patch
+  msg2 "Compiling..."
+  make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make -j1 LIBDIR=/usr/lib
-  make LIBDIR=/usr/lib DESTDIR=$pkgdir install
+  msg2 "Packaging files..."
+  make LIBDIR=/usr/lib DESTDIR=${pkgdir} install
+  msg2 "Cleaning up..."
+  rmdir "${pkgdir}/sbin"
 }
+
+# vim:set ts=2 sw=2 et: