diff --git a/app-benchmarks/ltp/ltp-20140422.recipe b/app-benchmarks/ltp/ltp-20140422.recipe
index ab0b948e9..bc47bc62f 100644
--- a/app-benchmarks/ltp/ltp-20140422.recipe
+++ b/app-benchmarks/ltp/ltp-20140422.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="2002-2004 Intel Corporation
 	2004 QUALCOMM Inc.
 	2004-2005 Bull S.A."
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/linux-test-project/ltp/archive/20140422.tar.gz"
 CHECKSUM_SHA256="0356ba208813efb3d9be6a530a9b56688281b6ac9d80ba901920ec07cf250f2e"
 
@@ -18,7 +18,7 @@ ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	ltp = $portVersion
+	ltp$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe
index 2b799a696..51ee088ff 100644
--- a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe
+++ b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe
@@ -4,7 +4,7 @@ view, with location search"
 HOMEPAGE="https://github.com/mgermain-genymobile/GoogleMapQtWidget/"
 COPYRIGHT="2013 Morgan Germain"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 srcGitRev="3fefbef368430deda7bd26e2a875cca3db2126ce"
 SOURCE_URI="https://github.com/mgermain-genymobile/GoogleMapQtWidget/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="db4cf6b5c725ade4e8177af9288e7173c43a9e37b4429e0d06dd15f72c06fedf"
@@ -15,7 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	googlemaps_mini = $portVersion
+	googlemaps_mini$secondaryArchSuffix = $portVersion
 	app:googlemaps_mini = $portVersion
 	"
 REQUIRES="
diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.7.0.recipe
index 9b99243d2..87520f55f 100644
--- a/app-text/tree/tree-1.7.0.recipe
+++ b/app-text/tree/tree-1.7.0.recipe
@@ -4,7 +4,7 @@ of files."
 HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
 COPYRIGHT="1996-2011 Steve Baker"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://mama.indstate.edu/users/ice/tree/src/tree-$portVersion.tgz"
 CHECKSUM_SHA256="6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12"
 PATCHES="tree-1.7.0.patchset"
@@ -13,7 +13,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
-	tree = $portVersion
+	tree$secondaryArchSuffix = $portVersion
 	cmd:tree$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
diff --git a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
index 6427042ab..f8a1b5e66 100644
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
@@ -14,7 +14,7 @@ that to check for updates."
 HOMEPAGE="http://dfu-programmer.sourceforge.net"
 COPYRIGHT="Weston Schmidt"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/$portVersion/dfu-programmer-$portVersion.tar.gz"
 CHECKSUM_SHA256="0120966a424dd98124962055750e90cbd6c7b6b0fbf5b187bf435daa0a24af65"
 SOURCE_DIR="dfu-programmer-$portVersion"
@@ -24,7 +24,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	dfu_programmer = $portVersion
+	dfu_programmer$secondaryArchSuffix = $portVersion
 	cmd:dfu_programmer$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
diff --git a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
index 2ba8f7f93..4f9a67dfd 100644
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="https://github.com/utzig/lm4tools"
 COPYRIGHT="2012 Fabio Utzig
 	2012 Peter Stuge"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/utzig/lm4tools/archive/1cfd813779b9eb717b15b0a1814bde8338899ff9.tar.gz"
 CHECKSUM_SHA256="cd28b701384f00affe6aad2f3addcd54ca167737004c4f8926304627816c42d6"
 SOURCE_DIR="lm4tools-1cfd813779b9eb717b15b0a1814bde8338899ff9"
@@ -15,7 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	lm4tools = $portVersion
+	lm4tools$secondaryArchSuffix = $portVersion
 	cmd:lm4flash$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
index 8471cbfb7..7419ac54d 100644
--- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
+++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
@@ -24,7 +24,7 @@ ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
-	gnu_classpath = $portVersion
+	gnu_classpath$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index 369a17b11..ac5b344c9 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -20,7 +20,7 @@ ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libevent${secondaryArchSuffix} = ${portVersion}
+	libevent$secondaryArchSuffix = $portVersion
 	cmd:event_rpcgen.py
 	lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
 	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
