From 0c28e5c5b3ed25d462e7d78195fa8e6289e10881 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 12 Jul 2012 23:59:46 +0200
Subject: [PATCH] libcap: full switch to /usr.

---
 srcpkgs/libcap/libcap-devel.template |  7 +++----
 srcpkgs/libcap/libcap-pam.template   |  2 +-
 srcpkgs/libcap/libcap-progs.template |  2 +-
 srcpkgs/libcap/template              | 16 ++++------------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/libcap/libcap-devel.template b/srcpkgs/libcap/libcap-devel.template
index 41d2b3d060..6e8b70807f 100644
--- a/srcpkgs/libcap/libcap-devel.template
+++ b/srcpkgs/libcap/libcap-devel.template
@@ -1,15 +1,14 @@
 # Template file for 'libcap-devel'.
 #
-depends="glibc-devel libcap"
+depends="glibc-devel libcap>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 
-do_install()
-{
+do_install() {
 	vmove usr/include usr
-	vmove lib/libcap.a usr/lib
+	vmove usr/lib/libcap.a usr/lib
 	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/libcap/libcap-pam.template b/srcpkgs/libcap/libcap-pam.template
index bc613daa42..33f9b5f04f 100644
--- a/srcpkgs/libcap/libcap-pam.template
+++ b/srcpkgs/libcap/libcap-pam.template
@@ -7,6 +7,6 @@ long_desc="${long_desc}
  This package contains a PAM module provided by the libcap package."
 
 do_install() {
-	vmove lib/security usr/lib
+	vmove usr/lib/security usr/lib
 	vmove etc
 }
diff --git a/srcpkgs/libcap/libcap-progs.template b/srcpkgs/libcap/libcap-progs.template
index 23e7cbfc0c..498ae26854 100644
--- a/srcpkgs/libcap/libcap-progs.template
+++ b/srcpkgs/libcap/libcap-progs.template
@@ -6,6 +6,6 @@ long_desc="${long_desc}
  This package contains binary utilities provided by the libcap package."
 
 do_install() {
-	vmove "sbin/*" usr/sbin
+	vmove usr/sbin usr
 	vmove usr/share usr
 }
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index c3cbb75cca..dc098fe117 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.22
-revision=5
+revision=7
 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
 makedepends="perl pam-devel attr-devel"
 short_desc="POSIX.1e capabilities library"
@@ -16,21 +16,13 @@ long_desc="
  draft 15 capabilities."
 
 do_build() {
-	sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \
-		Make.Rules
 	make ${makejobs}
 }
 
 do_install() {
-	vmkdir lib
-	vmkdir usr/lib
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
-		ln -sf lib ${DESTDIR}/lib64
-	fi
-	make DESTDIR=${DESTDIR} RAISE_SETFCAP=no install
-	rm -f ${DESTDIR}/lib64
-
+	make DESTDIR=${DESTDIR} MANDIR=${DESTDIR}/usr/share/man \
+		SBINDIR=${DESTDIR}/usr/sbin LIBDIR=${DESTDIR}/usr/lib \
+		RAISE_SETFCAP=no install
 	vinstall pam_cap/capability.conf 644 etc/security
-	vmove "lib/*.so*" usr/lib
 	chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
 }