From 79a9915b2f69abc82dfbcf4ab39343709bff3486 Mon Sep 17 00:00:00 2001 From: Vale Date: Sat, 20 Feb 2016 21:13:04 -0500 Subject: [PATCH] Fix ordering on new recipes --- .../libspectrum/libspectrum-1.1.1.recipe | 2 +- app-text/xmlroff/xmlroff-0.6.2.recipe | 2 +- dev-cpp/mxml/mxml-2.6.recipe | 2 +- dev-dotnet/pnet/pnet-0.8.0.recipe | 2 ++ dev-games/fifechan/fifechan-0.1.2.recipe | 2 +- dev-lang/tcc/tcc-0.9.26.recipe | 4 +++- dev-libs/libcss/libcss-0.4.0.recipe | 2 ++ dev-libs/libcss/libcss-0.5.0.recipe | 2 ++ dev-libs/libcss/libcss-0.6.0.recipe | 2 ++ .../libmaxminddb/libmaxminddb-1.0.1.recipe | 2 +- dev-libs/libnsutils/libnsutils-0.0.1.recipe | 2 ++ dev-libs/libnsutils/libnsutils-0.0.2.recipe | 2 ++ .../libparserutils-0.2.0.recipe | 4 +++- .../libparserutils-0.2.1.recipe | 4 +++- .../libparserutils-0.2.3.recipe | 21 +++++++++--------- dev-libs/libsigc++/libsigc++-1.2.7.recipe | 2 +- dev-libs/libutf8proc/libutf8proc-1.3.1.recipe | 6 ++--- dev-libs/libuv/libuv-1.2.0.recipe | 2 +- .../libwapcaplet/libwapcaplet-0.3.0.recipe | 6 ++--- .../netsurf_buildsystem-1.5.recipe | 16 +++++--------- dev-util/radare2/radare2-0.9.9.recipe | 2 +- .../openscenegraph-3.2.1.recipe | 3 +-- .../openscenegraph/openscenegraph-git.recipe | 3 +-- .../graphicsmagick-1.3.20.recipe | 2 +- media-libs/audiofile/audiofile-0.3.6.recipe | 5 +++-- media-libs/bpg/bpg-0.9.4.recipe | 2 ++ media-libs/libcddb/libcddb-1.3.2.recipe | 2 +- media-libs/libcuefile/libcuefile-r475.recipe | 2 +- media-libs/libfpx/libfpx-1.3.1.recipe | 2 +- media-video/vcdimager/vcdimager-0.7.24.recipe | 2 +- net-irc/weechat/weechat-1.4.recipe | 22 +++++++++---------- .../libatomic_ops/libatomic_ops-7.4.2.recipe | 2 +- 32 files changed, 74 insertions(+), 62 deletions(-) diff --git a/app-emulation/libspectrum/libspectrum-1.1.1.recipe b/app-emulation/libspectrum/libspectrum-1.1.1.recipe index 0af8e5ecc..c25f8db49 100644 --- a/app-emulation/libspectrum/libspectrum-1.1.1.recipe +++ b/app-emulation/libspectrum/libspectrum-1.1.1.recipe @@ -26,7 +26,7 @@ REQUIRES=" PROVIDES_devel=" libspectrum_devel = $portVersion devel:libspectrum = 8.1.0 compat >= 8 -" + " REQUIRES_devel=" libspectrum == $portVersion base " diff --git a/app-text/xmlroff/xmlroff-0.6.2.recipe b/app-text/xmlroff/xmlroff-0.6.2.recipe index d53df2bf4..aa331db99 100644 --- a/app-text/xmlroff/xmlroff-0.6.2.recipe +++ b/app-text/xmlroff/xmlroff-0.6.2.recipe @@ -46,7 +46,7 @@ REQUIRES=" PROVIDES_devel=" xmlroff${secondaryArchSuffix}_devel = $portVersion devel:libfo_0.6$secondaryArchSuffix = 0.602.0 compat = 0 -" + " REQUIRES_devel=" xmlroff$secondaryArchSuffix == $portVersion base " diff --git a/dev-cpp/mxml/mxml-2.6.recipe b/dev-cpp/mxml/mxml-2.6.recipe index 31b9f3edd..c73c3735c 100644 --- a/dev-cpp/mxml/mxml-2.6.recipe +++ b/dev-cpp/mxml/mxml-2.6.recipe @@ -25,7 +25,7 @@ REQUIRES=" PROVIDES_devel=" mxml${secondaryArchSuffix}_devel = $portVersion devel:mxml$secondaryArchSuffix = 1.4 compat >= 1 -" + " REQUIRES_devel=" mxml$secondaryArchSuffix == $portVersion base " diff --git a/dev-dotnet/pnet/pnet-0.8.0.recipe b/dev-dotnet/pnet/pnet-0.8.0.recipe index ea2e1a083..e4328b0a8 100644 --- a/dev-dotnet/pnet/pnet-0.8.0.recipe +++ b/dev-dotnet/pnet/pnet-0.8.0.recipe @@ -66,6 +66,8 @@ PROVIDES_devel=" devel:libILLink = $portVersion compat >= 0 devel:libILSupport = $portVersion compat >= 0 " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku_devel diff --git a/dev-games/fifechan/fifechan-0.1.2.recipe b/dev-games/fifechan/fifechan-0.1.2.recipe index 74e2b919c..c11132ac9 100644 --- a/dev-games/fifechan/fifechan-0.1.2.recipe +++ b/dev-games/fifechan/fifechan-0.1.2.recipe @@ -30,7 +30,7 @@ PROVIDES_devel=" devel:libfifechan = $portVersion devel:libfifechan_opengl = $portVersion devel:libfifechan_sdl = $portVersion -" + " REQUIRES_devel=" fifechan == $portVersion " diff --git a/dev-lang/tcc/tcc-0.9.26.recipe b/dev-lang/tcc/tcc-0.9.26.recipe index 87864e426..4e3957268 100644 --- a/dev-lang/tcc/tcc-0.9.26.recipe +++ b/dev-lang/tcc/tcc-0.9.26.recipe @@ -42,7 +42,9 @@ REQUIRES=" PROVIDES_devel=" devel:libtcc -" + " +REQUIRES_devel=" + " BUILD_PREREQUIRES=" haiku_devel cmd:gcc diff --git a/dev-libs/libcss/libcss-0.4.0.recipe b/dev-libs/libcss/libcss-0.4.0.recipe index d51db2d15..37d858dd9 100644 --- a/dev-libs/libcss/libcss-0.4.0.recipe +++ b/dev-libs/libcss/libcss-0.4.0.recipe @@ -26,6 +26,8 @@ PROVIDES_devel=" libcss${secondaryArchSuffix}_devel = $portVersion devel:libcss$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libcss/libcss-0.5.0.recipe b/dev-libs/libcss/libcss-0.5.0.recipe index 9fc156edb..fd0931765 100644 --- a/dev-libs/libcss/libcss-0.5.0.recipe +++ b/dev-libs/libcss/libcss-0.5.0.recipe @@ -27,6 +27,8 @@ PROVIDES_devel=" libcss${secondaryArchSuffix}_devel = $portVersion devel:libcss$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libcss/libcss-0.6.0.recipe b/dev-libs/libcss/libcss-0.6.0.recipe index 17ab27613..02065d268 100644 --- a/dev-libs/libcss/libcss-0.6.0.recipe +++ b/dev-libs/libcss/libcss-0.6.0.recipe @@ -25,6 +25,8 @@ PROVIDES_devel=" libcss${secondaryArchSuffix}_devel = $portVersion devel:libcss$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe index 3842408c7..efa693c3a 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe +++ b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe @@ -23,7 +23,7 @@ REQUIRES=" PROVIDES_devel=" devel:libmaxminddb$secondaryArchSuffix = 0.0.7 compat = 0 -" + " REQUIRES_devel=" libmaxminddb$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libnsutils/libnsutils-0.0.1.recipe b/dev-libs/libnsutils/libnsutils-0.0.1.recipe index c49202280..af442ff9b 100644 --- a/dev-libs/libnsutils/libnsutils-0.0.1.recipe +++ b/dev-libs/libnsutils/libnsutils-0.0.1.recipe @@ -24,6 +24,8 @@ PROVIDES_devel=" libnsutils${secondaryArchSuffix}_devel = $portVersion devel:libnsutils$secondaryArchSuffix = 0.0.1 compat >= 0 " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libnsutils/libnsutils-0.0.2.recipe b/dev-libs/libnsutils/libnsutils-0.0.2.recipe index bb40d1032..391d50028 100644 --- a/dev-libs/libnsutils/libnsutils-0.0.2.recipe +++ b/dev-libs/libnsutils/libnsutils-0.0.2.recipe @@ -23,6 +23,8 @@ PROVIDES_devel=" libnsutils${secondaryArchSuffix}_devel = $portVersion devel:libnsutils$secondaryArchSuffix = 0.0.1 compat >= 0 " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libparserutils/libparserutils-0.2.0.recipe b/dev-libs/libparserutils/libparserutils-0.2.0.recipe index d554b8efd..870f4fbf4 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.0.recipe +++ b/dev-libs/libparserutils/libparserutils-0.2.0.recipe @@ -23,7 +23,9 @@ REQUIRES=" PROVIDES_devel=" libparserutils${secondaryArchSuffix}_devel = $portVersion devel:libparserutils$secondaryArchSuffix = $portVersion -" + " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libparserutils/libparserutils-0.2.1.recipe b/dev-libs/libparserutils/libparserutils-0.2.1.recipe index 5f3b21382..433d7688e 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.1.recipe +++ b/dev-libs/libparserutils/libparserutils-0.2.1.recipe @@ -23,7 +23,9 @@ REQUIRES=" PROVIDES_devel=" libparserutils${secondaryArchSuffix}_devel = $portVersion devel:libparserutils$secondaryArchSuffix = $portVersion -" + " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libparserutils/libparserutils-0.2.3.recipe b/dev-libs/libparserutils/libparserutils-0.2.3.recipe index a76395318..e945451ae 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.3.recipe +++ b/dev-libs/libparserutils/libparserutils-0.2.3.recipe @@ -1,11 +1,11 @@ SUMMARY="A library for building efficient parsers" DESCRIPTION="LibParserUtils is a library for building efficient parsers." HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" +COPYRIGHT="2007-2016 J-M Bell" +LICENSE="MIT" +REVISION="1" SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-$portVersion-src.tar.gz" CHECKSUM_SHA256="c5d93fb41b9c006ba392b32d724a7239238d656aa81cd45804ddd0b794a6ff05" -REVISION="1" -LICENSE="MIT" -COPYRIGHT="2007-2016 J-M Bell" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -14,19 +14,23 @@ PROVIDES=" libparserutils$secondaryArchSuffix = $portVersion lib:libparserutils$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libiconv${secondaryArchSuffix} " +PROVIDES_devel=" + libparserutils${secondaryArchSuffix}_devel = $portVersion + devel:libparserutils$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libiconv${secondaryArchSuffix} - lib:libiconv${secondaryArchSuffix} " - BUILD_PREREQUIRES=" netsurf_buildsystem >= 1.1 cmd:gcc$secondaryArchSuffix @@ -64,8 +68,3 @@ TEST() make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ LDFLAGS=-liconv test } - -PROVIDES_devel=" - libparserutils${secondaryArchSuffix}_devel = $portVersion - devel:libparserutils$secondaryArchSuffix = $portVersion -" diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.recipe b/dev-libs/libsigc++/libsigc++-1.2.7.recipe index 3966543c3..9c3bc1cc8 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.recipe +++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe @@ -26,7 +26,7 @@ REQUIRES=" PROVIDES_devel=" libsigc++${secondaryArchSuffix}_devel = $portVersion devel:libsigc_1.2$secondaryArchSuffix = 0.0.0 compat = 0 -" + " REQUIRES_devel=" libsigc++$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1.recipe b/dev-libs/libutf8proc/libutf8proc-1.3.1.recipe index 6bb8ade48..dd8a9c1aa 100644 --- a/dev-libs/libutf8proc/libutf8proc-1.3.1.recipe +++ b/dev-libs/libutf8proc/libutf8proc-1.3.1.recipe @@ -20,13 +20,13 @@ REQUIRES=" haiku$secondaryArchSuffix " -REQUIRES_devel=" - libutf8proc$secondaryArchSuffix == $portVersion base - " PROVIDES_devel=" libutf8proc${secondaryArchSuffix}_devel = $portVersion devel:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1 " +REQUIRES_devel=" + libutf8proc$secondaryArchSuffix == $portVersion base + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe index e3f250ebe..e7a4cb05f 100644 --- a/dev-libs/libuv/libuv-1.2.0.recipe +++ b/dev-libs/libuv/libuv-1.2.0.recipe @@ -24,7 +24,7 @@ REQUIRES=" PROVIDES_devel=" libuv${secondaryArchSuffix}_devel = $portVersion devel:libuv$secondaryArchSuffix = $portVersion -" + " REQUIRES_devel=" libuv$secondaryArchSuffix == $portVersion " diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe index a524d86fa..39169a4f6 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.3.0.recipe @@ -20,13 +20,13 @@ REQUIRES=" haiku$secondaryArchSuffix " -REQUIRES_devel=" - libwapcaplet$secondaryArchSuffix == $portVersion base - " PROVIDES_devel=" libwapcaplet${secondaryArchSuffix}_devel = $portVersion devel:libwapcaplet$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + libwapcaplet$secondaryArchSuffix == $portVersion base + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe index ce4c0ff45..9ffe0d95d 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.5.recipe @@ -1,20 +1,18 @@ SUMMARY="NetSurf build framework" -DESCRIPTION=" -NetSurf build framework for compiling some of their libraries. -" +DESCRIPTION="NetSurf build framework for compiling some of their libraries." HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/" +COPYRIGHT="2009-2016 The NetSurf Browser project" +LICENSE="MIT" +REVISION="1" SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz" CHECKSUM_SHA256="dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71" -REVISION="1" -LICENSE="MIT" -COPYRIGHT="2009-2016 The NetSurf Browser project" +SOURCE_DIR="buildsystem-$portVersion" -ARCHITECTURES="any" +ARCHITECTURES="x86 x86_gcc2" PROVIDES=" netsurf_buildsystem = $portVersion " - REQUIRES=" haiku " @@ -22,12 +20,10 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="buildsystem-$portVersion" BUILD() { # no-op diff --git a/dev-util/radare2/radare2-0.9.9.recipe b/dev-util/radare2/radare2-0.9.9.recipe index bdd513be7..f538781f0 100644 --- a/dev-util/radare2/radare2-0.9.9.recipe +++ b/dev-util/radare2/radare2-0.9.9.recipe @@ -62,7 +62,7 @@ REQUIRES=" PROVIDES_devel=" radare2${secondaryArchSuffix}_devel = $portVersion devel:libr2$secondaryArchSuffix = 0.9.9 -" + " REQUIRES_devel=" radare2${secondaryArchSuffix} == $portVersion base " diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 2b81e4880..84d9dd4a2 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -71,8 +71,7 @@ PROVIDES_devel=" devel:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 devel:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 devel:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 - -" + " REQUIRES_devel=" openscenegraph$secondaryArchSuffix == $portVersion " diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 38efa2aaa..60b2d74af 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -72,8 +72,7 @@ PROVIDES_devel=" devel:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 devel:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 devel:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 - -" + " REQUIRES_devel=" openscenegraph$secondaryArchSuffix == 3.3.4 " diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe index 5857e667b..5edce82e1 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -40,7 +40,7 @@ PROVIDES_devel=" devel:libGraphicsMagick++$secondaryArchSuffix devel:libGraphicsMagick$secondaryArchSuffix devel:libGraphicsMagickWand$secondaryArchSuffix -" + " REQUIRES_devel=" graphicsmagick$secondaryArchSuffix == $portVersion " diff --git a/media-libs/audiofile/audiofile-0.3.6.recipe b/media-libs/audiofile/audiofile-0.3.6.recipe index 0f5cf87e7..309e7a9f5 100644 --- a/media-libs/audiofile/audiofile-0.3.6.recipe +++ b/media-libs/audiofile/audiofile-0.3.6.recipe @@ -51,8 +51,9 @@ REQUIRES=" PROVIDES_devel=" audiofile${secondaryArchSuffix}_devel = $portVersion devel:libaudiofile$secondaryArchSuffix - -" + " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe index b836ab9dc..d39badf99 100644 --- a/media-libs/bpg/bpg-0.9.4.recipe +++ b/media-libs/bpg/bpg-0.9.4.recipe @@ -31,6 +31,8 @@ PROVIDES_devel=" libbpg${secondaryArchSuffix}_devel = $portVersion devel:libbpg$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe index 9c5ede382..72a8b9e68 100644 --- a/media-libs/libcddb/libcddb-1.3.2.recipe +++ b/media-libs/libcddb/libcddb-1.3.2.recipe @@ -25,7 +25,7 @@ REQUIRES=" PROVIDES_devel=" libcddb${secondaryArchSuffix}_devel = $portVersion devel:libcddb$secondaryArchSuffix = $portVersion -" + " REQUIRES_devel=" libcddb$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/libcuefile/libcuefile-r475.recipe b/media-libs/libcuefile/libcuefile-r475.recipe index 2a426b4a1..e840186d4 100644 --- a/media-libs/libcuefile/libcuefile-r475.recipe +++ b/media-libs/libcuefile/libcuefile-r475.recipe @@ -24,7 +24,7 @@ REQUIRES=" PROVIDES_devel=" libcuefile${secondaryArchSuffix}_devel = $portVersion devel:libcuefile$secondaryArchSuffix -" + " REQUIRES_devel=" libcuefile$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/libfpx/libfpx-1.3.1.recipe b/media-libs/libfpx/libfpx-1.3.1.recipe index 7d44582c4..c0ba8cb2d 100644 --- a/media-libs/libfpx/libfpx-1.3.1.recipe +++ b/media-libs/libfpx/libfpx-1.3.1.recipe @@ -23,7 +23,7 @@ REQUIRES=" PROVIDES_devel=" libfpx$_devel=$portVersion devel:libfpx=$portVersion -" + " REQUIRES_devel=" libfpx == $portVersion base " diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe index f2c53eb9e..1cc6d3af2 100644 --- a/media-video/vcdimager/vcdimager-0.7.24.recipe +++ b/media-video/vcdimager/vcdimager-0.7.24.recipe @@ -49,7 +49,7 @@ REQUIRES=" PROVIDES_devel=" vcdimager${secondaryArchSuffix}_devel = $portVersion devel:libvcdinfo$secondaryArchSuffix = $portVersion - " + " REQUIRES_devel=" vcdimager$secondaryArchSuffix == $portVersion base " diff --git a/net-irc/weechat/weechat-1.4.recipe b/net-irc/weechat/weechat-1.4.recipe index d356bb638..fd63be8e7 100644 --- a/net-irc/weechat/weechat-1.4.recipe +++ b/net-irc/weechat/weechat-1.4.recipe @@ -1,13 +1,10 @@ SUMMARY="Portable and multi-interface IRC client" DESCRIPTION="WeeChat (Wee Enhanced Environment for Chat) is a free chat \ -client, fast and light, designed for many operating systems. -It is highly customizable and extensible with scripts. -" +client, fast and light, designed for many operating systems. \ +It is highly customizable and extensible with scripts." HOMEPAGE="http://weechat.org" COPYRIGHT="2003-2016 Sébastien Helleu" -LICENSE=" - GNU GPL v3 - " +LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://weechat.org/files/src/weechat-$portVersion.tar.bz2" CHECKSUM_SHA256="e06d9949ccececdd9692c95c41304c2f7fe9ec47b5eedd0d0a8529f6a3c1ddd4" @@ -32,6 +29,13 @@ REQUIRES=" lib:libgpg_error$secondaryArchSuffix " +PROVIDES_devel=" + weechat${secondaryArchSuffix}_devel = $portVersion compat >= 1 + " +REQUIRES_devel=" + weechat$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix @@ -46,12 +50,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:pkg_config${secondaryArchSuffix} " -PROVIDES_devel=" - weechat${secondaryArchSuffix}_devel = $portVersion compat >= 1 - " -REQUIRES_devel=" - weechat$secondaryArchSuffix == $portVersion base - " BUILD() { diff --git a/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe b/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe index 0a401699a..e91303d46 100644 --- a/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe +++ b/sys-libs/libatomic_ops/libatomic_ops-7.4.2.recipe @@ -25,7 +25,7 @@ PROVIDES_devel=" libatomic_ops$secondaryArchSuffix_devel = $portVersion devel:libatomic_ops$secondaryArchSuffix = 1.0.3 compat >= 1 devel:libatomic_ops_gpl$secondaryArchSuffix = 1.0.3 compat >= 1 - " + " REQUIRES_devel=" libatomic_ops$secondaryArchSuffix == $portVersion base "