From af06980ad670061443a86ba16065b363c40df804 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 12 Aug 2009 12:22:09 +0200
Subject: [PATCH] libblkid: update to 2.16. Remove utils.

--HG--
extra : convert_revision : 1acbbbc24b4a681f5fdc3d5b580f17eb84611703
---
 templates/libblkid/build.diff     | 16 ++++++++--------
 templates/libblkid/devel.template |  8 ++------
 templates/libblkid/template       | 11 +++++------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/templates/libblkid/build.diff b/templates/libblkid/build.diff
index 7496e99ecee..20cc59fdd09 100644
--- a/templates/libblkid/build.diff
+++ b/templates/libblkid/build.diff
@@ -1,13 +1,13 @@
---- Makefile.in.orig	2009-05-13 04:24:38.602959508 +0200
-+++ Makefile.in	2009-05-13 04:25:11.570694167 +0200
-@@ -250,9 +250,7 @@ dist_noinst_DATA = $(dist_man_MANS)
- #
- ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
- ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
--SUBDIRS = include disk-utils fdisk getopt lib libs login-utils \
+--- Makefile.in.orig	2009-08-12 11:15:33.768923564 +0200
++++ Makefile.in	2009-08-12 11:16:29.184473940 +0200
+@@ -288,9 +288,7 @@ ul_libblkid_la = $(top_builddir)/shlibs/
+ ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
+ ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
+ ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
+-SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
 -	misc-utils po schedutils sys-utils text-utils tests \
 -	$(am__append_1) $(am__append_2) $(am__append_3)
-+SUBDIRS = libs
++SUBDIRS = shlibs 
  RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
  		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
  
diff --git a/templates/libblkid/devel.template b/templates/libblkid/devel.template
index 6d0cc5c7a1d..6d8d1f2da0b 100644
--- a/templates/libblkid/devel.template
+++ b/templates/libblkid/devel.template
@@ -9,10 +9,6 @@ Add_dependency run libblkid
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/share/man ${DESTDIR}/lib ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/lib/*.so ${DESTDIR}/lib
+	mkdir -p ${DESTDIR}
+	mv ${SRCPKGDESTDIR}/usr ${DESTDIR}
 }
diff --git a/templates/libblkid/template b/templates/libblkid/template
index 41e33d6f820..9e97f1be5db 100644
--- a/templates/libblkid/template
+++ b/templates/libblkid/template
@@ -1,18 +1,17 @@
 # Template file for 'libblkid'
 pkgname=libblkid
-version=2.15
+version=2.16
 _utilng=util-linux-ng
 wrksrc=${_utilng}-${version}
-distfiles="${KERNEL_SITE}/utils/$pkgname/v2.15/${_utilng}-${version}.tar.bz2"
+distfiles="${KERNEL_SITE}/utils/$pkgname/v2.16/${_utilng}-${version}.tar.bz2"
 build_style=gnu_configure
-configure_args="--with-fsprobe=builtin"
+configure_args="--disable-libuuid --enable-libblkid"
 short_desc="Library to handle device identification"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
+checksum=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
 long_desc="
  The libblkid package contains a library to handle device identification
- and token extraction, plus some utilities that use libblkid: findfs(8)
- and blkid(8)."
+ and token extraction."
 
 subpackages="devel"
 Add_dependency full	glibc