From 23c19c438fa4bb80207fc5b2c88c3b455545a526 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 10 Nov 2016 19:41:01 +0000
Subject: [PATCH] jq: bump version.

* install in $prefix/bin for x86_gcc2.
---
 app-misc/jq/{jq-1.4.recipe => jq-1.5.recipe} | 30 ++++++++++++++------
 app-misc/jq/patches/jq-1.5.patchset          | 30 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)
 rename app-misc/jq/{jq-1.4.recipe => jq-1.5.recipe} (60%)
 create mode 100644 app-misc/jq/patches/jq-1.5.patchset

diff --git a/app-misc/jq/jq-1.4.recipe b/app-misc/jq/jq-1.5.recipe
similarity index 60%
rename from app-misc/jq/jq-1.4.recipe
rename to app-misc/jq/jq-1.5.recipe
index 686703ff2..487a97047 100644
--- a/app-misc/jq/jq-1.4.recipe
+++ b/app-misc/jq/jq-1.5.recipe
@@ -8,18 +8,26 @@ and expect it to work. It can mangle the data format that you have into \
 the one that you want with very little effort, and the program to do so \
 is often shorter and simpler than you’d expect."
 HOMEPAGE="http://stedolan.github.io/jq/"
-COPYRIGHT="2012 Stephen Dolan"
+COPYRIGHT="2012,2015 Stephen Dolan"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz"
-CHECKSUM_SHA256="998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d"
+SOURCE_URI="http://github.com/stedolan/jq/archive/jq-$portVersion.tar.gz"
+CHECKSUM_SHA256="d5667641d28c27d0c1e70de83e7f9bd8b2fed7fbf6a1d68731177d400a533c65"
+SOURCE_DIR="jq-jq-$portVersion"
+PATCHES="jq-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+fi
+
+
 PROVIDES="
 	jq = $portVersion
-	cmd:jq${secondaryArchSuffix} = $portVersion
+	cmd:jq = $portVersion
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -29,19 +37,25 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
 	cmd:awk
-	cmd:gcc${secondaryArchSuffix}
+	cmd:autoconf
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
+	touch lexer.c parser.c
+	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $binDir
-	cp -a jq $binDir
+	mkdir -p $commandBinDir
+	cp -a jq $commandBinDir
 }
diff --git a/app-misc/jq/patches/jq-1.5.patchset b/app-misc/jq/patches/jq-1.5.patchset
new file mode 100644
index 000000000..946cf7447
--- /dev/null
+++ b/app-misc/jq/patches/jq-1.5.patchset
@@ -0,0 +1,30 @@
+From 8a875469af492f48a99988cb0740570ce0d616cf Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 10 Nov 2016 19:00:47 +0000
+Subject: Haiku patch
+
+
+diff --git a/builtin.c b/builtin.c
+index 52f469d..3d08bff 100644
+--- a/builtin.c
++++ b/builtin.c
+@@ -907,14 +907,14 @@ static jv f_error(jq_state *jq, jv input, jv msg) {
+ 
+ // FIXME Should autoconf check for this!
+ #ifndef WIN32
+-extern const char **environ;
++extern char **environ;
+ #endif
+ 
+ static jv f_env(jq_state *jq, jv input) {
+   jv_free(input);
+   jv env = jv_object();
+   const char *var, *val;
+-  for (const char **e = environ; *e != NULL; e++) {
++  for (char **e = environ; *e != NULL; e++) {
+     var = e[0];
+     val = strchr(e[0], '=');
+     if (val == NULL)
+-- 
+2.2.2
+