From d2b37f714e73fae9007b83c5272cf2d81f88fb4a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Oct 2018 13:02:32 +0200 Subject: [PATCH] code style. --- dev-libs/mini-xml/mini_xml-2.11.recipe | 1 - dev-libs/zziplib/zziplib-0.13.69.recipe | 8 ++++---- dev-lua/luafilesystem/luafilesystem-1.7.0.2.recipe | 2 +- games-action/cylindrix/cylindrix-1.0.recipe | 10 ++++------ games-board/dreamchess/dreamchess-0.2.0.recipe | 1 - .../simutrans_pak128/simutrans_pak128-2.7.recipe | 8 ++++---- .../simutrans_pak64/simutrans_pak64-120.2.recipe | 8 ++++---- kde-misc/krusader/krusader-2.7.1.recipe | 2 +- net-misc/freerdp/freerdp-2.0.0~git.recipe | 10 +++++----- net-news/quiterss/quiterss-0.18.12.recipe | 2 +- sci-geosciences/gpxsee/gpxsee-6.0.recipe | 1 + sys-devel/llvm/llvm7-7.0.0.recipe | 2 +- sys-fs/mtools/mtools-4.0.19.recipe | 1 + x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe | 2 +- 14 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dev-libs/mini-xml/mini_xml-2.11.recipe b/dev-libs/mini-xml/mini_xml-2.11.recipe index 1f02dcde1..001a97875 100644 --- a/dev-libs/mini-xml/mini_xml-2.11.recipe +++ b/dev-libs/mini-xml/mini_xml-2.11.recipe @@ -37,7 +37,6 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:autoconf cmd:gcc${secondaryArchSuffix} diff --git a/dev-libs/zziplib/zziplib-0.13.69.recipe b/dev-libs/zziplib/zziplib-0.13.69.recipe index e3698372f..8f13e30b8 100644 --- a/dev-libs/zziplib/zziplib-0.13.69.recipe +++ b/dev-libs/zziplib/zziplib-0.13.69.recipe @@ -40,14 +40,14 @@ REQUIRES=" PROVIDES_devel=" zziplib${secondaryArchSuffix}_devel = $portVersion - devel:libzzip_0$secondaryArchSuffix = $libVersionCompat - devel:libzzipfseeko_0$secondaryArchSuffix = $libVersionCompat - devel:libzzipmmapped_0$secondaryArchSuffix = $libVersionCompat - devel:libzzipwrap_0$secondaryArchSuffix = $libVersionCompat devel:libzzip$secondaryArchSuffix = $libVersionCompat + devel:libzzip_0$secondaryArchSuffix = $libVersionCompat devel:libzzipfseeko$secondaryArchSuffix = $libVersionCompat + devel:libzzipfseeko_0$secondaryArchSuffix = $libVersionCompat devel:libzzipmmapped$secondaryArchSuffix = $libVersionCompat + devel:libzzipmmapped_0$secondaryArchSuffix = $libVersionCompat devel:libzzipwrap$secondaryArchSuffix = $libVersionCompat + devel:libzzipwrap_0$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" zziplib$secondaryArchSuffix == $portVersion base diff --git a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.recipe b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.recipe index 1fc4f557c..cc88c1a0c 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.7.0.2.recipe +++ b/dev-lua/luafilesystem/luafilesystem-1.7.0.2.recipe @@ -28,9 +28,9 @@ BUILD_REQUIRES=" devel:liblua$secondaryArchSuffix >= 5.3 " BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix cmd:lua5.3$secondaryArchSuffix cmd:make - cmd:gcc$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " diff --git a/games-action/cylindrix/cylindrix-1.0.recipe b/games-action/cylindrix/cylindrix-1.0.recipe index 6ee107c80..dd84392c7 100644 --- a/games-action/cylindrix/cylindrix-1.0.recipe +++ b/games-action/cylindrix/cylindrix-1.0.recipe @@ -6,7 +6,6 @@ LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://d1cxvcw9gjxu2x.cloudfront.net/projects/1235#cylindrix-1.0.tar.gz" CHECKSUM_SHA256="33bfc264d906a1977090e47a38f544551d2939d4c0ea01e1792f63ab4fa06f20" - SOURCE_DIR="cylindrix" ARCHITECTURES="!x86_gcc2 !x86 !x86_64" @@ -16,7 +15,6 @@ PROVIDES=" cylindrix cmd:cylindrix$secondaryArchSuffix " - REQUIRES=" haiku${secondaryArchSuffix} lib:liballeg$secondaryArchSuffix @@ -27,13 +25,13 @@ BUILD_REQUIRES=" devel:liballeg$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:cmp cmd:aclocal - cmd:automake cmd:autoheader + cmd:automake + cmd:cmp + cmd:gcc$secondaryArchSuffix cmd:libtoolize + cmd:make cmd:makeinfo " diff --git a/games-board/dreamchess/dreamchess-0.2.0.recipe b/games-board/dreamchess/dreamchess-0.2.0.recipe index 1b74bc14b..78be4f772 100644 --- a/games-board/dreamchess/dreamchess-0.2.0.recipe +++ b/games-board/dreamchess/dreamchess-0.2.0.recipe @@ -50,7 +50,6 @@ BUILD_REQUIRES=" devel:libsdl_image_1.2 devel:libsdl_mixer_1.2 " - BUILD_PREREQUIRES=" cmd:awk cmd:find diff --git a/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe b/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe index 8178d7581..fe5915677 100644 --- a/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe +++ b/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe @@ -22,15 +22,15 @@ SOURCE_DIR="simutrans" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" +GLOBAL_WRITABLE_FILES=" + non-packaged/$relativeAppsDir/simutrans/pak128/config directory keep-old + " + PROVIDES=" simutrans_pak128 = $portVersion simutrans_pakset = 120.2 compat >= 120.2 " -GLOBAL_WRITABLE_FILES=" - non-packaged/$relativeAppsDir/simutrans/pak128/config directory keep-old - " - INSTALL() { mkdir -p $appsDir/simutrans diff --git a/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe b/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe index f45ef7a81..385c7f959 100644 --- a/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe +++ b/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe @@ -22,15 +22,15 @@ SOURCE_DIR="" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" +GLOBAL_WRITABLE_FILES=" + non-packaged/$relativeAppsDir/simutrans/pak/config directory keep-old + " + PROVIDES=" simutrans_pak64 = $portVersion simutrans_pakset = $portVersion compat >= 120.2 " -GLOBAL_WRITABLE_FILES=" - non-packaged/$relativeAppsDir/simutrans/pak/config directory keep-old - " - INSTALL() { mkdir -p $appsDir/simutrans diff --git a/kde-misc/krusader/krusader-2.7.1.recipe b/kde-misc/krusader/krusader-2.7.1.recipe index 42eefd11e..c0d4ed7e8 100644 --- a/kde-misc/krusader/krusader-2.7.1.recipe +++ b/kde-misc/krusader/krusader-2.7.1.recipe @@ -33,8 +33,8 @@ PROVIDES=" app:Krusader$secondaryArchSuffix = $portVersion " REQUIRES=" - dbus$secondaryArchSuffix haiku$secondaryArchSuffix + dbus$secondaryArchSuffix lib:libKF5Archive$secondaryArchSuffix lib:libKF5Auth$secondaryArchSuffix lib:libKF5Bookmarks$secondaryArchSuffix diff --git a/net-misc/freerdp/freerdp-2.0.0~git.recipe b/net-misc/freerdp/freerdp-2.0.0~git.recipe index 92021a0b3..b21637f40 100644 --- a/net-misc/freerdp/freerdp-2.0.0~git.recipe +++ b/net-misc/freerdp/freerdp-2.0.0~git.recipe @@ -21,10 +21,10 @@ PROVIDES=" cmd:FreeRDP$secondaryArchSuffix = $portVersion cmd:winpr_hash$secondaryArchSuffix = $portVersion cmd:winpr_makecert$secondaryArchSuffix = $portVersion - lib:libfreerdp_client2$secondaryArchSuffix = $portVersion lib:libfreerdp2$secondaryArchSuffix = $portVersion - lib:libwinpr_tools2$secondaryArchSuffix = $portVersion + lib:libfreerdp_client2$secondaryArchSuffix = $portVersion lib:libwinpr2$secondaryArchSuffix = $portVersion + lib:libwinpr_tools2$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -41,14 +41,14 @@ REQUIRES=" PROVIDES_devel=" freerdp${secondaryArchSuffix}_devel = $portVersion - devel:libfreerdp_client2$secondaryArchSuffix = $portVersion devel:libfreerdp2$secondaryArchSuffix = $portVersion - devel:libwinpr_tools2$secondaryArchSuffix = $portVersion + devel:libfreerdp_client2$secondaryArchSuffix = $portVersion devel:libwinpr2$secondaryArchSuffix = $portVersion + devel:libwinpr_tools2$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - haiku$secondaryArchSuffix freerdp$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix " BUILD_REQUIRES=" diff --git a/net-news/quiterss/quiterss-0.18.12.recipe b/net-news/quiterss/quiterss-0.18.12.recipe index 9155801a8..5b2842a14 100644 --- a/net-news/quiterss/quiterss-0.18.12.recipe +++ b/net-news/quiterss/quiterss-0.18.12.recipe @@ -19,8 +19,8 @@ REVISION="2" SOURCE_URI="https://github.com/QuiteRSS/quiterss/archive/$portVersion.tar.gz" CHECKSUM_SHA256="120de0d640e2c417d664872b8b8881c85c3e76aec9b76d235f0e12e5ee78f01f" SOURCE_FILENAME="quiterss-$portVersion.tar.gz" -ADDITIONAL_FILES="quiterss.rdef.in" PATCHES="quiterss-$portVersion.patchset" +ADDITIONAL_FILES="quiterss.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/sci-geosciences/gpxsee/gpxsee-6.0.recipe b/sci-geosciences/gpxsee/gpxsee-6.0.recipe index 2dfdfb3dd..653e3df07 100644 --- a/sci-geosciences/gpxsee/gpxsee-6.0.recipe +++ b/sci-geosciences/gpxsee/gpxsee-6.0.recipe @@ -28,6 +28,7 @@ REQUIRES=" lib:libQt5Sql$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix diff --git a/sys-devel/llvm/llvm7-7.0.0.recipe b/sys-devel/llvm/llvm7-7.0.0.recipe index 6da1d0cc0..423b28f5d 100644 --- a/sys-devel/llvm/llvm7-7.0.0.recipe +++ b/sys-devel/llvm/llvm7-7.0.0.recipe @@ -113,8 +113,8 @@ PROVIDES=" cmd:yaml2obj devel:libfindAllSymbols$secondaryArchSuffix devel:libLLVM$secondaryArchSuffix = $portVersion compat >= 7 - devel:libLLVM_7$secondaryArchSuffix = $portVersion compat >= 7 devel:libLLVM_$portVersion$secondaryArchSuffix = $portVersion compat >= 7 + devel:libLLVM_7$secondaryArchSuffix = $portVersion compat >= 7 devel:libLLVMAArch64AsmParser$secondaryArchSuffix devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix devel:libLLVMAArch64CodeGen$secondaryArchSuffix diff --git a/sys-fs/mtools/mtools-4.0.19.recipe b/sys-fs/mtools/mtools-4.0.19.recipe index 73bbb7424..22ad84b7a 100644 --- a/sys-fs/mtools/mtools-4.0.19.recipe +++ b/sys-fs/mtools/mtools-4.0.19.recipe @@ -73,6 +73,7 @@ defineDebugInfoPackage mtools \ "$binDir"/mkmanifest \ "$binDir"/mtools \ + BUILD() { runConfigure ./configure diff --git a/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe b/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe index ed9b46cd6..0c4ee841b 100644 --- a/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe +++ b/x11-libs/libfm-extra/libfm_extra-1.3.0.2.recipe @@ -20,7 +20,7 @@ SOURCE_DIR="libfm-$portVersion" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion=4.1.1 +libVersion="4.1.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES="