From d7793cc26b1bc2aea4445243ed5999abb6cba1cb Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 14:36:20 +0200 Subject: [PATCH] lftp: code style. --- net-ftp/lftp/lftp-4.4.16.recipe | 18 ++++++++++-------- net-ftp/lftp/lftp-4.8.3.recipe | 11 ++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe index 140912346..c71fad61c 100644 --- a/net-ftp/lftp/lftp-4.4.16.recipe +++ b/net-ftp/lftp/lftp-4.4.16.recipe @@ -7,15 +7,20 @@ Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \ fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \ socks, http/1.1, sftp v3-v6." HOMEPAGE="http://lftp.yar.ru" -SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz" -CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf2" -PATCHES="lftp-$portVersion.patchset" COPYRIGHT="1996-2012 Alexander V. Lukyanov" LICENSE="GNU GPL v3" REVISION="4" +SOURCE_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz" +CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf2" +PATCHES="lftp-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86" +GLOBAL_WRITABLE_FILES=" + settings/lftp.conf keep-old + " + PROVIDES=" lftp$secondaryArchSuffix = $portVersion lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -23,7 +28,6 @@ PROVIDES=" cmd:lftp = $portVersion compat >= 4 cmd:lftpget = $portVersion compat >= 4 " - REQUIRES=" haiku$secondaryArchSuffix ca_root_certificates @@ -31,6 +35,7 @@ REQUIRES=" lib:libcrypto$secondaryArchSuffix lib:libz$secondaryArchSuffix " + PROVIDES_devel=" lftp${secondaryArchSuffix}_devel = $portVersion devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -39,6 +44,7 @@ PROVIDES_devel=" REQUIRES_devel=" lftp$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libreadline$secondaryArchSuffix @@ -58,10 +64,6 @@ BUILD_PREREQUIRES=" cmd:sed " -GLOBAL_WRITABLE_FILES=" - settings/lftp.conf keep-old - " - PATCH() { sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' diff --git a/net-ftp/lftp/lftp-4.8.3.recipe b/net-ftp/lftp/lftp-4.8.3.recipe index 223a719e0..14a9da919 100644 --- a/net-ftp/lftp/lftp-4.8.3.recipe +++ b/net-ftp/lftp/lftp-4.8.3.recipe @@ -17,6 +17,10 @@ PATCHES="lftp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm" SECONDARY_ARCHITECTURES="?x86" +GLOBAL_WRITABLE_FILES=" + settings/lftp.conf keep-old + " + PROVIDES=" lftp$secondaryArchSuffix = $portVersion lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -24,7 +28,6 @@ PROVIDES=" cmd:lftp$secondaryArchSuffix = $portVersion compat >= 4 cmd:lftpget$secondaryArchSuffix = $portVersion compat >= 4 " - REQUIRES=" haiku$secondaryArchSuffix ca_root_certificates @@ -38,6 +41,7 @@ REQUIRES=" lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " + PROVIDES_devel=" lftp${secondaryArchSuffix}_devel = $portVersion devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -46,6 +50,7 @@ PROVIDES_devel=" REQUIRES_devel=" lftp$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix @@ -71,10 +76,6 @@ BUILD_PREREQUIRES=" cmd:sed " -GLOBAL_WRITABLE_FILES=" - settings/lftp.conf keep-old - " - BUILD() { autoreconf -vfi