From 844cdc8a1c81055c175b9af3dd6ed85e731e245d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 14:52:59 +0200 Subject: [PATCH] www-*: code style. --- www-aps/seeks/seeks-0.4.1.recipe | 7 ++++--- www-client/lynx/lynx-2.8.9rel.1.recipe | 10 +++++----- www-client/qupzilla/qupzilla-1.8.9.recipe | 14 +++++++------- www-servers/cherokee/cherokee-1.2.104.recipe | 6 +++--- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/www-aps/seeks/seeks-0.4.1.recipe b/www-aps/seeks/seeks-0.4.1.recipe index 38a246a63..82941f2c1 100644 --- a/www-aps/seeks/seeks-0.4.1.recipe +++ b/www-aps/seeks/seeks-0.4.1.recipe @@ -15,6 +15,9 @@ SOURCE_URI="https://sf.net/projects/seeks/files/hippy/seeks-$portVersion.tar.gz" CHECKSUM_SHA256="b890f2e95ab0161e0be6f82cfc224f9cf6e49ce69d18bf3decddb91fb85cebde" PATCHES="seeks-$portVersion.patchset" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + GLOBAL_WRITABLE_FILES=" settings/seeks/config keep-old settings/seeks/img-websearch-config keep-old @@ -22,9 +25,6 @@ GLOBAL_WRITABLE_FILES=" settings/seeks/websearch-config keep-old " -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - PROVIDES=" seeks$secondaryArchSuffix = $portVersion cmd:gen_mrf_query_160$secondaryArchSuffix @@ -89,6 +89,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:pkg_config$secondaryArchSuffix " + BUILD() { export CFLAGS="-D_BSD_SOURCE" diff --git a/www-client/lynx/lynx-2.8.9rel.1.recipe b/www-client/lynx/lynx-2.8.9rel.1.recipe index 4774ffa3e..fc32742a9 100644 --- a/www-client/lynx/lynx-2.8.9rel.1.recipe +++ b/www-client/lynx/lynx-2.8.9rel.1.recipe @@ -12,6 +12,11 @@ PATCHES="lynx-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" +GLOBAL_WRITABLE_FILES=" + settings/lynx.lss keep-old + settings/lynx.cfg keep-old + " + PROVIDES=" lynx = $portVersion cmd:lynx = $portVersion @@ -46,11 +51,6 @@ BUILD_PREREQUIRES=" cmd:tar " -GLOBAL_WRITABLE_FILES=" - settings/lynx.lss keep-old - settings/lynx.cfg keep-old - " - BUILD() { runConfigure --omit-dirs "docDir" ./configure --with-ssl diff --git a/www-client/qupzilla/qupzilla-1.8.9.recipe b/www-client/qupzilla/qupzilla-1.8.9.recipe index 94d532209..d2b0d6e78 100644 --- a/www-client/qupzilla/qupzilla-1.8.9.recipe +++ b/www-client/qupzilla/qupzilla-1.8.9.recipe @@ -44,13 +44,6 @@ REQUIRES=" lib:libQt5Widgets$secondaryArchSuffix " -BUILD_PREREQUIRES=" - cmd:qmake$secondaryArchSuffix >= 5 - cmd:make - cmd:g++$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - cmd:sed - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix @@ -66,6 +59,13 @@ BUILD_REQUIRES=" devel:libQt5Widgets$secondaryArchSuffix devel:libssl$secondaryArchSuffix " +BUILD_PREREQUIRES=" + cmd:qmake$secondaryArchSuffix >= 5 + cmd:make + cmd:g++$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " BUILD() { diff --git a/www-servers/cherokee/cherokee-1.2.104.recipe b/www-servers/cherokee/cherokee-1.2.104.recipe index f90767f2e..9cbb67274 100644 --- a/www-servers/cherokee/cherokee-1.2.104.recipe +++ b/www-servers/cherokee/cherokee-1.2.104.recipe @@ -14,6 +14,9 @@ CHECKSUM_SHA256="5cbd00ff48503eaf90356b2975e311c02977f9166927e57fc23f541a109efd9 SOURCE_DIR="webserver-$portVersion" PATCHES="cherokee-$portVersion.patchset" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + GLOBAL_WRITABLE_FILES=" settings/cherokee/cherokee.conf.perf_sample keep-old settings/cherokee/cherokee.conf keep-old @@ -24,9 +27,6 @@ GLOBAL_WRITABLE_FILES=" var/www/index.html keep-old " -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - PROVIDES=" cherokee$secondaryArchSuffix = $portVersion cmd:ctk_run$secondaryArchSuffix