From 9d04fcc07e89d2ebf3d36330f671e0fa4e489abd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Feb 2012 16:32:31 +0100
Subject: [PATCH] lvm2: update to 2.02.90.

---
 srcpkgs/lvm2/device-mapper.template    | 14 ++++----------
 srcpkgs/lvm2/files/lvm2.initramfs-hook |  4 ++--
 srcpkgs/lvm2/liblvm2app.template       |  9 ++-------
 srcpkgs/lvm2/template                  | 19 ++++---------------
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template
index c705861721f..25fe7856392 100644
--- a/srcpkgs/lvm2/device-mapper.template
+++ b/srcpkgs/lvm2/device-mapper.template
@@ -1,6 +1,5 @@
 # Template file for 'device-mapper'
 #
-revision=1
 short_desc="Device Mapper userspace library and tools"
 long_desc="
  This package contains the supporting userspace utility, dmsetup,
@@ -8,13 +7,8 @@ long_desc="
 
 replaces="lvm2-device-mapper>=0"
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/lib ${DESTDIR}/usr/share/man/man8 \
-		${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/sbin/dm* ${DESTDIR}/sbin
-	mv ${SRCPKGDESTDIR}/lib/libdevmapper.so* ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libdevmapper.so ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man8/dm* ${DESTDIR}/usr/share/man/man8
+do_install() {
+	vmove "usr/sbin/dm*" sbin
+	vmove "usr/lib/libdevmapper.so*" usr/lib
+	vmove "usr/share/man/man8/dm*" usr/share/man/man8
 }
diff --git a/srcpkgs/lvm2/files/lvm2.initramfs-hook b/srcpkgs/lvm2/files/lvm2.initramfs-hook
index e2c93d46322..7e4ee5ac754 100644
--- a/srcpkgs/lvm2/files/lvm2.initramfs-hook
+++ b/srcpkgs/lvm2/files/lvm2.initramfs-hook
@@ -25,8 +25,8 @@ if [ -e /etc/lvm/lvm.conf ]; then
 	cp /etc/lvm/lvm.conf ${DESTDIR}/etc/lvm/
 fi
 
-copy_exec /sbin/dmsetup /sbin
-copy_exec /sbin/lvm /sbin
+copy_exec /usr/sbin/dmsetup /sbin
+copy_exec /usr/sbin/lvm /sbin
 
 for x in dm_mod dm_snapshot dm_mirror; do
 	manual_add_modules ${x}
diff --git a/srcpkgs/lvm2/liblvm2app.template b/srcpkgs/lvm2/liblvm2app.template
index d81fd40ab49..939d5b99b8d 100644
--- a/srcpkgs/lvm2/liblvm2app.template
+++ b/srcpkgs/lvm2/liblvm2app.template
@@ -1,16 +1,11 @@
 # Template file for 'liblvm2app'
 #
-revision=1
 short_desc="LVM2 application library"
 long_desc="
  This package contains the lvm2app shared library. It allows easier access
  to the basic LVM objects and provides functions to enumerate, create or
  modify them."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/lib/liblvm2app.so* ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/liblvm2app.so ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/liblvm2app.so*" usr/lib
 }
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 2363ea53419..b88c90ad436 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,20 +1,16 @@
 # Template file for 'lvm2'
 pkgname=lvm2
-version=2.02.85
-revision=3
+version=2.02.90
 wrksrc=LVM2.${version}
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
 build_style=gnu-configure
 configure_args="--disable-selinux --enable-readline --enable-pkgconfig
- --enable-fsadm --enable-applib"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version
- sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin
- libdir=$XBPS_DESTDIR/$pkgname-$version/lib install"
+--enable-fsadm --enable-applib --sbindir=/usr/sbin --libdir=/usr/lib"
 short_desc="Logical Volume Manager 2 utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sourceware.org/lvm2/"
 license="GPL-2, LGPL-2.1"
-checksum=e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7
+checksum=296b67644f1ea8ddcfe0360e269cf934e2ede7a658a24151df95b3b1d0469ad5
 long_desc="
  LVM2 includes all of the support for handling read/write operations on
  physical volumes (hard disks, RAID-Systems, magneto optical, etc.,
@@ -30,8 +26,7 @@ triggers="initramfs-tools"
 Add_dependency run bash
 Add_dependency build readline-devel
 
-post_install()
-{
+post_install() {
 	local initramfsdir=usr/share/initramfs-tools
 
 	vmkdir etc/lvm/archive
@@ -43,10 +38,4 @@ post_install()
 		${initramfsdir}/hooks lvm2
 	vinstall ${FILESDIR}/lvm2.initramfs-local-top 755 \
 		${initramfsdir}/scripts/local-top lvm2
-	rm -f ${DESTDIR}/lib/*.so ${DESTDIR}/usr/lib/*.so
-	cd ${DESTDIR}/usr/lib && \
-		ln -sf $(echo ../../lib/libdevmapper.so.*) libdevmapper.so
-	cd ${DESTDIR}/usr/lib && \
-		ln -sf $(echo ../../lib/liblvm2app.so.*) liblvm2app.so
-	chmod 755 ${DESTDIR}/lib/*.so* ${DESTDIR}/sbin/*
 }