diff --git a/app-misc/jq/jq-1.6.recipe b/app-misc/jq/jq-1.7.recipe similarity index 59% rename from app-misc/jq/jq-1.6.recipe rename to app-misc/jq/jq-1.7.recipe index df62fdaed..da6823202 100644 --- a/app-misc/jq/jq-1.6.recipe +++ b/app-misc/jq/jq-1.7.recipe @@ -7,13 +7,12 @@ You can download a single binary, scp it to a far away machine, \ 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/" +HOMEPAGE="http://jqlang.github.io/jq/" COPYRIGHT="2012,2015 Stephen Dolan" LICENSE="MIT" -REVISION="3" -SOURCE_URI="http://github.com/stedolan/jq/archive/jq-$portVersion.tar.gz" -CHECKSUM_SHA256="158182b85f3be9e23ab1dc50cfcc24e415aade2a0b8a5d9f709e0b587666d61b" -SOURCE_DIR="jq-jq-$portVersion" +REVISION="1" +SOURCE_URI="http://github.com/jqlang/jq/releases/download/jq-$portVersion/jq-$portVersion.tar.gz" +CHECKSUM_SHA256="402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -23,43 +22,58 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi +libVersion="1.0.4" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" jq = $portVersion cmd:jq = $portVersion + lib:libjq = $libVersionCompat " REQUIRES=" haiku${secondaryArchSuffix} lib:libonig$secondaryArchSuffix " +PROVIDES_devel=" + jq${secondaryArchSuffix}_devel = $portVersion + devel:libjq = $libVersionCompat + " +REQUIRES_devel=" + jq$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libonig$secondaryArchSuffix >= 5 " BUILD_PREREQUIRES=" - cmd:aclocal cmd:awk - cmd:autoconf - cmd:autoreconf + cmd:bison + cmd:diff cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make " BUILD() { - touch src/lexer.c src/parser.c - autoreconf -fi - runConfigure ./configure + # avoid a warning about not rebuilding lexer.c + touch src/lexer.c + + runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir --disable-static make $jobArgs } INSTALL() { - mkdir -p $commandBinDir - cp -a jq $commandBinDir + make install - mkdir -p $manDir/man1 - cp -a jq.1 $manDir/man1 + prepareInstalledDevelLib libjq + fixPkgconfig + packageEntries devel $developDir +} + +TEST() +{ + make check }