From dc3bf1d413731692b5c088e2bc39de16c5a3219c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 2 Jul 2011 15:26:54 +0200
Subject: [PATCH] libcap: move lib to /lib, programs to /sbin, cleanups.

---
 srcpkgs/libcap/libcap-devel.template |  7 +++----
 srcpkgs/libcap/libcap-pam.template   |  8 +++++---
 srcpkgs/libcap/libcap-progs.template |  7 ++++---
 srcpkgs/libcap/template              | 19 +++++++++----------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/libcap/libcap-devel.template b/srcpkgs/libcap/libcap-devel.template
index 9e0501f2de4..27abf76ba59 100644
--- a/srcpkgs/libcap/libcap-devel.template
+++ b/srcpkgs/libcap/libcap-devel.template
@@ -10,8 +10,7 @@ Add_dependency run libcap
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/libcap.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	vmove usr/include usr
+	vmove 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 fcdc52eb095..0fe57b77822 100644
--- a/srcpkgs/libcap/libcap-pam.template
+++ b/srcpkgs/libcap/libcap-pam.template
@@ -5,15 +5,17 @@ long_desc="${long_desc}
 
  This package contains a PAM module provided by the libcap package."
 
+revision=1
+
 conf_files="/etc/security/capability.conf"
 
 Add_dependency run glibc
+Add_dependency run attr
 Add_dependency run libcap
 Add_dependency run pam
 
 do_install()
 {
-	mkdir -p ${DESTDIR}
-	mv ${SRCPKGDESTDIR}/lib ${DESTDIR}
-	mv ${SRCPKGDESTDIR}/etc ${DESTDIR}
+	vmove lib/security lib
+	vmove etc
 }
diff --git a/srcpkgs/libcap/libcap-progs.template b/srcpkgs/libcap/libcap-progs.template
index 65e496eaa02..ba38de3ca7b 100644
--- a/srcpkgs/libcap/libcap-progs.template
+++ b/srcpkgs/libcap/libcap-progs.template
@@ -5,12 +5,13 @@ long_desc="${long_desc}
 
  This package contains binary utilities provided by the libcap package."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libcap
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/sbin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+	vmove sbin
+	vmove usr/share usr
 }
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 2194003d348..5f97197303a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,7 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.21
+revision=1
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
 build_style=custom-install
 short_desc="POSIX.1e capabilities library"
@@ -20,22 +21,20 @@ Add_dependency build attr-devel
 do_build()
 {
 	sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \
-		${wrksrc}/Make.Rules
+		Make.Rules
 	make ${makejobs}
 }
 
 do_install()
 {
+	vmkdir lib
+	vmkdir usr/lib
 	if [ "$xbps_machine" = "x86_64" ]; then
-		mkdir -p ${DESTDIR}/usr/lib
-		cd ${DESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
+		ln -sf lib ${DESTDIR}/lib64
 	fi
+	make DESTDIR=${DESTDIR} RAISE_SETFCAP=no install
+	rm -f ${DESTDIR}/lib64
 
-	make DESTDIR=${DESTDIR} prefix=/usr RAISE_SETFCAP=no install
-
-	install -D -m644 ${wrksrc}/pam_cap/capability.conf \
-		${DESTDIR}/etc/security/capability.conf
-	mkdir -p ${DESTDIR}/lib
-	mv ${DESTDIR}/usr/lib/security ${DESTDIR}/lib
-	rm -f ${DESTDIR}/usr/lib64
+	vinstall pam_cap/capability.conf 644 etc/security
+	ln -sf /lib/libcap.so ${DESTDIR}/usr/lib/libcap.so
 }