Wed Oct 12 23:14:40 UTC 2011

2 files changed, 47 insertions, 20 deletions

diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 1a3cbedb3..28e2ea582 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,34 +1,45 @@
-# $Id: PKGBUILD 56582 2011-10-09 02:28:04Z tdziedzic $
+# $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.5
-_pkgver=$pkgver-2.7
-pkgrel=1
-pkgdesc='The hardware detection tool from openSUSE'
-arch=('i686' 'x86_64')
+pkgver=19.0
+pkgrel=2
+pkgdesc='Hardware detection tool from openSUSE'
+arch=('x86_64' 'i686')
 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
+}
 
-  make -j1 LIBDIR=/usr/lib
-  make LIBDIR=/usr/lib DESTDIR=$pkgdir install
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  msg2 "Packaging files..."
+  make LIBDIR=/usr/lib DESTDIR=${pkgdir} install
+  msg2 "Cleaning up..."
+  rmdir "${pkgdir}/sbin"
 }
-md5sums=('7d862ddd407200e40d1e0954e09cd566'
-         '1500ecfa26f6aaf4d7967eea74e86e5d')
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/hwinfo/custom_ioctl.patch b/community/hwinfo/custom_ioctl.patch
new file mode 100644
index 000000000..b9dd67161
--- /dev/null
+++ b/community/hwinfo/custom_ioctl.patch
@@ -0,0 +1,16 @@
+--- src/hd/kbd.c.old	2010-03-15 23:37:52.000000000 +0800
++++ src/hd/kbd.c	2010-03-22 10:50:58.000000000 +0800
+@@ -146,11 +146,13 @@
+   }
+ 
+   if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
++    /* Removing since TIOCGDEV is not supported by the mainline kernel
+     if(ioctl(fd, TIOCGDEV, &u) != -1) {
+       tty_major = (u >> 8) & 0xfff;
+       tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00);
+       ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor);
+     }
++    */
+ 
+     if (0)
+ 	    ;