From 7261bbe97e8022af01a2cd300095670c17a7104a Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 27 Aug 2016 23:04:22 +0000 Subject: [PATCH] Fix several recipes which were missing a $secondaryArchSuffix. (#784) --- app-shells/zsh/zsh-5.0.7.recipe | 4 ++-- app-shells/zsh/zsh-5.1.1.recipe | 4 ++-- app-shells/zsh/zsh-5.2.recipe | 4 ++-- dev-embedded/arduino/arduino-1.0.6.recipe | 4 ++-- dev-libs/apr/apr-1.5.2.recipe | 6 +++--- dev-libs/apr_util/apr_util-1.5.4.recipe | 6 +++--- dev-util/indent/indent-2.2.10.recipe | 8 ++++---- games-strategy/lgeneral/lgeneral-1.3.1.recipe | 4 ++-- haiku-apps/paladin/paladin-git.recipe | 12 ++++++------ sys-devel/libtool/libtool-2.4.2.recipe | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app-shells/zsh/zsh-5.0.7.recipe b/app-shells/zsh/zsh-5.0.7.recipe index 369454acf..e07e0fa64 100644 --- a/app-shells/zsh/zsh-5.0.7.recipe +++ b/app-shells/zsh/zsh-5.0.7.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://www.zsh.org" COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \ Andrew Main, Peter Stephenson, Sven Wishnowsky, and others" LICENSE="ZSH" -REVISION="2" +REVISION="3" SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2" CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3" PATCHES="zsh-$portVersion.patchset" @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:find cmd:gcc$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:sed cmd:awk diff --git a/app-shells/zsh/zsh-5.1.1.recipe b/app-shells/zsh/zsh-5.1.1.recipe index 79fbf7f4b..46ed0c591 100644 --- a/app-shells/zsh/zsh-5.1.1.recipe +++ b/app-shells/zsh/zsh-5.1.1.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://zsh.sourceforge.net" COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \ Andrew Main, Peter Stephenson, Sven Wishnowsky, and others" LICENSE="ZSH" -REVISION="1" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.xz" CHECKSUM_SHA256="74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec" PATCHES="zsh-$portVersion.patchset" @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:find cmd:gcc$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:sed cmd:awk diff --git a/app-shells/zsh/zsh-5.2.recipe b/app-shells/zsh/zsh-5.2.recipe index 21c052314..92771e16f 100644 --- a/app-shells/zsh/zsh-5.2.recipe +++ b/app-shells/zsh/zsh-5.2.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://zsh.sourceforge.net" COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \ Andrew Main, Peter Stephenson, Sven Wishnowsky, and others" LICENSE="ZSH" -REVISION="1" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.xz" CHECKSUM_SHA256="f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d" PATCHES="zsh-$portVersion.patchset" @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:find cmd:gcc$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:sed cmd:awk diff --git a/dev-embedded/arduino/arduino-1.0.6.recipe b/dev-embedded/arduino/arduino-1.0.6.recipe index b7af0963e..4189208a8 100644 --- a/dev-embedded/arduino/arduino-1.0.6.recipe +++ b/dev-embedded/arduino/arduino-1.0.6.recipe @@ -6,7 +6,7 @@ open-source software." HOMEPAGE="http://arduino.cc" COPYRIGHT="Arduino team" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://downloads.arduino.cc/arduino-1.0.6-linux32.tgz" CHECKSUM_SHA256="f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658" SOURCE_DIR="arduino-1.0.6" @@ -33,7 +33,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/dev-libs/apr/apr-1.5.2.recipe b/dev-libs/apr/apr-1.5.2.recipe index 533dc2dd9..0ebaf23e4 100644 --- a/dev-libs/apr/apr-1.5.2.recipe +++ b/dev-libs/apr/apr-1.5.2.recipe @@ -24,7 +24,7 @@ following: HOMEPAGE="http://apr.apache.org/" COPYRIGHT="2012 The Apache Software Foundation" LICENSE="Apache v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz" CHECKSUM_SHA256="1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb" PATCHES="apr-$portVersion.patch" @@ -56,8 +56,8 @@ BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix - cmd:ld - cmd:libtoolize + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make " diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe index f271a96bc..92da6704e 100644 --- a/dev-libs/apr_util/apr_util-1.5.4.recipe +++ b/dev-libs/apr_util/apr_util-1.5.4.recipe @@ -10,7 +10,7 @@ deficiencies or features." HOMEPAGE="http://apr.apache.org/" COPYRIGHT="2011 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz" CHECKSUM_SHA256="976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19" SOURCE_DIR="apr-util-$portVersion" @@ -50,8 +50,8 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:autoheader cmd:gcc$secondaryArchSuffix - cmd:ld - cmd:libtoolize + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make " diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe index d8296283e..c55817b2b 100644 --- a/dev-util/indent/indent-2.2.10.recipe +++ b/dev-util/indent/indent-2.2.10.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1999-2000 Carlo Wood 1985 Sun Microsystems, Inc. 1998-2000 The Santa Cruz Operation" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="http://mirror.keystealth.org/gnu/indent/indent-2.2.10.tar.gz" CHECKSUM_SHA256="8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639" @@ -41,9 +41,9 @@ BUILD_PREREQUIRES=" cmd:autopoint cmd:autoreconf cmd:awk - cmd:gcc - cmd:ld - cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:find " diff --git a/games-strategy/lgeneral/lgeneral-1.3.1.recipe b/games-strategy/lgeneral/lgeneral-1.3.1.recipe index 6adb7dde7..f73d98958 100644 --- a/games-strategy/lgeneral/lgeneral-1.3.1.recipe +++ b/games-strategy/lgeneral/lgeneral-1.3.1.recipe @@ -8,7 +8,7 @@ tactical and strategic depth of the game." HOMEPAGE="http://lgames.sourceforge.net/" COPYRIGHT="2000-2015 Michael Speck, Leo Savernik, Peter Ivanyi" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://downloads.sf.net/lgeneral/lgeneral-$portVersion.tar.gz" CHECKSUM_SHA256="6e95a84d7772f0bd2d64edac8c2aa45c6f750ae47bfb9dc203fe53a089e5562c" SOURCE_URI_2="http://downloads.sf.net/lgeneral/pg-data.tar.gz" @@ -48,7 +48,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix " diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe index 80816afde..bc441eaa7 100644 --- a/haiku-apps/paladin/paladin-git.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -20,9 +20,9 @@ Paladin's feature set includes: - 1-click project backups" HOMEPAGE="http://github.com/HaikuArchives/Paladin" COPYRIGHT="2001-2010 DarkWyrm - 2014 John Scipione" + 2014 John Scipione" LICENSE="MIT" -REVISION="7" +REVISION="8" commit="5c0071b352eee23a83243fdaa3cbee85c615c441" SOURCE_URI="https://github.com/HaikuArchives/Paladin/archive/$commit.tar.gz" CHECKSUM_SHA256="8ac9ca54be8f970ce1a191090f3a1fe94ad04be51810d977fa9d0f77da796d0e" @@ -32,9 +32,9 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - paladin = $portVersion - app:Paladin - app:SymbolFinder + paladin$secondaryArchSuffix = $portVersion + app:Paladin$secondaryArchSuffix + app:SymbolFinder$secondaryArchSuffix cmd:luagrep cmd:luare " @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:find - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make makefile_engine " diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe index be73d94cd..e5b1cf099 100644 --- a/sys-devel/libtool/libtool-2.4.2.recipe +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -5,7 +5,7 @@ UNIX architectures to build shared libraries in a generic fashion." HOMEPAGE="http://www.gnu.org/software/libtool" COPYRIGHT="2004-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz" CHECKSUM_SHA256="b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" PATCHES="2.4.2/adjust_config_for_packaging.patch @@ -48,7 +48,7 @@ BUILD_PREREQUIRES=" cmd:autoheader >= 2.62 cmd:find cmd:gcc$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:nm cmd:ranlib