diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index 1186bf2b3..0fae76959 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	bzip2 = $portVersion compat >= 1
diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe
index 4daffb8af..92e5b91d9 100644
--- a/app-arch/p7zip/p7zip-9.20.1.recipe
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -6,7 +6,7 @@ CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="p7zip-9.20.1.patch"
 
diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index 45cb4f7b2..99dff6c30 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -17,7 +17,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
 CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	tar = $portVersion compat >= 1
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
index bfdafe2e3..e82c1bb6a 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
@@ -25,7 +25,7 @@ LICENSE="
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2"
 CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES='cdrtools-3.01~a07.patch'
 
diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe
index 04fecbb0f..5e1ce9305 100644
--- a/app-doc/doxygen/doxygen-1.6.3.recipe
+++ b/app-doc/doxygen/doxygen-1.6.3.recipe
@@ -12,7 +12,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz"
 CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="doxygen-1.6.3.patch"
 
diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe
index a2f233175..24cf3f294 100644
--- a/app-editors/nano/nano-2.2.6.recipe
+++ b/app-editors/nano/nano-2.2.6.recipe
@@ -6,7 +6,7 @@ CHECKSUM_MD5="03233ae480689a008eb98feb1b599807"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1999-2010 Free Software Foundation, Inc. "
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="nano-2.2.6.patchset"
 
diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe
index d3066f507..935af6b3e 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="1997-2006 Easy Software Products"
 SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2"
 CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="htmldoc-1.8.27.patchset"
 
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index b55724fca..83609ed8e 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -21,7 +21,7 @@ LICENSE="GNU GPL v1
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
 CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	perl = $portVersion compat >= 5
diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe
index 0b4739121..19d375342 100644
--- a/dev-lang/python/python-2.6.8.recipe
+++ b/dev-lang/python/python-2.6.8.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="1990-2012, Python Software Foundation"
 SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2"
 CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="python-2.6.8.patch"
 
diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe
index 3dec155ef..b44093f65 100644
--- a/dev-lang/yasm/yasm-1.2.0.recipe
+++ b/dev-lang/yasm/yasm-1.2.0.recipe
@@ -11,7 +11,7 @@ LICENSE="
 	"
 COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers."
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	yasm = $portVersion compat >= 1
diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe
index 23dff7339..7310c88a8 100644
--- a/dev-libs/apr/apr-1.4.6.recipe
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
 CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="apr-1.4.6.patch"
 
diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe
index ba725ed9b..33bf4b8f5 100644
--- a/dev-libs/apr_util/apr_util-1.4.1.recipe
+++ b/dev-libs/apr_util/apr_util-1.4.1.recipe
@@ -5,7 +5,7 @@ LICENSE="Apache v2"
 COPYRIGHT="2011 The Apache Software Foundation."
 CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="apr_util-1.4.1.patch"
 
diff --git a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
index 464eb0158..a14227833 100644
--- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
+++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://www.thrysoee.dk/editline/"
 SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
 CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="libedit-2012_06_01_3.0.patch"
 
diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe
index 007a2ed07..f630dd2bd 100644
--- a/dev-libs/libpcre/libpcre-8.21.recipe
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -16,7 +16,7 @@ COPYRIGHT="
 SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2"
 CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpcre = $portVersion
diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe
index b1fd066ab..dfd7ac790 100644
--- a/dev-util/cmake/cmake-2.8.5.recipe
+++ b/dev-util/cmake/cmake-2.8.5.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."
 SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz"
 CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="cmake-2.8.5.patchset"
 
diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe
index b526f714f..da85ba2e9 100644
--- a/dev-util/ctags/ctags-5.8.recipe
+++ b/dev-util/ctags/ctags-5.8.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz"
 CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	ctags = $portVersion compat >= 5.8
diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe
index 0e96a667d..64c6a56d3 100644
--- a/dev-util/gperf/gperf-3.0.4.recipe
+++ b/dev-util/gperf/gperf-3.0.4.recipe
@@ -10,7 +10,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz"
 CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="gperf-3.0.4.patch"
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
index 0801a1019..d6ac46106 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="1998, 2001-2006 Red Hat Inc."
 SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
 CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="pkgconfig-0.27.1.patchset"
 
diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe
index 75e48e55e..a3a232cd9 100644
--- a/dev-util/scons/scons-2.2.0.recipe
+++ b/dev-util/scons/scons-2.2.0.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2001-2012 The SCons Foundation"
 SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz"
 CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="scons-2.2.0.patchset"
 
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index ea07e8410..9dcbefc8f 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -18,7 +18,7 @@ LICENSE="GNU GPL v1
 SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
 CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="cvs-1.12.13.1.patch"
 
diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe
index 31e03ddab..10a0c5de3 100644
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -26,7 +26,7 @@ CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a"
 
 REVISION="1"
 
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 
 PROVIDES="
diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
index fb3d5d474..3ce80e9ee 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
 CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="mercurial-2.2.2.patch"
 
diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe
index 8ee1c0d1c..1d1847c13 100644
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="2010 The Apache Software Foundation"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
 CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="subversion-1.6.18.patch"
 
diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
index dfdf309e4..7c3e64e4b 100644
--- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
+++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="
 	2000-2010 Michael Pfeiffer"
 LICENSE="GNU GPL v2"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	bepdf = $portVersion
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
index 9f79f7359..cc94368f6 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="1999-2003 Stas Maximov"
 LICENSE="BSD (4-clause)"
 SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	keymapswitcher = $portVersion compat >= 1.2.7
diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe
index 74bf188c5..e856b0f0a 100644
--- a/haiku-apps/mkdepend/mkdepend-1.7.recipe
+++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved"
 SRC_URI="source/mkdepend-1.7.zip"
 CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	mkdepend = $portVersion
diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe
index 02b7c1e90..4c2f4bc06 100644
--- a/haiku-apps/pe/pe-2.4.3_hg602.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="
 	"
 SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="pe-2.4.3_hg602.patch"
 
diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe
index d8cd6b814..3791624ca 100644
--- a/haiku-apps/vision/vision-0.9.7.r944.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r944.recipe
@@ -5,7 +5,7 @@ SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#944"
 LICENSE="MPL v1.1"
 COPYRIGHT="1999-2010 The Vision Team"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 if [ $targetArchitecture != x86_gcc2 ]; then
 	PATCHES="vision-0.9.7-gcc4.patch"
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index dfe5a49d9..57b9b6e08 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -23,7 +23,7 @@ COPYRIGHT="1999-2011 Joe Orton"
 SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
 CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="neon-0.29.6.patch"
 
diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index a44a5f055..b128a0192 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2005-2012 Tatu Ylonen et al."
 SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz"
 CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="openssh-6.0p1.patch"
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
index e72116606..12fdaf31b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
@@ -9,7 +9,7 @@ LICENSE="
 	"
 COPYRIGHT="2003-2012 Jouni Malinen"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="wpa_supplicant-2.0.patch"
 
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index 17d2ef7ae..0b1fe50e5 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/coreutils"
 SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2"
 CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	gawk = $portVersion compat >= 3
diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe
index c8d88c150..a526b0f72 100644
--- a/sys-apps/grep/grep-2.14.recipe
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -9,7 +9,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3"
 #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz"
 #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="grep-2.14-gcc2.patch"
 
diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe
index 201c3df44..7166ba58e 100644
--- a/sys-apps/groff/groff-1.20.1.recipe
+++ b/sys-apps/groff/groff-1.20.1.recipe
@@ -6,7 +6,7 @@ CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2003-2009 Free Software Foundation, Inc."
 REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	groff = $portVersion compat >= 1.20
diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index daf2ca373..1809240b1 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -6,7 +6,7 @@ CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1989-2012 Free Software Foundation, Inc."
 REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="man-1.6g.patch"
 
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index 61ea22987..503a9dc89 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -15,7 +15,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz"
 CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	sed = $portVersion compat >= 4
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index 4d65ccff8..ca7fac936 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz"
 CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	texinfo = $portVersion compat >= 4.13
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index 0ee7aab9f..076837328 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -14,7 +14,7 @@ LICENSE="
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
 CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	autoconf = $portVersion compat >= 2.60
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index f8f2c7d90..83cb33e6f 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -11,7 +11,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
 CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.13
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index 939ccb9a8..d84c01167 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -17,7 +17,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz"
 CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	bison = $portVersion compat >= 2.4
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 4e919bc1c..353397c89 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -9,7 +9,7 @@ LICENSE="Flex"
 SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
 CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	flex = $portVersion compat >= 2.5
diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe
index ef31f6267..00d374bcc 100644
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -23,7 +23,7 @@ SRC_URI="
 	git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462
 	"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	jam = $portVersion
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index a35085da5..f7fde1503 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -9,7 +9,7 @@ LICENSE="GNU GPL v2"
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz"
 CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
 REVISION="8"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="
 	2.4/adjust_config_for_packaging.patch
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index 2e748b82f..390f3b74d 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -22,7 +22,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
 CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	m4 = $portVersion compat >= 1.4
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index d6bb87584..66237e93c 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -15,7 +15,7 @@ COPYRIGHT="1988-2010 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
 CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	make = $portVersion compat >= 3.82
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index ba26d751e..86e896233 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -8,7 +8,7 @@ LICENSE="GNU GPL v3"
 SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz"
 CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="readline-6.2.patch"