From 3c4b7e80c7f8460c77fa763187798ffdbdadc987 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 4 Mar 2014 15:40:24 +0100
Subject: [PATCH] radare2: update to 0.9.7 (our patch for cross is still
 necessary).

---
 common/shlibs                       | 56 ++++++++++++++---------------
 srcpkgs/radare2/patches/cross.patch | 23 +++++-------
 srcpkgs/radare2/template            |  8 ++---
 3 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 67b6346fd60..4fa64420e0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1125,34 +1125,34 @@ libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
 libgsasl.so.7 libgsasl-1.8.0_1
-libr_db.so.0.9.2 radare2-0.9.2_1
-libr_parse.so.0.9.2 radare2-0.9.2_1
-libr_util.so.0.9.2 radare2-0.9.2_1
-libr_lib.so.0.9.2 radare2-0.9.2_1
-libr_bin.so.0.9.2 radare2-0.9.2_1
-libr_asm.so.0.9.2 radare2-0.9.2_1
-libr_magic.so.0.9.2 radare2-0.9.2_1
-libr_fs.so.0.9.2 radare2-0.9.2_1
-libr_socket.so.0.9.2 radare2-0.9.2_1
-libr_diff.so.0.9.2 radare2-0.9.2_1
-libr_sign.so.0.9.2 radare2-0.9.2_1
-libr_syscall.so.0.9.2 radare2-0.9.2_1
-libr_search.so.0.9.2 radare2-0.9.2_1
-libr_reg.so.0.9.2 radare2-0.9.2_1
-libr_egg.so.0.9.2 radare2-0.9.2_1
-libr_io.so.0.9.2 radare2-0.9.2_1
-libr_bp.so.0.9.2 radare2-0.9.2_1
-libr_print.so.0.9.2 radare2-0.9.2_1
-libr_anal.so.0.9.2 radare2-0.9.2_1
-libr_lang.so.0.9.2 radare2-0.9.2_1
-libr_hash.so.0.9.2 radare2-0.9.2_1
-libr_debug.so.0.9.2 radare2-0.9.2_1
-libr_flags.so.0.9.2 radare2-0.9.2_1
-libr_cmd.so.0.9.2 radare2-0.9.2_1
-libr_line.so.0.9.2 radare2-0.9.2_1
-libr_cons.so.0.9.2 radare2-0.9.2_1
-libr_config.so.0.9.2 radare2-0.9.2_1
-libr_core.so.0.9.2 radare2-0.9.2_1
+libr_db.so.0.9.7 radare2-0.9.7_1
+libr_parse.so.0.9.7 radare2-0.9.7_1
+libr_util.so.0.9.7 radare2-0.9.7_1
+libr_lib.so.0.9.7 radare2-0.9.7_1
+libr_bin.so.0.9.7 radare2-0.9.7_1
+libr_asm.so.0.9.7 radare2-0.9.7_1
+libr_magic.so.0.9.7 radare2-0.9.7_1
+libr_fs.so.0.9.7 radare2-0.9.7_1
+libr_socket.so.0.9.7 radare2-0.9.7_1
+libr_diff.so.0.9.7 radare2-0.9.7_1
+libr_sign.so.0.9.7 radare2-0.9.7_1
+libr_syscall.so.0.9.7 radare2-0.9.7_1
+libr_search.so.0.9.7 radare2-0.9.7_1
+libr_reg.so.0.9.7 radare2-0.9.7_1
+libr_egg.so.0.9.7 radare2-0.9.7_1
+libr_io.so.0.9.7 radare2-0.9.7_1
+libr_bp.so.0.9.7 radare2-0.9.7_1
+libr_print.so.0.9.7 radare2-0.9.7_1
+libr_anal.so.0.9.7 radare2-0.9.7_1
+libr_lang.so.0.9.7 radare2-0.9.7_1
+libr_hash.so.0.9.7 radare2-0.9.7_1
+libr_debug.so.0.9.7 radare2-0.9.7_1
+libr_flags.so.0.9.7 radare2-0.9.7_1
+libr_cmd.so.0.9.7 radare2-0.9.7_1
+libr_line.so.0.9.7 radare2-0.9.7_1
+libr_cons.so.0.9.7 radare2-0.9.7_1
+libr_config.so.0.9.7 radare2-0.9.7_1
+libr_core.so.0.9.7 radare2-0.9.7_1
 libzmq.so.3 zeromq-3.2.0_1
 libstatgrab.so.6 libstatgrab-0.17_1
 libseccomp.so.2 libseccomp-2.0.0_1
