From f9d88cc9f2fb1a469767542c609bdf19ca00366c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 20 Oct 2017 18:49:53 +0200 Subject: [PATCH] uncrustify: bump version. --- ...tify-0.60.recipe => uncrustify-0.65.recipe} | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) rename dev-util/uncrustify/{uncrustify-0.60.recipe => uncrustify-0.65.recipe} (71%) diff --git a/dev-util/uncrustify/uncrustify-0.60.recipe b/dev-util/uncrustify/uncrustify-0.65.recipe similarity index 71% rename from dev-util/uncrustify/uncrustify-0.60.recipe rename to dev-util/uncrustify/uncrustify-0.65.recipe index b3f173993..b74fb1f23 100644 --- a/dev-util/uncrustify/uncrustify-0.60.recipe +++ b/dev-util/uncrustify/uncrustify-0.65.recipe @@ -15,16 +15,16 @@ HOMEPAGE="http://uncrustify.sourceforge.net/" COPYRIGHT="2005-2014 Ben Gardner" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="https://github.com/bengardner/uncrustify/archive/uncrustify-$portVersion.tar.gz" -CHECKSUM_SHA256="42c9f84340c5d6a0087037c96b4fe4b46955691e7038700dec98a2e4782b57a3" +SOURCE_URI="https://github.com/uncrustify/uncrustify/archive/uncrustify-$portVersion.tar.gz" +CHECKSUM_SHA256="45e954cd207ee4f6531d72ece27554ef4e0e9f64c912b523bc80ad6a36404110" SOURCE_DIR="uncrustify-uncrustify-$portVersion" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - uncrustify$secondaryArchSuffix = $portVersion compat >= 0.60 - cmd:uncrustify = $portVersion compat >= 0.60 + uncrustify$secondaryArchSuffix = $portVersion + cmd:uncrustify = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -34,20 +34,22 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:awk + cmd:python2 " BUILD() { - runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + mkdir -p build && cd build + cmake .. $cmakeDirArgs -DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" make $jobArgs } INSTALL() { + cd build make install }