From 1dd050325cf8710728f6c94d407eba33646f0a4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 15 May 2013 15:53:54 +0200
Subject: [PATCH] xbps: merge patch from git master to improve a msg error
 while unpacking.

---
 ...ck.c-remove-extra-arg-in-xbps_set_cb.patch | 26 +++++++++++++++++++
 srcpkgs/xbps/template                         | 10 +++----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch

diff --git a/srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch b/srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch
new file mode 100644
index 00000000000..3b0d9050080
--- /dev/null
+++ b/srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch
@@ -0,0 +1,26 @@
+From 7da5f6e8f76a47e899df1fc0d0e58256bc0dbcd0 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Wed, 15 May 2013 12:45:35 +0200
+Subject: [PATCH] lib/package_unpack.c: remove extra arg in
+ xbps_set_cb_state().
+
+---
+ lib/package_unpack.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/package_unpack.c b/lib/package_unpack.c
+index e1d0fc1..259b13c 100644
+--- lib/package_unpack.c
++++ lib/package_unpack.c
+@@ -452,7 +452,7 @@ unpack_archive(struct xbps_handle *xhp,
+ 		if (archive_read_extract(ar, entry, flags) != 0) {
+ 			rv = archive_errno(ar);
+ 			xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
+-			    rv, pkgver, NULL,
++			    rv, pkgver,
+ 			    "%s: [unpack] failed to extract file `%s': %s",
+ 			    pkgver, entry_pname, strerror(rv));
+ 		} else {
+-- 
+1.8.2.2
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b049e675bfe..66437bf1ee0 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.24
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --enable-static --enable-debug --enable-tests"
@@ -16,7 +16,7 @@ distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 checksum=95618f7bb728a6a1506a1f1af9d470db237c59b118d0aff4bc6985150b52e4c1
 
 libxbps_package() {
-	short_desc="${short_desc} - runtime library"
+	short_desc+=" - runtime library"
 	replaces="xbps<0.16.3_2 libxbps>=0"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
@@ -24,7 +24,7 @@ libxbps_package() {
 }
 
 libxbps-devel_package() {
-	short_desc="${short_desc} - runtime library (development files)"
+	short_desc+=" - runtime library (development files)"
 	depends="zlib-devel proplib-devel confuse-devel libfetch-devel
 		libarchive-devel libxbps>=${version}"
 	replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
@@ -37,7 +37,7 @@ libxbps-devel_package() {
 
 xbps-static_package() {
 	depends="xbps-triggers"
-	short_desc="${short_desc} - static binaries"
+	short_desc+=" - static binaries"
 	replaces="xbps-static>=0"
 	pkg_install() {
 		vmove "usr/sbin/*.static"
@@ -45,7 +45,7 @@ xbps-static_package() {
 }
 
 xbps-tests_package() {
-	short_desc="${short_desc} - Kyua testsuite"
+	short_desc+=" - Kyua testsuite"
 	replaces="xbps<0.16.3_2 xbps-tests>=0"
 	pkg_install() {
 		vmove usr/tests