r2pipe moved to separate repo, fix Makefile script

3 files changed, 49 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c47ed033acbd..15597dda36ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,27 @@
 pkgbase = radare2-bindings-git
 	pkgdesc = Language bindings for radare2 (git version)
-	pkgver = 20150705.507.d02e5b9
-	pkgrel = 1
+	pkgver = 2.4.1.r3.gfe8bd26
+	pkgrel = 2
 	url = https://radare.org
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = git
 	makedepends = valabind
-	makedepends = radare2
+	makedepends = swig
 	depends = radare2
-	provides = radare2-bindings
-	conflicts = radare2-bindings
+	depends = python3
+	depends = python2
 	source = radare2-bindings-git::git://github.com/radare/radare2-bindings.git
+	source = radare2-pipe-git::git+https://github.com/radare/radare2-r2pipe.git
+	source = Makefile.patch
+	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = c79cfc6a5650e347e253f132762ef961
 
 pkgname = radare2-bindings-git
+	provides = radare2-bindings
+
+pkgname = radare2-pipe-git
+	provides = radare2-pipe
 
diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644
index 000000000000..57c2611a57b7
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,13 @@
+--- radare2-bindings-git/libr/lang/p/Makefile	2016-03-09 01:49:09.985929885 +0100
++++ radare2-bindings-git.new/libr/lang/p/Makefile	2016-03-09 01:46:44.628414992 +0100
+@@ -87,8 +87,8 @@
+ 	-rm -f *.${EXT_SO} *.${EXT_AR} *.o
+ 	-rm -rf *.dSYM
+ 
+-#R2_PLUGIN_PATH=$(shell r2 -hh| grep PLUGINS|awk '{print $$2}')
+-R2_PLUGIN_PATH=$(shell r2 -nqc 'e dir.plugins' -)
++R2_PLUGIN_PATH=$(shell r2 -hh| grep LIBR_PLUGINS|awk '{print substr($$2,2)}')
++#R2_PLUGIN_PATH=$(shell r2 -nqc 'e dir.plugins' -)
+ 
+ install:
+ 	mkdir -p $(DESTDIR)/$(R2_PLUGIN_PATH)
diff --git a/PKGBUILD b/PKGBUILD
index b2460acdbef8..18d4b3230f7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,32 @@
-# updated by devnull [at] libcrack [dot] so
+# Maintainer: bartus @{aur \at bartus \dot  33mail \dot com}
 pkgname=('radare2-bindings-git' 'radare2-pipe-git')
 basename='radare2-bindings-git'
-pkgver=20151004.538.1f243fb
-pkgrel=1
+pkgver=2.4.1.r3.gfe8bd26
+pkgrel=2
 pkgdesc="Language bindings for radare2 (git version)"
 arch=('i686' 'x86_64')
 url="https://radare.org"
 license=('LGPL')
-depends=('radare2')
-makedepends=('git' 'valabind' 'radare2')
+depends=('radare2' 'python3' 'python2')
+makedepends=('git' 'valabind' 'swig')
+
+source=("${pkgname}::git://github.com/radare/radare2-bindings.git"
+        "radare2-pipe-git::git+https://github.com/radare/radare2-r2pipe.git"
+        "Makefile.patch")
+md5sums=('SKIP'
+         'SKIP'
+         'c79cfc6a5650e347e253f132762ef961')
 
-source=("$pkgname"::"git://github.com/radare/radare2-bindings.git")
-md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  _date=`date +"%Y%m%d"`
-  echo "$_date.$(git rev-list --count master).$(git rev-parse --short master)"
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "${srcdir}/${basename}"
+  patch -Np1 -i ../Makefile.patch
+}
 
 build() {
   cd "${srcdir}/${basename}"
@@ -27,25 +35,24 @@ build() {
       --prefix="/usr" \
       --enable="python"
 
-  #PYTHON_CONFIG=python3-config make
+  export PYTHON_CONFIG=python3.2-config
   make
 
-  (cd r2pipe/python && python setup.py build)
+  #(cd r2pipe/python && python setup.py build)
 }
 
 package_radare2-pipe-git() {
   provides=('radare2-pipe')
 
-  cd "${srcdir}/${basename}"
-  (cd r2pipe/python && python setup.py install --root "${pkgdir}")
+  cd "${srcdir}/radare2-pipe-git/python"
+  python2 setup.py install --root "${pkgdir}"
 }
 
 package_radare2-bindings-git() {
   provides=('radare2-bindings')
-  conflicts=('radare2-bindings')
 
   cd "${srcdir}/${basename}"
-  #PYTHON_CONFIG=python3-config make DESTDIR="${pkgdir}" install
+  export PYTHON_CONFIG=python3.2-config
   make DESTDIR="${pkgdir}" install
 }
 # vim:set ts=2 sw=2 et: