From bbcdfdf6447239db59cbbecbf3134f512dc60233 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 19 Mar 2018 17:46:13 +0000
Subject: [PATCH] curl: bump to 7.59.0, add PATH of sftp-server for TEST.
 (#2334)

Added comments after the definition of TEST_PREREQUIRES. They should
be removed if haikuports/haikuporter/issues/151 is implemented.
---
 .../{curl-7.58.0.recipe => curl-7.59.0.recipe}     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
 rename net-misc/curl/{curl-7.58.0.recipe => curl-7.59.0.recipe} (88%)

diff --git a/net-misc/curl/curl-7.58.0.recipe b/net-misc/curl/curl-7.59.0.recipe
similarity index 88%
rename from net-misc/curl/curl-7.58.0.recipe
rename to net-misc/curl/curl-7.59.0.recipe
index 0a33ae055..b92519a1c 100644
--- a/net-misc/curl/curl-7.58.0.recipe
+++ b/net-misc/curl/curl-7.59.0.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="1996-2018 Daniel Stenberg"
 LICENSE="Curl"
 REVISION="1"
 SOURCE_URI="https://curl.haxx.se/download/curl-$portVersion.tar.bz2"
-CHECKSUM_SHA256="1cb081f97807c01e3ed747b6e1c9fee7a01cb10048f1cd0b5f56cfe0209de731"
+CHECKSUM_SHA256="b5920ffd6a8c95585fb95070e0ced38322790cb335c39d0dab852d12e157b5a0"
 ADDITIONAL_FILES="curl.rdef"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64 ?arm"
@@ -64,12 +64,17 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	"
-if [ "$recipeAction" = TEST ]; then
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+
+TEST_PREREQUIRES="
 	cmd:id
+	cmd:perl
+	cmd:sftp_server
 	cmd:sshd
 	"
-fi
+# The following line does not work, although it has worked in 2016 and/or 2017.
+if [ "$recipeAction" = TEST ]; then BUILD_PREREQUIRES+="$TEST_PREREQUIRES"; fi
+# Uncomment the following line before the build if you wish to run the tests.
+#BUILD_PREREQUIRES+="$TEST_PREREQUIRES"
 
 defineDebugInfoPackage curl$secondaryArchSuffix \
 	$binDir/curl \
@@ -141,5 +146,6 @@ INSTALL()
 
 TEST()
 {
+	PATH="`finddir B_SYSTEM_LIB_DIRECTORY`/openssh:$PATH" \
 	USER="`id -n -u`" make check
 }