diff -ur ../extra/system/irda-utils/PKGBUILD irda-utils/PKGBUILD
--- ../extra/system/irda-utils/PKGBUILD	2006-06-30 22:00:28.000000000 -0500
+++ irda-utils/PKGBUILD	2007-07-07 19:57:57.000000000 -0500
@@ -2,16 +2,19 @@
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 pkgname=irda-utils
-pkgver=0.9.17
+pkgver=0.9.18
 pkgrel=1
 pkgdesc="Utilities for infrared communication between devices"
 backup=(etc/conf.d/irda)
 makedepends=('pciutils')
 depends=('glib2')
+arch=('i686')
 source=(http://dl.sourceforge.net/sourceforge/irda/$pkgname-$pkgver.tar.gz irda irda.conf.d irda.patch)
 url="http://irda.sourceforge.net/"
-md5sums=('65f9be306d2367996e27264ef0b70bd4' '8f7d38590d089041e5246eb0ee3c8291'\
-         '1a9c76b74faa993cc900152361798c50' '1a9d89a4b72679cc76bfe8e405c6457c')
+md5sums=('84dc12aa4c3f61fccb8d8919bf4079bb'
+         '8f7d38590d089041e5246eb0ee3c8291'
+         '1a9c76b74faa993cc900152361798c50'
+         '77ee5efcb67f530f92c7de964ec08d79')
 
 build()
 {
Only in irda-utils/: irda-utils.patch
diff -ur ../extra/system/irda-utils/irda.patch irda-utils/irda.patch
--- ../extra/system/irda-utils/irda.patch	2006-07-16 11:50:32.000000000 -0500
+++ irda-utils/irda.patch	2007-07-07 19:55:56.000000000 -0500
@@ -1,6 +1,17 @@
-diff -ur irda-utils-0.9.17.orig/irnetd/Makefile irda-utils-0.9.17/irnetd/Makefile
---- irda-utils-0.9.17.orig/irnetd/Makefile	2006-03-09 07:25:19.000000000 +0100
-+++ irda-utils-0.9.17/irnetd/Makefile	2006-05-16 11:52:18.000000000 +0200
+diff -ur irda-utils-0.9.18.old/findchip/Makefile irda-utils-0.9.18/findchip/Makefile
+--- irda-utils-0.9.18.old/findchip/Makefile	2007-07-07 19:35:29.000000000 -0500
++++ irda-utils-0.9.18/findchip/Makefile	2007-07-07 19:53:55.000000000 -0500
+@@ -32,6 +32,7 @@
+ include ../output.mak
+ 
+ CC      = gcc
++SYS_INCLUDES = -I/usr/include -I/usr/src/linux/include
+ CFLAGS= $(RPM_OPT_FLAGS) $(SYS_INCLUDES) -O2 -Wall -Wstrict-prototypes
+ 
+ SRCS = findchip.c smc.c nsc.c winbond.c
+diff -ur irda-utils-0.9.18.old/irnetd/Makefile irda-utils-0.9.18/irnetd/Makefile
+--- irda-utils-0.9.18.old/irnetd/Makefile	2007-07-07 19:35:29.000000000 -0500
++++ irda-utils-0.9.18/irnetd/Makefile	2007-07-07 19:37:35.000000000 -0500
 @@ -55,7 +55,7 @@
  
  install: irnetd
@@ -10,101 +21,3 @@
  
  
  clean:
-diff -ur irda-utils-0.9.17.orig/smcinit/smcinit.c irda-utils-0.9.17/smcinit/smcinit.c
---- irda-utils-0.9.17.orig/smcinit/smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/smcinit.c	2006-05-16 11:53:32.000000000 +0200
-@@ -262,7 +262,7 @@
- 	 */
- 	struct pci_access *acc;
- 	struct pci_dev *dev;
--	word twobyte;
-+	u16 twobyte;
- 	int i = 0, chip = 0;
- 	int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
- 	unsigned int *address, SMC_BASE = 0;
-@@ -279,7 +279,7 @@
- 	}
- 	acc = pci_alloc();
- 	pci_init(acc);
--	dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);	/* 5100 also dev
-+	dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);	/* 5100 also dev
- 								 * 1f */
- 	twobyte = pci_read_word(dev, VID);
- 	if (twobyte != 0x8086) {
-diff -ur irda-utils-0.9.17.orig/smcinit/tosh1800-smcinit.c irda-utils-0.9.17/smcinit/tosh1800-smcinit.c
---- irda-utils-0.9.17.orig/smcinit/tosh1800-smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/tosh1800-smcinit.c	2006-05-16 11:54:20.000000000 +0200
-@@ -53,8 +53,8 @@
-  */
- struct port_decoding_access_info {
-     int port;
--    byte reg;
--    byte or_mask;
-+    u8 reg;
-+    u8 or_mask;
- };
- 
- struct port_decoding_access_info ali1533_ports[] = {
-@@ -100,7 +100,7 @@
- 
- struct smc_chip_model {
-     char *name;
--    byte version_id;
-+    u8 version_id;
-     int (*config_function) (int revision, int cfgbase, int sirbase,
-                             int firbase, int dma, int irq);
- };
-@@ -257,7 +257,7 @@
- static int print_ali1533_port_status(struct pci_dev *dev)
- {
-     struct port_decoding_access_info *p;
--    byte onebyte;
-+    u8 onebyte;
-     int i;
- 
-     DEBUG("printing port status");
-@@ -283,7 +283,7 @@
- static int set_ali1533_port(struct pci_dev *dev, int port, int decode)
- {
-     struct port_decoding_access_info info;
--    byte previousval, onebyte, and_mask;
-+    u8 previousval, onebyte, and_mask;
-     int retval;
- 
-     DEBUG_VAL("looking for port", port);
-@@ -405,7 +405,7 @@
- 
- static int configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte onebyte;
-+    u8 onebyte;
-     int retval;
- 
-     /* claudiuc: revision is not used yet */
-@@ -504,7 +504,7 @@
- static int
- configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq)
- {
--    byte version_id, revision_id;
-+    u8 version_id, revision_id;
-     struct smc_chip_model *chip_model;
-     int retval;
- 
-diff -ur irda-utils-0.9.17.orig/smcinit/tosh2450-smcinit.c irda-utils-0.9.17/smcinit/tosh2450-smcinit.c
---- irda-utils-0.9.17.orig/smcinit/tosh2450-smcinit.c	2006-03-09 07:25:24.000000000 +0100
-+++ irda-utils-0.9.17/smcinit/tosh2450-smcinit.c	2006-05-16 11:55:42.000000000 +0200
-@@ -59,12 +59,12 @@
- 	/* setpci.c */
- 	struct pci_access *acc;
- 	struct pci_dev *dev;
--	word twobyte;
-+	u16 twobyte;
- 	
- 	acc = pci_alloc();
- 	pci_init(acc);
- 	
--	dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);
-+	dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);
- 	
- 	twobyte = pci_read_word(dev,VID);
- 	if (twobyte != INTEL_VID){