@@ -34,6 +34,7 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
+	libevent${secondaryArchSuffix}_devel = $portVersion
 	cmd:event_rpcgen.py
 	devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
 	devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
diff --git a/dev-qt/qsseditor/qsseditor-0.5.6.recipe b/dev-qt/qsseditor/qsseditor-0.5.6.recipe
index 922259791..5f1701295 100644
--- a/dev-qt/qsseditor/qsseditor-0.5.6.recipe
+++ b/dev-qt/qsseditor/qsseditor-0.5.6.recipe
@@ -9,7 +9,7 @@ Features:
 HOMEPAGE="https://sourceforge.net/projects/qsseditor/"
 COPYRIGHT="2014 Dmitry Baryshe"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://sourceforge.net/projects/qsseditor/files/sources/qsseditor-$portVersion.zip"
 CHECKSUM_SHA256="3923b9e783957bc3485ef0bb67d78027d3eb586ee4acc5f99efbeb65ffc38998"
 
@@ -17,7 +17,7 @@ ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	qsseditor = $portVersion
+	qsseditor$secondaryArchSuffix = $portVersion
 	app:QssEditor = $portVersion
 	"
 REQUIRES="
diff --git a/dev-util/indent/indent-2.2.11.recipe b/dev-util/indent/indent-2.2.11.recipe
index bbeaf1fa7..9f736d5eb 100644
--- a/dev-util/indent/indent-2.2.11.recipe
+++ b/dev-util/indent/indent-2.2.11.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="1"
+REVISION="2"
 SOURCE_URI="http://ftp.de.debian.org/debian/pool/main/i/indent/indent_$portVersion.orig.tar.gz"
 CHECKSUM_SHA256="aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893"
 
@@ -20,7 +20,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	indent = $portVersion
+	indent$secondaryArchSuffix = $portVersion
 	cmd:indent$secondaryArchSuffix = $portVersion
 	cmd:texinfo2man$secondaryArchSuffix = $portVersion
 	"
diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
index debe56049..9a059bb77 100644
--- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
+++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
@@ -17,7 +17,7 @@ ARCHITECTURES="?x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
-	posixtestsuite = $portVersion
+	posixtestsuite$secondaryArchSuffix = $portVersion
 	"
 
 BUILD_REQUIRES="
diff --git a/dev-util/premake/premake-4.4.beta5.recipe b/dev-util/premake/premake-4.4.beta5.recipe
index ebb9c6e84..6de594d14 100644
--- a/dev-util/premake/premake-4.4.beta5.recipe
+++ b/dev-util/premake/premake-4.4.beta5.recipe
@@ -6,7 +6,7 @@ support both IDE-addicted Windows coders and Linux command-line junkies!"
 HOMEPAGE="http://industriousone.com/premake"
 COPYRIGHT="2012 Industrious One, LLC"
 LICENSE="BSD (2-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/premake/files/Premake/4.4/premake-4.4-beta5-src.zip"
 CHECKSUM_SHA256="0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161"
 SOURCE_DIR="premake-4.4-beta5"
@@ -15,8 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	premake
-	premake4$secondaryArchSuffix = $portVersion
+	premake$secondaryArchSuffix = $portVersion
 	cmd:premake4$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907.recipe b/games-arcade/opentyrian/opentyrian-2.1.20130907.recipe
index 24bad2f5a..aa83c3c33 100644
--- a/games-arcade/opentyrian/opentyrian-2.1.20130907.recipe
+++ b/games-arcade/opentyrian/opentyrian-2.1.20130907.recipe
@@ -8,7 +8,7 @@ free availability of his Tyrian artwork under generic liberal terms."
 HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/"
 COPYRIGHT="OpenTyrian Team"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.camanis.net/opentyrian/releases/opentyrian-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
 SOURCE_DIR="opentyrian-$portVersion"
@@ -18,7 +18,7 @@ ARCHITECTURES="!x86_gcc2 ?x86_64 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	opentyrian = $portVersion
+	opentyrian$secondaryArchSuffix = $portVersion
 	app:OpenTyrian
 	"
 REQUIRES="
