diff --git a/dev-util/radare2/patches/radare2-2.0.1.patchset b/dev-util/radare2/patches/radare2-2.2.0.patchset similarity index 51% rename from dev-util/radare2/patches/radare2-2.0.1.patchset rename to dev-util/radare2/patches/radare2-2.2.0.patchset index 8301f3420..ae0b51340 100644 --- a/dev-util/radare2/patches/radare2-2.0.1.patchset +++ b/dev-util/radare2/patches/radare2-2.2.0.patchset @@ -1,4 +1,4 @@ -From 525e11115f4d549021fc6f69e85f85ba40cddc29 Mon Sep 17 00:00:00 2001 +From bf5ae829741ba21d42bbc66a5432573cd53d5eee Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 10 Nov 2017 19:12:01 +0100 Subject: Haiku patch @@ -18,5 +18,28 @@ index c907d91..52dae8b 100644 # if !defined(SYS_write) && defined(__NR_write) # define SYS_write __NR_write -- -2.14.2 +2.15.1 + + +From d6075d97919e506bbfdb86c7a4220ef5121e7c32 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Tue, 9 Jan 2018 18:47:47 +0100 +Subject: Fix for missing login_tty symbol + + +diff --git a/libr/socket/run.c b/libr/socket/run.c +index d91a221..99c7255 100644 +--- a/libr/socket/run.c ++++ b/libr/socket/run.c +@@ -52,7 +52,7 @@ + #include // to compile execv in msvc windows + #endif + +-#define HAVE_PTY __UNIX__ && !__ANDROID__ && LIBC_HAVE_FORK && !defined(__sun) ++#define HAVE_PTY __UNIX__ && !__ANDROID__ && !__HAIKU__ && LIBC_HAVE_FORK && !defined(__sun) + + #if EMSCRIPTEN + #undef HAVE_PTY +-- +2.15.1 diff --git a/dev-util/radare2/radare2-2.0.1.recipe b/dev-util/radare2/radare2-2.2.0.recipe similarity index 90% rename from dev-util/radare2/radare2-2.0.1.recipe rename to dev-util/radare2/radare2-2.2.0.recipe index 1980549ff..3eccb914f 100644 --- a/dev-util/radare2/radare2-2.0.1.recipe +++ b/dev-util/radare2/radare2-2.2.0.recipe @@ -9,12 +9,15 @@ LICENSE="GNU GPL v3 GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd" +CHECKSUM_SHA256="99ba2a7c4aae99ae0c70ce0423fa6ed2344fb94a45bc83bf6c8716e2b3e7f1bf" PATCHES="radare2-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" radare2$secondaryArchSuffix = $portVersion cmd:r2$secondaryArchSuffix @@ -30,7 +33,7 @@ PROVIDES=" cmd:rarun2$secondaryArchSuffix cmd:rasm2$secondaryArchSuffix cmd:rax2$secondaryArchSuffix - lib:libr2$secondaryArchSuffix = 2.0.1 + lib:libr2$secondaryArchSuffix = $libVersion lib:libr_anal$secondaryArchSuffix lib:libr_asm$secondaryArchSuffix lib:libr_bin$secondaryArchSuffix @@ -65,7 +68,7 @@ REQUIRES=" PROVIDES_devel=" radare2${secondaryArchSuffix}_devel = $portVersion - devel:libr2$secondaryArchSuffix = 2.0.1 + devel:libr2$secondaryArchSuffix = $libVersion " REQUIRES_devel=" radare2${secondaryArchSuffix} == $portVersion base @@ -82,10 +85,10 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:awk + cmd:find cmd:gcc$secondaryArchSuffix cmd:git cmd:make - cmd:find cmd:sh cmd:patch cmd:pkg_config$secondaryArchSuffix @@ -108,7 +111,7 @@ INSTALL() rm -rf $prefix/share prepareInstalledDevelLib libr2 - packageEntries devel $developDir - - rm $binDir/r2-docker $binDir/r2-indent + packageEntries devel \ + $developDir \ + $libDir/pkgconfig }