diff --git a/srcpkgs/radare2/patches/cross.patch b/srcpkgs/radare2/patches/cross.patch
index b6a8fb9d339..878167002cc 100644
--- a/srcpkgs/radare2/patches/cross.patch
+++ b/srcpkgs/radare2/patches/cross.patch
@@ -1,21 +1,14 @@
---- shlr/Makefile.orig	2013-11-11 11:33:05.197480920 +0100
-+++ shlr/Makefile	2013-11-11 11:33:14.263944850 +0100
-@@ -23,7 +23,7 @@ $(SDBLIB) sdb/sdb:
- 	cd sdb ; ${MAKE} clean
- 	cd sdb ; \
- 		${MAKE} clean && \
--		${MAKE} CC=${HOST_CC} && \
-+		${MAKE} CC=${HOST_CC} CFLAGS="${HOST_CFLAGS}" && \
- 		cp -f src/sdb src/.sdb
- 	cd sdb ; ${MAKE} clean
- 	cd sdb ; ${MAKE} src/sdb-version.h
---- configure.orig	2013-11-11 11:39:27.476221882 +0100
-+++ configure	2013-11-11 11:39:51.791056853 +0100
-@@ -36,7 +36,7 @@ while : ; do
+--- configure.orig	2014-03-04 15:35:49.364609242 +0100
++++ configure	2014-03-04 15:35:55.956526832 +0100
+@@ -37,11 +37,7 @@ while : ; do
  ENVWORDS="${ENVWORDS} $1_CPU $1_OS"
  STR=`eval "echo ${S}$1"`
  SPLIT_CPU="`echo "$STR" | cut -d - -f 1`"
--SPLIT_OS="`echo "$STR" | awk -F - '{if(NF==4){print $4}else{print $3}}'`"
+-#SPLIT_OS="`echo "$STR" | awk -F - '{print $(NF-1)}'`"
+-SPLIT_OS="`echo "$STR" | awk -F - '{
+-        if($1="unknown"){ if (NF<3) { print $2; } else { print $3; }
+-        } else { print $(NF-1); }
+-}'`"
 +SPLIT_OS="`echo "$STR" | awk -F - '{print $(NF-1)}'`"
  eval "$1_CPU=\"$SPLIT_CPU\""
  eval "$1_OS=\"$SPLIT_OS\""
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 20f21d2a9c7..4ec3c0dccdf 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,6 +1,6 @@
 # Template file for 'radare2'
 pkgname=radare2
-version=0.9.6
+version=0.9.7
 revision=1
 build_style=gnu-configure
 short_desc="Advanced command line debugger and hexadecimal editor"
@@ -8,15 +8,13 @@ maintainer="pancake <pancake@nopcode.org>"
 license="LGPL-3"
 homepage="http://www.radare.org"
 distfiles="${homepage}/get/${pkgname}-${version}.tar.xz"
-checksum=91e8820ab7003de422cde777af681b0023d6b20253a81759df94578c514ae883
+checksum=f6c0a3a62c2a8ccbebd127c2a42b96a13d7df6e8986862a15c5ec3f068af942f
 
 radare2-devel_package() {
-	depends="radare2>=${version}"
+	depends="radare2>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
 	}
 }