3 files changed, 27 insertions, 21 deletions
diff --git a/abs/extra/libnl/PKGBUILD b/abs/extra/libnl/PKGBUILD
index 4a6465a..8136059 100644
--- a/abs/extra/libnl/PKGBUILD
+++ b/abs/extra/libnl/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 930 2008-04-24 22:14:40Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
+
 pkgname=libnl
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for applications dealing with netlink sockets"
 arch=('i686' 'x86_64')
-url="http://people.suug.ch/~tgr/libnl"
+url="http://www.infradead.org/~tgr/libnl/"
 license=('GPL')
 depends=('glibc')
-source=(http://people.suug.ch/~tgr/${pkgname}/files/${pkgname}-${pkgver}.tar.gz ulong_max.patch)
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1' '255bb3740149d518766032675810c590')
+source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz"
+        'fix-compilation.patch')
 
 build() {
-  cd ${startdir}/src/libnl-${pkgver}
-  patch -p1 < ../ulong_max.patch
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd ${srcdir}/libnl-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-compilation.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/libnl-${pkgver}
+  make DESTDIR=${pkgdir} install
 }
+md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
+         '2490289a9edcc5c03802d151bcf3acc4')
diff --git a/abs/extra/libnl/fix-compilation.patch b/abs/extra/libnl/fix-compilation.patch
new file mode 100644
index 0000000..92c0696
--- /dev/null
+++ b/abs/extra/libnl/fix-compilation.patch
@@ -0,0 +1,10 @@
+--- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include <arpa/inet.h>
+ #include <netdb.h>
diff --git a/abs/extra/libnl/ulong_max.patch b/abs/extra/libnl/ulong_max.patch
deleted file mode 100644
index d9ef218..0000000
--- a/abs/extra/libnl/ulong_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.1/include/netlink-local.h.orig      2008-06-08 19:09:20.000000000
-+0200
-+++ libnl-1.1/include/netlink-local.h   2008-06-08 19:09:33.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
-
- #include <arpa/inet.h>
- #include <netdb.h>