From 01e8cb6de1257732836f249448ec9195fd25dc44 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 8 Jul 2011 09:01:08 +0200
Subject: [PATCH] xbps: update to 0.9.0. FINALLY

---
 srcpkgs/xbps/template             | 9 ++++++---
 srcpkgs/xbps/xbps-static.template | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index d73239245e3..05460a9513f 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.8.1
+version=0.9.0
 distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 build_style=configure
 configure_args="--prefix=/ --includedir=/usr/include
@@ -9,14 +9,17 @@ configure_args="--prefix=/ --includedir=/usr/include
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
-license="BSD"
-checksum=7a5ef9490a6c96aa241dd98db87557c0f840fc1b3f8312fc06374039caea2134
+license="2-clause BSD"
+checksum=7eb71a70e43bb4b816de9408f093ca4235b8a3a53385a386819c2b4c2a1a46f8
 long_desc="
  The XBPS package system. A new, fast, from scratch and simple
  binary package manager. This package includes the binary utilities
  to be able to handle XBPS binary packages."
 
+broken_as_needed=yes
+conf_files="/etc/xbps-conf.plist"
 subpackages="$pkgname-static"
+replaces="xbps>=0"
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template
index 9af58fd6281..4b53a3ff740 100644
--- a/srcpkgs/xbps/xbps-static.template
+++ b/srcpkgs/xbps/xbps-static.template
@@ -6,10 +6,11 @@ long_desc="${long_desc}
  This package contains the static binaries and library, that can be
  used on any GNU/Linux distribution matching the architecture."
 
+replaces="xbps-devel>=0"
+
 do_install()
 {
-	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/sbin/*.static ${DESTDIR}/sbin
-	mv ${SRCPKGDESTDIR}/lib/*.a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove "sbin/*.static" sbin
+	vmove "lib/*.a" usr/lib
 }