From 9727d7eb76f137fb7e5205a1e1284f351c13d98b Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Thu, 16 Jul 2009 14:22:04 +0200
Subject: [PATCH] util-linux-ng: update to 2.16

---
 util-linux-ng/.footprint | 14 ++++++++------
 util-linux-ng/.md5sum    |  3 +--
 util-linux-ng/Pkgfile    | 17 +++++------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/util-linux-ng/.footprint b/util-linux-ng/.footprint
index fa4bcfa5..74fd0d30 100644
--- a/util-linux-ng/.footprint
+++ b/util-linux-ng/.footprint
@@ -7,10 +7,10 @@ drwxr-xr-x	root/root	bin/
 drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/adjtime (EMPTY)
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libblkid.so.1 -> libblkid.so.1.0.0
--rwxr-xr-x	root/root	lib/libblkid.so.1.0.0
-lrwxrwxrwx	root/root	lib/libuuid.so.1 -> libuuid.so.1.0.0
--rwxr-xr-x	root/root	lib/libuuid.so.1.0.0
+lrwxrwxrwx	root/root	lib/libblkid.so.1 -> libblkid.so.1.1.0
+-rwxr-xr-x	root/root	lib/libblkid.so.1.1.0
+lrwxrwxrwx	root/root	lib/libuuid.so.1 -> libuuid.so.1.3.0
+-rwxr-xr-x	root/root	lib/libuuid.so.1.3.0
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/agetty
 -rwxr-xr-x	root/root	sbin/blkid
@@ -83,10 +83,10 @@ drwxr-xr-x	root/root	usr/include/uuid/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libblkid.a
 -rwxr-xr-x	root/root	usr/lib/libblkid.la
-lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libblkid.so -> ../../lib/libblkid.so.1.1.0
 -rw-r--r--	root/root	usr/lib/libuuid.a
 -rwxr-xr-x	root/root	usr/lib/libuuid.la
-lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libuuid.so -> ../../lib/libuuid.so.1.3.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/blkid.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/uuid.pc
@@ -138,6 +138,8 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/uuid_compare.3.gz
 -rw-r--r--	root/root	usr/man/man3/uuid_copy.3.gz
 -rw-r--r--	root/root	usr/man/man3/uuid_generate.3.gz
+-rw-r--r--	root/root	usr/man/man3/uuid_generate_random.3.gz
+-rw-r--r--	root/root	usr/man/man3/uuid_generate_time.3.gz
 -rw-r--r--	root/root	usr/man/man3/uuid_is_null.3.gz
 -rw-r--r--	root/root	usr/man/man3/uuid_parse.3.gz
 -rw-r--r--	root/root	usr/man/man3/uuid_time.3.gz
diff --git a/util-linux-ng/.md5sum b/util-linux-ng/.md5sum
index e05fc184..82c0db8d 100644
--- a/util-linux-ng/.md5sum
+++ b/util-linux-ng/.md5sum
@@ -1,2 +1 @@
-5816827eeebdbe8d3fe3983d0fc3bcfd  util-linux-ng-2.16-rc2-install-hook.patch
-9de0a82e814b8f14483d5f9fae9aeff1  util-linux-ng-2.16-rc2.tar.bz2
+9623380641b0c2e0449f5b1ecc567663  util-linux-ng-2.16.tar.bz2
diff --git a/util-linux-ng/Pkgfile b/util-linux-ng/Pkgfile
index 6aef92f4..e3119f91 100644
--- a/util-linux-ng/Pkgfile
+++ b/util-linux-ng/Pkgfile
@@ -4,28 +4,21 @@
 # Depends on:  ncurses zlib
 
 name=util-linux-ng
-version=2.16-rc2
+version=2.16
 release=1
-source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.16/$name-$version.tar.bz2
-        $name-$version-install-hook.patch)
+source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.16/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
 
-    patch -p1 -i $SRC/$name-$version-install-hook.patch
-
-    aclocal
-    automake
-
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --disable-{nls,wall} \
                 --enable-{write,rdev,raw,kill}
-    make -j1 
-    make -j1 DESTDIR=$PKG install
+    make
+    make DESTDIR=$PKG install
 
-    install -d $PKG/etc
-    install -d $PKG/var/{lib/libuuid,run/uuidd}
+    install -d $PKG/{etc,var/{lib/libuuid,run/uuidd}}
     touch $PKG/etc/adjtime
 
     rm -r $PKG/usr/share