diff --git a/games-arcade/opentyrian_data/opentyrian_data-21.recipe b/games-arcade/opentyrian_data/opentyrian_data-21.recipe
index ae1ba10db..c031e71cf 100644
--- a/games-arcade/opentyrian_data/opentyrian_data-21.recipe
+++ b/games-arcade/opentyrian_data/opentyrian_data-21.recipe
@@ -19,16 +19,6 @@ DISABLE_SOURCE_PACKAGE=yes
 PROVIDES="
 	opentyrian_data = $portVersion
 	"
-#REQUIRES="
-#	"
-#BUILD_REQUIRES="
-#	"
-#BUILD_PREREQUIRES="
-#	"
-BUILD()
-{
-	true
-}
 
 INSTALL()
 {
diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
index 7cde0efa4..cfbba0ea9 100644
--- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
+++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
@@ -13,7 +13,7 @@ skills and the details of the game."
 HOMEPAGE="http://www.stuff-o-matic.com/plee-the-bear/"
 COPYRIGHT="2012 Stuff O Matic"
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=source"
 CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e"
 SOURCE_FILENAME="plee-the-bear-0.7.0.tgz"
@@ -24,7 +24,7 @@ ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
-	plee_the_bear = $portVersion
+	plee_the_bear$secondaryArchSuffix = $portVersion
 	cmd:plee_the_bear$secondaryArchSuffix = $portVersion
 	lib:libbear_audio$secondaryArchSuffix
 	lib:libbear_communication$secondaryArchSuffix
diff --git a/games-strategy/netpanzer/netpanzer-0.8.6.recipe b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
index 39785ac73..ea566cbac 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.6.recipe
+++ b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.netpanzer.info/"
 COPYRIGHT="1999 Pyrosoft
 	2007-2015 NetPanzer developers"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="svn://svn.code.sf.net/p/netpanzerfp/code/trunk/netpanzer#1450"
 PATCHES="netpanzer-$portVersion.patchset"
 
@@ -24,7 +24,7 @@ ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	netpanzer = $portVersion
+	netpanzer$secondaryArchSuffix = $portVersion
 	cmd:netpanzer$secondaryArchSuffix
 	"
 REQUIRES="
diff --git a/games-strategy/openxcom/openxcom-1.0.recipe b/games-strategy/openxcom/openxcom-1.0.recipe
index 1a088e161..682839374 100644
--- a/games-strategy/openxcom/openxcom-1.0.recipe
+++ b/games-strategy/openxcom/openxcom-1.0.recipe
@@ -7,7 +7,7 @@ community."
 HOMEPAGE="https://openxcom.org/"
 COPYRIGHT="2010-2014 OpenXcom Developers"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/SupSuper/OpenXcom/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="45acb280010a01d60506b1c5f2951ae501c012cc6161aac470bd15c1e6981246"
 SOURCE_FILENAME="OpenXcom-$portVersion.tar.gz"
@@ -23,7 +23,7 @@ GLOBAL_WRITABLE_FILES="
 	"
 
 PROVIDES="
-	openxcom = $portVersion
+	openxcom$secondaryArchSuffix = $portVersion
 	app:OpenXcom
 	"
 REQUIRES="
diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe
index c90e13f25..1544962ad 100644
--- a/haiku-apps/armyknife/armyknife-4.3.0.recipe
+++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe
@@ -7,7 +7,7 @@ Now also with support for cover art!"
 HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife"
 COPYRIGHT="2000-2001 Jason Burgess"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
 srcGitRev="49f9a12cf288b061449edf5049e5de6a6501093c"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="e223d01114256e1e57291fdb8cd22eb3c5c1e034a41971d7a283433c6344d786"
@@ -18,7 +18,7 @@ ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
-	armyknife = $portVersion
+	armyknife$secondaryArchSuffix = $portVersion
 	app:ArmyKnife = $portVersion
 	"
 REQUIRES="
diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe
index c88146e99..5ee6c181e 100644
--- a/haiku-apps/beget/beget-1.2.3.recipe
+++ b/haiku-apps/beget/beget-1.2.3.recipe
@@ -5,7 +5,7 @@ By default, your downloaded files are saved to /boot/home/Downloads."
 HOMEPAGE="https://github.com/HaikuArchives/BeGet"
 COPYRIGHT="1999-2001 Atsushi Takamatsu"
 LICENSE="GNU GPL v2"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="https://github.com/HaikuArchives/BeGet/archive/a170b0e6860c76599ab202a1532088cfcec447ad.tar.gz"
 CHECKSUM_SHA256="518a1be0dee7cc730db948205fb013034efe1a9e7edb6708f1c8024cc6b08c53"
 SOURCE_DIR="BeGet-a170b0e6860c76599ab202a1532088cfcec447ad"
@@ -19,7 +19,7 @@ USER_SETTINGS_FILES="
 	"
 
 PROVIDES="
-	beget = $portVersion
+	beget$secondaryArchSuffix = $portVersion
 	app:BeGet = $portVersion
 	"
 REQUIRES="
diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
index 5296ebeca..ed91f19c7 100644
--- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -5,7 +5,7 @@ Makefiles, Ninja etc."
 HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku"
 COPYRIGHT="2012-2013 Adrián Arroyo Calle"
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="3"
 srcGitRev="a42d55b93d8d7c1e3b19a31f4ee85f63441c4975"
 SOURCE_URI="https://github.com/AdrianArroyoCalle/cmake-haiku/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="79839f164f0d1655369d5252cf31bdff14282312352c13db037bbdd6d8e68ee6"
@@ -15,7 +15,7 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
-	cmake_haiku = $portVersion
+	cmake_haiku$secondaryArchSuffix = $portVersion
 	app:CmakeHaiku = $portVersion
 	"
 REQUIRES="
diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe
index 5e6bae847..ccb95dbf5 100644
--- a/haiku-apps/masterpiece/masterpiece-r742.recipe
+++ b/haiku-apps/masterpiece/masterpiece-r742.recipe
@@ -10,7 +10,7 @@ and preview/publish their book."
 HOMEPAGE="http://code.google.com/p/masterpiece/"
 COPYRIGHT="2010-2012 Pasquale J. Rinaldi, Jr."
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="svn+http://masterpiece.googlecode.com/svn/trunk#r742"
 PATCHES="masterpiece-r742.patch"
 
@@ -18,7 +18,7 @@ ARCHITECTURES="x86_gcc2 !x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
-	masterpiece = $portVersion
+	masterpiece$secondaryArchSuffix = $portVersion
 	app:MasterPiece = $portVersion
 	"
 REQUIRES="
diff --git a/haiku-apps/pecorename/pecorename-1.5.recipe b/haiku-apps/pecorename/pecorename-1.5.recipe
index 30366725b..37d612dbe 100644
--- a/haiku-apps/pecorename/pecorename-1.5.recipe
+++ b/haiku-apps/pecorename/pecorename-1.5.recipe
@@ -21,7 +21,7 @@ program!"
 HOMEPAGE="http://www.maybe.de/software/pecorename"
 COPYRIGHT="2008 Werner Freytag"
 LICENSE="MIT"
-REVISION="5"
+REVISION="6"
 srcGitRev="9b3ceb76a73881ad821b2b9535e4ad258b486c45"
 SOURCE_URI="https://github.com/HaikuArchives/PecoRename/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="52228295d058a7348a3ff9385bcf0f3dc058da10853538aa27eca0c1619b9f20"
@@ -31,7 +31,7 @@ ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
-	pecorename = $portVersion
+	pecorename$secondaryArchSuffix = $portVersion
 	app:PecoRename = $portVersion
 	"
 REQUIRES="
diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe
index d561b4016..e8dafb180 100644
--- a/media-libs/bpg/bpg-0.9.4.recipe
+++ b/media-libs/bpg/bpg-0.9.4.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="https://bellard.org/bpg/"
 COPYRIGHT="2014 Fabrice Bellard"
 LICENSE="MIT
 	GNU LGPL v2.1"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://bellard.org/bpg/libbpg-0.9.4.tar.gz"
 CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2a"
 SOURCE_DIR="libbpg-$portVersion"
@@ -15,7 +15,7 @@ ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	bpg = $portVersion
+	bpg$secondaryArchSuffix = $portVersion
 	cmd:bpgdec$secondaryArchSuffix
 	cmd:bpgenc$secondaryArchSuffix
 	"
diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe
index a3dc4639e..cefc4ce67 100644
--- a/media-libs/libcoverart/libcoverart-1.0.0.recipe
+++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe
@@ -14,7 +14,7 @@ ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
-	libcoverart = $portVersion
+	libcoverart$secondaryArchSuffix = $portVersion
 	lib:libcoverart$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
diff --git a/net-proxy/torsocks/torsocks-1.2.recipe b/net-proxy/torsocks/torsocks-1.2.recipe
index a48ac69db..fded5067a 100644
--- a/net-proxy/torsocks/torsocks-1.2.recipe
+++ b/net-proxy/torsocks/torsocks-1.2.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="
 	2004 Tomasz Kojm
 	"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://torsocks.googlecode.com/files/torsocks-1.2.tar.gz"
 CHECKSUM_SHA256="bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4"
 PATCHES="torsocks-1.2.patch"
@@ -26,7 +26,7 @@ GLOBAL_WRITABLE_FILES="
 	"
 
 PROVIDES="
-	torsocks = $portVersion
+	torsocks$secondaryArchSuffix = $portVersion
 	cmd:torsocks$secondaryArchSuffix
 	cmd:usewithtor$secondaryArchSuffix
 	lib:libtorsocks$secondaryArchSuffix
diff --git a/sys-apps/help2man/help2man-1.47.5.recipe b/sys-apps/help2man/help2man-1.47.5.recipe
index df81716b1..df9c127b3 100644
--- a/sys-apps/help2man/help2man-1.47.5.recipe
+++ b/sys-apps/help2man/help2man-1.47.5.recipe
@@ -14,24 +14,23 @@ SOURCE_URI="http://ftpmirror.gnu.org/help2man/help2man-$portVersion.tar.xz"
 CHECKSUM_SHA256="7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	help2man = $portVersion
-	cmd:help2man$secondaryArchSuffix = $portVersion
+	cmd:help2man = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	cmd:perl
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:gcc
+	cmd:ld
 	cmd:make
 	cmd:perl
 	"
diff --git a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
index c90b60d0e..1cd8785be 100644
--- a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
+++ b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
@@ -14,7 +14,7 @@ mount -t userlandfs -o 'sshfs user@server:./ -o password_stdin' /mnt"
 HOMEPAGE="https://github.com/libfuse/sshfs/"
 COPYRIGHT="2004-2012 Miklos Seredi"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/libfuse/sshfs/releases/download/sshfs_2_5/sshfs-fuse-2.5.tar.gz"
 CHECKSUM_SHA256="e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e"
 SOURCE_DIR="sshfs-fuse-$portVersion"
@@ -24,7 +24,7 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	sshfs_fuse = $portVersion
+	sshfs_fuse$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	userland_fs
diff --git a/sys-libs/tinygl/tinygl-0.4.recipe b/sys-libs/tinygl/tinygl-0.4.recipe
index 31edd1db0..01348ab7a 100644
--- a/sys-libs/tinygl/tinygl-0.4.recipe
+++ b/sys-libs/tinygl/tinygl-0.4.recipe
@@ -40,7 +40,6 @@ SOURCE_DIR="TinyGL"
 PATCHES="tinygl-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES=""
 
 PROVIDES="
 	tinygl = $portVersion
diff --git a/www-servers/robinhood/robinhood-1.2.recipe b/www-servers/robinhood/robinhood-1.2.recipe
index e6ba3e9ae..7020b73c4 100644
--- a/www-servers/robinhood/robinhood-1.2.recipe
+++ b/www-servers/robinhood/robinhood-1.2.recipe
@@ -12,7 +12,6 @@ CHECKSUM_SHA256="37e297cf2c73907ec7694fa697c7ac765f6c068aac2effc24e4b89a7e770c55
 SOURCE_DIR="RobinHood-a1a81cddf007bd81d53c3b9d5fc23197c0da554d"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	robinhood = $portVersion
@@ -22,17 +21,17 @@ PROVIDES="
 	cmd:rhlog = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	libhttp$secondaryArchSuffix
+	haiku
+	libhttp
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	libhttp${secondaryArchSuffix}_devel
+	haiku_devel
+	libhttp_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
 	"