diff --git a/sci-mathematics/calc/calc-2.12.6.7.recipe b/sci-mathematics/calc/calc-2.12.7.2.recipe similarity index 96% rename from sci-mathematics/calc/calc-2.12.6.7.recipe rename to sci-mathematics/calc/calc-2.12.7.2.recipe index 36bfce9c0..613abcc70 100644 --- a/sci-mathematics/calc/calc-2.12.6.7.recipe +++ b/sci-mathematics/calc/calc-2.12.7.2.recipe @@ -9,9 +9,9 @@ evaluated." HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/" COPYRIGHT="1999-2017 Landon Curt Noll" LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="http://www.isthe.com/chongo/src/calc/calc-$portVersion.tar.bz2" -CHECKSUM_SHA256="3a4f1acde15941048214f393beb97f9e12fc1ef2585fe0ab026e93ebcd19dd46" +CHECKSUM_SHA256="57af44181ca3af7348c82ee628cfd221677a09fef11a29d2e5667726d5aafc90" PATCHES="calc-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -27,9 +27,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libreadline$secondaryArchSuffix lib:libhistory$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix calc_data == $portVersion " @@ -53,9 +53,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libreadline$secondaryArchSuffix >= 8 devel:libhistory$secondaryArchSuffix >= 8 devel:libncurses$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix >= 8 " if [ -n "$secondaryArchSuffix" ]; then BUILD_REQUIRES+=" @@ -63,18 +63,18 @@ BUILD_REQUIRES+=" " fi BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:make cmd:awk - cmd:sed + cmd:cmp + cmd:ctags cmd:diff cmd:egrep - cmd:ctags - cmd:xargs - cmd:cmp - cmd:touch cmd:less - cmd:strip + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:sed + cmd:strip$secondaryArchSuffix + cmd:touch + cmd:xargs " defineDebugInfoPackage calc$secondaryArchSuffix \ diff --git a/sci-mathematics/calc/patches/calc-2.12.6.7.patchset b/sci-mathematics/calc/patches/calc-2.12.7.2.patchset similarity index 89% rename from sci-mathematics/calc/patches/calc-2.12.6.7.patchset rename to sci-mathematics/calc/patches/calc-2.12.7.2.patchset index 5831233b1..ca93d09df 100644 --- a/sci-mathematics/calc/patches/calc-2.12.6.7.patchset +++ b/sci-mathematics/calc/patches/calc-2.12.7.2.patchset @@ -1,11 +1,11 @@ -From 8738841646cfb2f1a00ea5a676d31295b13d2d39 Mon Sep 17 00:00:00 2001 +From 1bab537a08cea1d00e85fa358579799e99685cb6 Mon Sep 17 00:00:00 2001 From: raefaldhia Date: Wed, 14 Dec 2016 12:56:02 +0700 Subject: Add compatibility to build with haikuporter diff --git a/Makefile b/Makefile -index 16c203f..fc855b4 100644 +index e9630f8..103de4e 100644 --- a/Makefile +++ b/Makefile @@ -455,8 +455,8 @@ ALIGN32= @@ -80,8 +80,8 @@ index 16c203f..fc855b4 100644 +all: ${BLD_TYPE} CHANGES check_include: - $(Q) if [ ! -d /usr/include ]; then \ -@@ -2332,7 +2332,7 @@ calc.usage: calc.1 ${MAKE_FILE} + $(Q) if ! echo '#include ' | ${CC} -E - >/dev/null 2>&1; then \ +@@ -2322,7 +2322,7 @@ calc.usage: calc.1 ${MAKE_FILE} LESSCHARSET=iso8859 ${CALCPAGER} calc.1; \ else \ ${NROFF} -man calc.1; \ @@ -91,5 +91,5 @@ index 16c203f..fc855b4 100644 -- -2.7.0 +2.24.0