From 861cf96678350898334076e2977553fbabc7e20b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 10:47:46 +0200
Subject: [PATCH] xbps: merge patch from git master to fix a bug in
 xbps-create(8).

---
 ...lculate-correctly-target-file-for-re.patch | 27 +++++++++++++++++++
 srcpkgs/xbps/template                         |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch

diff --git a/srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch b/srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch
new file mode 100644
index 00000000000..71826045f6b
--- /dev/null
+++ b/srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch
@@ -0,0 +1,27 @@
+From d6605e1b97fcec16169c788b9bd35d269134d1ca Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Mon, 27 May 2013 10:27:55 +0200
+Subject: [PATCH] xbps-create(8): calculate correctly target file for relative
+ symlinks.
+
+---
+ NEWS                   | 2 ++
+ bin/xbps-create/main.c | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
+index 9a6c2be..2a2373d 100644
+--- bin/xbps-create/main.c
++++ bin/xbps-create/main.c
+@@ -237,7 +237,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
+ 				 */
+ 				xe->target = strdup(buf);
+ 			} else {
+-				xe->target = strdup(p + strlen(destdir));
++				xe->target = strdup(p + strlen(destdir) - 1);
+ 				free(p);
+ 			}
+ 		} else if (strchr(buf, '/') == NULL) {
+-- 
+1.8.3
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66437bf1ee0..c4885b9b7ed 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.24
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --enable-static --enable-debug --enable-tests"