diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe
index 67f44ec87..4cd815173 100644
--- a/app-accessibility/espeak/espeak-1.48.04.recipe
+++ b/app-accessibility/espeak/espeak-1.48.04.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	devel:libespeak = 1.1.4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/app-admin/keepassx/keepassx-2.0a5.recipe b/app-admin/keepassx/keepassx-2.0a5.recipe
index f033585f2..9cebda6a5 100644
--- a/app-admin/keepassx/keepassx-2.0a5.recipe
+++ b/app-admin/keepassx/keepassx-2.0a5.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgcrypt
 	lib:libQtCore
 	lib:libQtGui
@@ -43,7 +43,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz
 	devel:libgcrypt
 	devel:libQtCore
diff --git a/app-admin/keepassx/keepassx-2.0a6.recipe b/app-admin/keepassx/keepassx-2.0a6.recipe
index 0f32ce326..2d64448c3 100644
--- a/app-admin/keepassx/keepassx-2.0a6.recipe
+++ b/app-admin/keepassx/keepassx-2.0a6.recipe
@@ -36,7 +36,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgcrypt
 	lib:libQtCore
 	lib:libQtGui
@@ -44,7 +44,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz
 	devel:libgcrypt
 	devel:libgpg_error
diff --git a/app-admin/pwgen/pwgen-2.06.recipe b/app-admin/pwgen/pwgen-2.06.recipe
index f17975be6..28c768ad8 100644
--- a/app-admin/pwgen/pwgen-2.06.recipe
+++ b/app-admin/pwgen/pwgen-2.06.recipe
@@ -33,11 +33,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-admin/testdisk/testdisk-7.0_git.recipe b/app-admin/testdisk/testdisk-7.0_git.recipe
index c9bdb4836..2f5e1b8da 100644
--- a/app-admin/testdisk/testdisk-7.0_git.recipe
+++ b/app-admin/testdisk/testdisk-7.0_git.recipe
@@ -46,7 +46,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libjpeg
 	lib:libncurses
@@ -55,7 +55,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libiconv
 	devel:libjpeg
 	devel:libncurses
diff --git a/app-arch/arc/arc-5.21p.recipe b/app-arch/arc/arc-5.21p.recipe
index ec7f29b62..3232278b0 100644
--- a/app-arch/arc/arc-5.21p.recipe
+++ b/app-arch/arc/arc-5.21p.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_REQUIRES="
diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index b6b8b6462..84a7aa805 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -37,12 +37,12 @@ PROVIDES="$PROVIDES
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:ar
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe
index 0c6466083..228ccb467 100644
--- a/app-arch/cabextract/cabextract-1.4.recipe
+++ b/app-arch/cabextract/cabextract-1.4.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-arch/cpio/cpio-2.11.recipe b/app-arch/cpio/cpio-2.11.recipe
index cdcf15414..c95fdb0ab 100644
--- a/app-arch/cpio/cpio-2.11.recipe
+++ b/app-arch/cpio/cpio-2.11.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_REQUIRES="
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
diff --git a/app-arch/fastjar/fastjar-0.98.recipe b/app-arch/fastjar/fastjar-0.98.recipe
index 3ed7d949d..4ae625219 100644
--- a/app-arch/fastjar/fastjar-0.98.recipe
+++ b/app-arch/fastjar/fastjar-0.98.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz
 	"
 
diff --git a/app-arch/gzip/gzip-1.6.recipe b/app-arch/gzip/gzip-1.6.recipe
index 8e1ee5898..4c4bfffab 100644
--- a/app-arch/gzip/gzip-1.6.recipe
+++ b/app-arch/gzip/gzip-1.6.recipe
@@ -33,11 +33,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/app-arch/ha/ha-0999.recipe b/app-arch/ha/ha-0999.recipe
index 0b7d0d31e..442d7116f 100644
--- a/app-arch/ha/ha-0999.recipe
+++ b/app-arch/ha/ha-0999.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe
index a2191e31d..a9cc20ebf 100644
--- a/app-arch/lha/lha-1.14i.recipe
+++ b/app-arch/lha/lha-1.14i.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libiconv
 	"
 
diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe
index 1e2e9d781..ed2231bed 100644
--- a/app-arch/libarchive/libarchive-3.1.2.recipe
+++ b/app-arch/libarchive/libarchive-3.1.2.recipe
@@ -52,7 +52,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -71,7 +71,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
diff --git a/app-arch/lz4/lz4-r117.recipe b/app-arch/lz4/lz4-r117.recipe
index d515d5dac..2c3d03ed7 100644
--- a/app-arch/lz4/lz4-r117.recipe
+++ b/app-arch/lz4/lz4-r117.recipe
@@ -31,10 +31,10 @@ PROVIDES="$PROVIDES
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:ar
diff --git a/app-arch/lzip/lzip-1.16.recipe b/app-arch/lzip/lzip-1.16.recipe
index 6955f6a8c..78060e421 100644
--- a/app-arch/lzip/lzip-1.16.recipe
+++ b/app-arch/lzip/lzip-1.16.recipe
@@ -53,13 +53,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-arch/ncompress/ncompress-4.2.4.4.recipe b/app-arch/ncompress/ncompress-4.2.4.4.recipe
index 7fb17a28d..0c3815ef2 100644
--- a/app-arch/ncompress/ncompress-4.2.4.4.recipe
+++ b/app-arch/ncompress/ncompress-4.2.4.4.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:cpio
 	cmd:find
diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe
index de8bdead4..d30f5473b 100644
--- a/app-arch/p7zip/p7zip-9.13.recipe
+++ b/app-arch/p7zip/p7zip-9.13.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	cmd:7za = $portVersion compat >= 9
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe
index b612f3456..8cb19d55b 100644
--- a/app-arch/p7zip/p7zip-9.20.1.recipe
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -20,12 +20,12 @@ PROVIDES="
 	cmd:7za = $portVersion compat >= 9
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-arch/pigz/pigz-2.3.1.recipe b/app-arch/pigz/pigz-2.3.1.recipe
index a4bbb2611..558f84bdb 100644
--- a/app-arch/pigz/pigz-2.3.1.recipe
+++ b/app-arch/pigz/pigz-2.3.1.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz
 	"
 
diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe
index 62e5a4d99..ccefcdd8b 100644
--- a/app-arch/sharutils/sharutils-4.14.recipe
+++ b/app-arch/sharutils/sharutils-4.14.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-arch/snappy/snappy-1.1.2.recipe b/app-arch/snappy/snappy-1.1.2.recipe
index f5ceb7d84..9c835c1fd 100644
--- a/app-arch/snappy/snappy-1.1.2.recipe
+++ b/app-arch/snappy/snappy-1.1.2.recipe
@@ -28,12 +28,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index d5b53a11f..e68193336 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	cmd:tar = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:automake
 	cmd:autoreconf
 	cmd:gcc
diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe
index 49f1036d3..cf4e8b4bb 100644
--- a/app-arch/tar/tar-1.27.1.recipe
+++ b/app-arch/tar/tar-1.27.1.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	cmd:tar = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:automake
 	cmd:autoreconf
 	cmd:gcc
diff --git a/app-arch/unrar/unrar-5.0.14.recipe b/app-arch/unrar/unrar-5.0.14.recipe
index 0b5d2ea72..bc33fb981 100644
--- a/app-arch/unrar/unrar-5.0.14.recipe
+++ b/app-arch/unrar/unrar-5.0.14.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:g++
 	"
diff --git a/app-arch/unrar/unrar-5.1.5.recipe b/app-arch/unrar/unrar-5.1.5.recipe
index 09777cfb2..00064427d 100644
--- a/app-arch/unrar/unrar-5.1.5.recipe
+++ b/app-arch/unrar/unrar-5.1.5.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:g++
 	"
diff --git a/app-arch/unrar/unrar-5.1.6.recipe b/app-arch/unrar/unrar-5.1.6.recipe
index 732886ce7..559384024 100644
--- a/app-arch/unrar/unrar-5.1.6.recipe
+++ b/app-arch/unrar/unrar-5.1.6.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:g++
 	"
diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe
index fdfede7af..5e21f809c 100644
--- a/app-arch/unzip/unzip-6.0.recipe
+++ b/app-arch/unzip/unzip-6.0.recipe
@@ -15,7 +15,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/app-arch/unzip/unzip-6.10c11.recipe b/app-arch/unzip/unzip-6.10c11.recipe
index c7f8c1047..724e7b74c 100644
--- a/app-arch/unzip/unzip-6.10c11.recipe
+++ b/app-arch/unzip/unzip-6.10c11.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 "
 
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe
index 5e53622bf..325c5e40b 100644
--- a/app-arch/xar/xar-1.5.2.recipe
+++ b/app-arch/xar/xar-1.5.2.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -40,7 +40,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libxml2$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/app-arch/xz_utils/xz_utils-5.0.7.recipe b/app-arch/xz_utils/xz_utils-5.0.7.recipe
index c45c91eb3..ec402ecb7 100644
--- a/app-arch/xz_utils/xz_utils-5.0.7.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.7.recipe
@@ -60,13 +60,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
@@ -79,7 +79,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	xz_utils$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/app-arch/zip/zip-3.0.recipe b/app-arch/zip/zip-3.0.recipe
index 9680e4ed4..49dd40b9f 100644
--- a/app-arch/zip/zip-3.0.recipe
+++ b/app-arch/zip/zip-3.0.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	cmd:zipsplit = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
index 44068d926..98896e3b2 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
+++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
@@ -33,11 +33,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
index a6b9b6312..9bebc4f1f 100644
--- a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
+++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
index 84822cf58..173b9b9ee 100644
--- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
+++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -49,5 +49,5 @@ INSTALL()
 
 TEST()
 {
-	./bench > output_$haikuVersion
+	./bench > output_$(date)
 }
diff --git a/app-benchmarks/ltp/ltp-20140422.recipe b/app-benchmarks/ltp/ltp-20140422.recipe
index f57f45422..be37d5ac3 100644
--- a/app-benchmarks/ltp/ltp-20140422.recipe
+++ b/app-benchmarks/ltp/ltp-20140422.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-benchmarks/piozone/piozone-1.0.recipe b/app-benchmarks/piozone/piozone-1.0.recipe
index 8db2ca30e..3ebadc463 100644
--- a/app-benchmarks/piozone/piozone-1.0.recipe
+++ b/app-benchmarks/piozone/piozone-1.0.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-benchmarks/vttest/vttest-20140305.recipe b/app-benchmarks/vttest/vttest-20140305.recipe
index 3f0351474..f56180d47 100644
--- a/app-benchmarks/vttest/vttest-20140305.recipe
+++ b/app-benchmarks/vttest/vttest-20140305.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/app-cdr/bchunk/bchunk-1.2.0.recipe b/app-cdr/bchunk/bchunk-1.2.0.recipe
index 36515db57..b5a12b0fc 100644
--- a/app-cdr/bchunk/bchunk-1.2.0.recipe
+++ b/app-cdr/bchunk/bchunk-1.2.0.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
index e9736228d..72ac0b9c7 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
@@ -49,12 +49,12 @@ PROVIDES="
 	cmd:isoinfo = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
index 2bf1cc15a..e8089f62c 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
@@ -49,12 +49,12 @@ PROVIDES="
 	cmd:isoinfo = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
index dd38107d9..db6aeb53f 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
@@ -50,12 +50,12 @@ PROVIDES="
 	cmd:isoinfo = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a25.recipe b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe
index c608b18db..9a7631015 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a25.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe
@@ -50,12 +50,12 @@ PROVIDES="
 	cmd:isoinfo = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
index 80c5e6764..b89bde111 100644
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe
index 816b44b3d..3a4d3ceec 100644
--- a/app-crypt/gnupg/gnupg-1.4.11.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.11.recipe
@@ -23,13 +23,13 @@ PROVIDES="gnupg = $portVersion
 	cmd:gpgv = $portVersion compat >= 1.4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe
index 3d7f80f87..9186f8dde 100644
--- a/app-crypt/gnupg/gnupg-1.4.16.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.16.recipe
@@ -23,7 +23,7 @@ PROVIDES="gnupg = $portVersion
 	cmd:gpgv = $portVersion compat >= 1.4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libcurl
 	lib:libiconv
 	lib:libintl
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:bison
 	cmd:gcc
diff --git a/app-crypt/gpgme/gpgme-1.5.2.recipe b/app-crypt/gpgme/gpgme-1.5.2.recipe
index cd2b8c081..e6ed91019 100644
--- a/app-crypt/gpgme/gpgme-1.5.2.recipe
+++ b/app-crypt/gpgme/gpgme-1.5.2.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	lib:libgpgme${secondaryArchSuffix} = 11.13.1 compat >= 11
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libgpg_error${secondaryArchSuffix}
 	cmd:gpg
 	lib:libglib_2.0$secondaryArchSuffix
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
 	devel:libassuan${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:bison
diff --git a/app-dicts/aspell_en/aspell_en-7.1_0.recipe b/app-dicts/aspell_en/aspell_en-7.1_0.recipe
index 0a2adb8a6..420de1d7a 100644
--- a/app-dicts/aspell_en/aspell_en-7.1_0.recipe
+++ b/app-dicts/aspell_en/aspell_en-7.1_0.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	aspell >= 0.60
 	"
 
@@ -28,7 +28,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:prezip_bin
 	cmd:which
diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe
index eefdf0252..785467d1e 100644
--- a/app-doc/doxygen/doxygen-1.6.3.recipe
+++ b/app-doc/doxygen/doxygen-1.6.3.recipe
@@ -35,14 +35,14 @@ PROVIDES="
 	cmd:doxytag = $portVersion compat >= 1.6
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	"
 BUILD_REQUIRES="
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:bison
 	cmd:flex
 	cmd:gcc
diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe
index 6b6fb9740..eb5257d61 100644
--- a/app-editors/nano/nano-2.2.6.recipe
+++ b/app-editors/nano/nano-2.2.6.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	cmd:rnano = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:groff
 	lib:libncurses
 	"
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoreconf
 	cmd:gcc
 	cmd:groff
diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe
index 3589eb2db..22b89e2b6 100644
--- a/app-editors/qemacs/qemacs-0.3.3.recipe
+++ b/app-editors/qemacs/qemacs-0.3.3.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	cmd:html2png$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 #	lib:libavcodec$secondaryArchSuffix
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-editors/qemacs/qemacs-0.4.0dev.recipe b/app-editors/qemacs/qemacs-0.4.0dev.recipe
index 6acdb9102..15d44e238 100644
--- a/app-editors/qemacs/qemacs-0.4.0dev.recipe
+++ b/app-editors/qemacs/qemacs-0.4.0dev.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	cmd:qemacs_pe2qe$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 #	lib:libavcodec$secondaryArchSuffix
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:which
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe
index d2c2ca598..0fd8ecb79 100644
--- a/app-editors/vim/vim-7.4.recipe
+++ b/app-editors/vim/vim-7.4.recipe
@@ -36,7 +36,7 @@ PROVIDES="
 	cmd:xxd = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses
 	lib:libintl
 "
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	gettext
 "
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:autoconf
 	cmd:gcc
diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe
index 81191cc87..28c5b07ab 100644
--- a/app-editors/xemacs/xemacs-21.5_hg.recipe
+++ b/app-editors/xemacs/xemacs-21.5_hg.recipe
@@ -50,7 +50,7 @@ REQUIRES="
 #	lib:libxpm$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix >= 1.2.8
diff --git a/app-emulation/aranym/aranym-0.9.15_git.recipe b/app-emulation/aranym/aranym-0.9.15_git.recipe
index 8f151ee34..da4e31444 100644
--- a/app-emulation/aranym/aranym-0.9.15_git.recipe
+++ b/app-emulation/aranym/aranym-0.9.15_git.recipe
@@ -25,7 +25,7 @@ REQUIRES="
 	lib:libsdl_image_1.2
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl_1.2 >= 0.10
 	devel:libSDL_image_1.2 >= 0.8.4
 	"
diff --git a/app-emulation/bochs/bochs-2.6.recipe b/app-emulation/bochs/bochs-2.6.recipe
index 12d51ee3b..62cc02cec 100644
--- a/app-emulation/bochs/bochs-2.6.recipe
+++ b/app-emulation/bochs/bochs-2.6.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/joyce/joyce-2.2.6.recipe b/app-emulation/joyce/joyce-2.2.6.recipe
index 3f733088a..ba9f1f6b4 100644
--- a/app-emulation/joyce/joyce-2.2.6.recipe
+++ b/app-emulation/joyce/joyce-2.2.6.recipe
@@ -28,7 +28,7 @@ REQUIRES="
 	lib:libgl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libpng
 	devel:libxml2
diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe
index 5ff6ac982..17a7b0892 100644
--- a/app-emulation/libdsk/libdsk-1.3.3.recipe
+++ b/app-emulation/libdsk/libdsk-1.3.3.recipe
@@ -34,13 +34,13 @@ REQUIRES_devel="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
diff --git a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
index 2c01e0b63..60e04e194 100644
--- a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
+++ b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
@@ -57,7 +57,7 @@ PROVIDES="
 PATCHES="qemu-2.0.0.patchset"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe
index 69a096b3b..0b4c72f8f 100644
--- a/app-emulation/oricutron/oricutron-1.1_svn.recipe
+++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe
@@ -24,7 +24,7 @@ REQUIRES="
 	libsdl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl_1.2 >= 0.10
 	"
 BUILD_PREREQUIRES="
diff --git a/app-emulation/qemu/qemu-0.15.1.recipe b/app-emulation/qemu/qemu-0.15.1.recipe
index 754e28869..d336e8679 100644
--- a/app-emulation/qemu/qemu-0.15.1.recipe
+++ b/app-emulation/qemu/qemu-0.15.1.recipe
@@ -35,12 +35,12 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz
 "
 
diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe
index bb7338657..cd4783813 100644
--- a/app-emulation/qemu/qemu-1.7.0.recipe
+++ b/app-emulation/qemu/qemu-1.7.0.recipe
@@ -51,7 +51,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -67,7 +67,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/qemu/qemu-2.0.0.recipe b/app-emulation/qemu/qemu-2.0.0.recipe
index 1d14d34bd..22ee8978b 100644
--- a/app-emulation/qemu/qemu-2.0.0.recipe
+++ b/app-emulation/qemu/qemu-2.0.0.recipe
@@ -57,7 +57,7 @@ PROVIDES="
 PATCHES="qemu-$portVersion.patchset"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/qemu/qemu-2.1.0.recipe b/app-emulation/qemu/qemu-2.1.0.recipe
index 47316b789..a5e1eb41f 100644
--- a/app-emulation/qemu/qemu-2.1.0.recipe
+++ b/app-emulation/qemu/qemu-2.1.0.recipe
@@ -54,7 +54,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -70,7 +70,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe
index dc712ab09..c8d4a4435 100644
--- a/app-emulation/qemu/qemu-2.1.2.recipe
+++ b/app-emulation/qemu/qemu-2.1.2.recipe
@@ -54,7 +54,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -70,7 +70,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/app-emulation/simh/simh-4.0.0_git.recipe b/app-emulation/simh/simh-4.0.0_git.recipe
index 3566f8034..078e215d3 100644
--- a/app-emulation/simh/simh-4.0.0_git.recipe
+++ b/app-emulation/simh/simh-4.0.0_git.recipe
@@ -74,14 +74,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libSDL2_2.0${secondaryArchSuffix}
 	#TODO:pcap
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL2$secondaryArchSuffix
 	#TODO:pcap
 	"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe
index cc75347cf..a20e20814 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe
+++ b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 # TODO: POST_INSTALL_SCRIPTS=""
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	openssl$secondaryArchSuffix >= 1.0.0
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -47,8 +47,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	# required for kmk_* which are compiled with gcc4
-	haiku_x86 >= $haikuVersion
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_x86
+	haiku${secondaryArchSuffix}_devel
 	cmd:mkisofs
 	cmd:grep
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
index cfd68bb58..12c192d8b 100644
--- a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
+++ b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe
@@ -38,7 +38,7 @@ PROVIDES="
 	cmd:run_backdoor$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -50,7 +50,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/app-i18n/becjk/becjk-1.0.1.recipe b/app-i18n/becjk/becjk-1.0.1.recipe
index e26018d13..87f330cb1 100644
--- a/app-i18n/becjk/becjk-1.0.1.recipe
+++ b/app-i18n/becjk/becjk-1.0.1.recipe
@@ -18,10 +18,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:python
diff --git a/app-i18n/canna/canna-1.0.1.recipe b/app-i18n/canna/canna-1.0.1.recipe
index c2907190d..7fb2d39c9 100644
--- a/app-i18n/canna/canna-1.0.1.recipe
+++ b/app-i18n/canna/canna-1.0.1.recipe
@@ -33,14 +33,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:jam
 	"
diff --git a/app-i18n/canna/canna-1.0.2.recipe b/app-i18n/canna/canna-1.0.2.recipe
index 88686a9c6..e705b134d 100644
--- a/app-i18n/canna/canna-1.0.2.recipe
+++ b/app-i18n/canna/canna-1.0.2.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:jam
 	"
diff --git a/app-i18n/enca/enca-1.15.recipe b/app-i18n/enca/enca-1.15.recipe
index 3c7cc8537..51cd0bd49 100644
--- a/app-i18n/enca/enca-1.15.recipe
+++ b/app-i18n/enca/enca-1.15.recipe
@@ -27,11 +27,11 @@ if [ -z "$secondaryArchSuffix" ]; then
 		"
 fi
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe
index a37d90217..12f9ef6d5 100644
--- a/app-misc/colordiff/colordiff-1.0.13.recipe
+++ b/app-misc/colordiff/colordiff-1.0.13.recipe
@@ -20,13 +20,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:diff
 	cmd:perl
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	"
 
diff --git a/app-misc/fdupes/fdupes-1.51.recipe b/app-misc/fdupes/fdupes-1.51.recipe
index 25f04a845..4d01d0159 100644
--- a/app-misc/fdupes/fdupes-1.51.recipe
+++ b/app-misc/fdupes/fdupes-1.51.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/app-misc/gcal/gcal-3.6.3.recipe b/app-misc/gcal/gcal-3.6.3.recipe
index 326acaa90..95b07b0d8 100644
--- a/app-misc/gcal/gcal-3.6.3.recipe
+++ b/app-misc/gcal/gcal-3.6.3.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe
index 6607c66a3..2583c5f8a 100644
--- a/app-misc/getopt/getopt-1.1.5.recipe
+++ b/app-misc/getopt/getopt-1.1.5.recipe
@@ -25,13 +25,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/app-misc/mc/mc-4.8.13.recipe b/app-misc/mc/mc-4.8.13.recipe
index 922397430..8876e3e43 100644
--- a/app-misc/mc/mc-4.8.13.recipe
+++ b/app-misc/mc/mc-4.8.13.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-misc/screen/screen-4.2.1_git.recipe b/app-misc/screen/screen-4.2.1_git.recipe
index 3141a9a28..71662d04b 100644
--- a/app-misc/screen/screen-4.2.1_git.recipe
+++ b/app-misc/screen/screen-4.2.1_git.recipe
@@ -43,7 +43,7 @@ REQUIRES="
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix >= 5.9
 	"
 BUILD_PREREQUIRES="
diff --git a/app-misc/srm/srm-1.2.12.recipe b/app-misc/srm/srm-1.2.12.recipe
index 075aa698d..5478e53f3 100644
--- a/app-misc/srm/srm-1.2.12.recipe
+++ b/app-misc/srm/srm-1.2.12.recipe
@@ -20,7 +20,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/app-misc/srm/srm-1.2.13_svn.recipe b/app-misc/srm/srm-1.2.13_svn.recipe
index 7dade809b..a5b095bce 100644
--- a/app-misc/srm/srm-1.2.13_svn.recipe
+++ b/app-misc/srm/srm-1.2.13_svn.recipe
@@ -19,7 +19,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/app-misc/strigi/strigi-0.7.5.recipe b/app-misc/strigi/strigi-0.7.5.recipe
index 4c6499b8f..faeed35ef 100644
--- a/app-misc/strigi/strigi-0.7.5.recipe
+++ b/app-misc/strigi/strigi-0.7.5.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -54,7 +54,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
@@ -70,7 +70,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	strigi${secondaryArchSuffix} == $portVersion base
 	"
 
diff --git a/app-mobilephone/dfu-util/dfu_util-0.8.recipe b/app-mobilephone/dfu-util/dfu_util-0.8.recipe
index 6d8e57578..ffad7f4cc 100644
--- a/app-mobilephone/dfu-util/dfu_util-0.8.recipe
+++ b/app-mobilephone/dfu-util/dfu_util-0.8.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libusb_1.0
 "
 
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/app-office/abiword/abiword-2.4.recipe b/app-office/abiword/abiword-2.4.recipe
index e252978b2..54fc2bcd4 100644
--- a/app-office/abiword/abiword-2.4.recipe
+++ b/app-office/abiword/abiword-2.4.recipe
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
diff --git a/app-office/multitalk/multitalk-1.4.recipe b/app-office/multitalk/multitalk-1.4.recipe
index 937758bdc..f66b7d092 100644
--- a/app-office/multitalk/multitalk-1.4.recipe
+++ b/app-office/multitalk/multitalk-1.4.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	sdl_gfx
 	sdl_image
 	sdl_ttf
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:g++
 	cmd:make
 	cmd:sdl_config
diff --git a/app-shells/bash/bash-4.3.30.recipe b/app-shells/bash/bash-4.3.30.recipe
index b9c08c32a..c7429f196 100644
--- a/app-shells/bash/bash-4.3.30.recipe
+++ b/app-shells/bash/bash-4.3.30.recipe
@@ -55,7 +55,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libreadline
 	lib:libncursesw
 	"
diff --git a/app-shells/command_not_found/command_not_found-0.0.1.recipe b/app-shells/command_not_found/command_not_found-0.0.1.recipe
index 5a78785f4..37d5ec64f 100644
--- a/app-shells/command_not_found/command_not_found-0.0.1.recipe
+++ b/app-shells/command_not_found/command_not_found-0.0.1.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	cmd:command_not_found = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 "
 BUILD_REQUIRES="
diff --git a/app-shells/dash/dash-0.5.7.recipe b/app-shells/dash/dash-0.5.7.recipe
index b07f21bce..5422d02ec 100644
--- a/app-shells/dash/dash-0.5.7.recipe
+++ b/app-shells/dash/dash-0.5.7.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libreadline
 	lib:libncursesw
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:awk
 	cmd:make
diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe
index 568a6c9b9..ffd475ee7 100644
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -38,7 +38,7 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix >= 5.9
 	devel:libgettextlib$secondaryArchSuffix
diff --git a/app-shells/mksh/mksh-r50c.recipe b/app-shells/mksh/mksh-r50c.recipe
index 9b5612cbc..5a6f09b75 100644
--- a/app-shells/mksh/mksh-r50c.recipe
+++ b/app-shells/mksh/mksh-r50c.recipe
@@ -29,11 +29,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:ed
 	cmd:gcc
 	cmd:grep
diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe
index 79bf1f231..52d42993f 100644
--- a/app-shells/zsh/zsh-5.0.2.recipe
+++ b/app-shells/zsh/zsh-5.0.2.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	cmd:zsh_$portVersion = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 	lib:libpcre
 	"
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	devel:libpcre
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:find
 	cmd:gcc
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe
index 8c1fe2112..17f9de214 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.recipe
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe
@@ -30,10 +30,10 @@ PROVIDES="
 	cmd:caiksaurus$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe
index f823f5fec..f99e8f30e 100644
--- a/app-text/antiword/antiword-0.37.recipe
+++ b/app-text/antiword/antiword-0.37.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe
index 5f4c086b2..a659fa71f 100644
--- a/app-text/asciidoc/asciidoc-8.6.8.recipe
+++ b/app-text/asciidoc/asciidoc-8.6.8.recipe
@@ -24,13 +24,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:make
 	cmd:sed
diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe
index d89de9292..e4d9e5e91 100644
--- a/app-text/aspell/aspell-0.60.6.1.recipe
+++ b/app-text/aspell/aspell-0.60.6.1.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 	"
 
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe
index a8fc46179..58955c434 100644
--- a/app-text/discount/discount-2.1.3.recipe
+++ b/app-text/discount/discount-2.1.3.recipe
@@ -24,13 +24,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	cmd:g++
diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe
index 705802d69..90eb5529e 100644
--- a/app-text/dos2unix/dos2unix-1.0.1.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.1.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:g++
 	"
 
diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe
index b3043e6d5..ca2dd5690 100644
--- a/app-text/dos2unix/dos2unix-1.0.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	"
 
diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe
index 2421eb887..9700a2556 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libjpeg
 	lib:libpng
 	lib:libz
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:gcc
 	cmd:ld
diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe
index 4f46dd7eb..332ab9f4d 100644
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/app-text/hunspell/hunspell-1.3.2.recipe b/app-text/hunspell/hunspell-1.3.2.recipe
index 2b3957155..5b63238b2 100644
--- a/app-text/hunspell/hunspell-1.3.2.recipe
+++ b/app-text/hunspell/hunspell-1.3.2.recipe
@@ -38,12 +38,12 @@ PROVIDES="
 	lib:libhunspell_1.3 = $portVersion compat >= 1.3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/app-text/hunspell/hunspell-1.3.3.recipe b/app-text/hunspell/hunspell-1.3.3.recipe
index 569aad982..e672f239f 100644
--- a/app-text/hunspell/hunspell-1.3.3.recipe
+++ b/app-text/hunspell/hunspell-1.3.3.recipe
@@ -44,12 +44,12 @@ if [ -z $secondaryArchSuffix ]; then
 		"
 fi
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/app-text/libabw/libabw-0.1.0.recipe b/app-text/libabw/libabw-0.1.0.recipe
index 1849e898f..b48b96c16 100644
--- a/app-text/libabw/libabw-0.1.0.recipe
+++ b/app-text/libabw/libabw-0.1.0.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	lib:libabw_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libebook/libebook-0.1.1.recipe b/app-text/libebook/libebook-0.1.1.recipe
index 361053f20..f799fdad0 100644
--- a/app-text/libebook/libebook-0.1.1.recipe
+++ b/app-text/libebook/libebook-0.1.1.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	lib:libe_book_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
@@ -58,7 +58,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoheader
diff --git a/app-text/libetonyek/libetonyek-0.1.1.recipe b/app-text/libetonyek/libetonyek-0.1.1.recipe
index 2fe6509aa..9359cb21f 100644
--- a/app-text/libetonyek/libetonyek-0.1.1.recipe
+++ b/app-text/libetonyek/libetonyek-0.1.1.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	lib:libetonyek_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -57,7 +57,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libmspub/libmspub-0.1.1.recipe b/app-text/libmspub/libmspub-0.1.1.recipe
index 6b5a73ff0..72bffa104 100644
--- a/app-text/libmspub/libmspub-0.1.1.recipe
+++ b/app-text/libmspub/libmspub-0.1.1.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	lib:libmspub_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
@@ -54,7 +54,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoheader
diff --git a/app-text/libmwaw/libmwaw-0.3.3.recipe b/app-text/libmwaw/libmwaw-0.3.3.recipe
index a93ef207d..280a4e739 100644
--- a/app-text/libmwaw/libmwaw-0.3.3.recipe
+++ b/app-text/libmwaw/libmwaw-0.3.3.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	lib:libmwaw_0.3$secondaryArchSuffix = 3.0.3 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -54,7 +54,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libodfgen/libodfgen-0.1.1.recipe b/app-text/libodfgen/libodfgen-0.1.1.recipe
index 7e3593964..ac23c13f6 100644
--- a/app-text/libodfgen/libodfgen-0.1.1.recipe
+++ b/app-text/libodfgen/libodfgen-0.1.1.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	lib:libodfgen_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe
index faad58af5..0af760b07 100644
--- a/app-text/libpaper/libpaper-1.1.24.recipe
+++ b/app-text/libpaper/libpaper-1.1.24.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -76,6 +76,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-#	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+#	haiku${secondaryArchSuffix}_devel
 	libpaper$secondaryArchSuffix  == $portVersion base
 	"
diff --git a/app-text/libwpd/libwpd-0.10.0.recipe b/app-text/libwpd/libwpd-0.10.0.recipe
index 871d4d27a..1e0b06f6a 100644
--- a/app-text/libwpd/libwpd-0.10.0.recipe
+++ b/app-text/libwpd/libwpd-0.10.0.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libwpd_0.10$secondaryArchSuffix = 10.0.0 compat >= 10
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
 	lib:librevenge_stream_0.0$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe
index 5e2bf3fc6..9f677cdde 100644
--- a/app-text/libwpd/libwpd-0.9.9.recipe
+++ b/app-text/libwpd/libwpd-0.9.9.recipe
@@ -35,14 +35,14 @@ PROVIDES="
 	lib:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	pkgconfig$secondaryArchSuffix >= 0.27
 	cmd:aclocal
 	cmd:libtoolize
diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe
index 68fd39386..87700c56c 100644
--- a/app-text/libwpg/libwpg-0.2.2.recipe
+++ b/app-text/libwpg/libwpg-0.2.2.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libwpd_0.9$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -43,7 +43,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	pkgconfig$secondaryArchSuffix >= 0.27
 	cmd:aclocal
 	cmd:libtoolize
diff --git a/app-text/libwpg/libwpg-0.3.0.recipe b/app-text/libwpg/libwpg-0.3.0.recipe
index 411f07733..47403a90b 100644
--- a/app-text/libwpg/libwpg-0.3.0.recipe
+++ b/app-text/libwpg/libwpg-0.3.0.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libwpg_0.3$secondaryArchSuffix = 3.0.0 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:perl
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -52,7 +52,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/libwps/libwps-0.3.0.recipe b/app-text/libwps/libwps-0.3.0.recipe
index 02b67bb18..35b604dcd 100644
--- a/app-text/libwps/libwps-0.3.0.recipe
+++ b/app-text/libwps/libwps-0.3.0.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	lib:libwps_0.3$secondaryArchSuffix = 3.0.0 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -54,7 +54,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe
index 230f85987..daaf6f944 100644
--- a/app-text/mdocml/mdocml-1.12.2.recipe
+++ b/app-text/mdocml/mdocml-1.12.2.recipe
@@ -23,12 +23,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	cmd:ld
diff --git a/app-text/mupdf/mupdf-1.6.recipe b/app-text/mupdf/mupdf-1.6.recipe
index 016f18e3a..e77ac34d4 100644
--- a/app-text/mupdf/mupdf-1.6.recipe
+++ b/app-text/mupdf/mupdf-1.6.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -52,7 +52,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:find
 	cmd:freetype_config$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
diff --git a/app-text/podofo/podofo-0.9.3.recipe b/app-text/podofo/podofo-0.9.3.recipe
index d71642a19..10d9e247b 100644
--- a/app-text/podofo/podofo-0.9.3.recipe
+++ b/app-text/podofo/podofo-0.9.3.recipe
@@ -51,7 +51,7 @@ PROVIDES="
 	cmd:podofoxmp
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -62,7 +62,7 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
diff --git a/app-text/psiconv/psiconv-0.9.8.recipe b/app-text/psiconv/psiconv-0.9.8.recipe
index d48f6bfea..19cf9e1a9 100644
--- a/app-text/psiconv/psiconv-0.9.8.recipe
+++ b/app-text/psiconv/psiconv-0.9.8.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe
index a9cf42844..5d6e57534 100644
--- a/app-text/rman/rman-3.2.recipe
+++ b/app-text/rman/rman-3.2.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe
index 1ea0242ac..f04f4b8e0 100644
--- a/app-text/sword/sword-1.7.3.recipe
+++ b/app-text/sword/sword-1.7.3.recipe
@@ -48,7 +48,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -56,12 +56,12 @@ REQUIRES="
 	"
 
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	sword$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe
index e18c38f61..2f1841027 100644
--- a/app-text/texi2html/texi2html-1.82.recipe
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -43,7 +43,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.7.0.recipe
index 031ad4075..f1b9a7ec2 100644
--- a/app-text/tree/tree-1.7.0.recipe
+++ b/app-text/tree/tree-1.7.0.recipe
@@ -22,10 +22,10 @@ PROVIDES="
 	cmd:tree$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe
index 761b8aca8..23fe7074c 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4.recipe
+++ b/dev-cpp/clucene/clucene-2.3.3.4.recipe
@@ -40,12 +40,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix}  >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	boost$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	devel:libboost_atomic$secondaryArchSuffix
 	"
diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
index c6bf1dfa5..cb218b1d5 100644
--- a/dev-db/db/db-4.8.30.recipe
+++ b/dev-db/db/db-4.8.30.recipe
@@ -34,12 +34,12 @@ PROVIDES="
 	lib:libdb_cxx_4${secondaryArchSuffix}
 	"
 REQUIRES="
-    haiku${secondaryArchSuffix} >= $haikuVersion
+    haiku${secondaryArchSuffix}
     "
 BUILD_REQUIRES="
     "
 BUILD_PREREQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
     cmd:ld$secondaryArchSuffix
 	cmd:libtool
diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe
index 6f59d234b..6cbbadb14 100644
--- a/dev-db/db/db-5.3.28.recipe
+++ b/dev-db/db/db-5.3.28.recipe
@@ -39,12 +39,12 @@ PROVIDES="
 	lib:libdb_cxx_5${secondaryArchSuffix}
 	"
 REQUIRES="
-    haiku${secondaryArchSuffix} >= $haikuVersion
+    haiku${secondaryArchSuffix}
     "
 BUILD_REQUIRES="
     "
 BUILD_PREREQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
     cmd:ld$secondaryArchSuffix
 	cmd:libtool
diff --git a/dev-db/db/db-6.0.30.recipe b/dev-db/db/db-6.0.30.recipe
index 88069b905..d29447aee 100644
--- a/dev-db/db/db-6.0.30.recipe
+++ b/dev-db/db/db-6.0.30.recipe
@@ -39,12 +39,12 @@ PROVIDES="
 	lib:libdb_cxx_6${secondaryArchSuffix}
 	"
 REQUIRES="
-    haiku${secondaryArchSuffix} >= $haikuVersion
+    haiku${secondaryArchSuffix}
     "
 BUILD_REQUIRES="
     "
 BUILD_PREREQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
     cmd:ld$secondaryArchSuffix
 	cmd:libtool
diff --git a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
index 7510f56bb..56af488cb 100644
--- a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
+++ b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
@@ -42,12 +42,12 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libreadline
 	lib:libz
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libreadline
 	devel:libz
 	"
diff --git a/dev-db/sqlite/sqlite-3.8.7.4.recipe b/dev-db/sqlite/sqlite-3.8.7.4.recipe
index bd9edac62..96bd9ea60 100644
--- a/dev-db/sqlite/sqlite-3.8.7.4.recipe
+++ b/dev-db/sqlite/sqlite-3.8.7.4.recipe
@@ -26,13 +26,13 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-embedded/avr_libc/avr_libc-1.8.0.recipe b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe
index f6d7bbf10..a39ef97ef 100644
--- a/dev-embedded/avr_libc/avr_libc-1.8.0.recipe
+++ b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe
@@ -47,12 +47,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:avr_as$secondaryArchSuffix
diff --git a/dev-embedded/avra/avra-1.3.0.recipe b/dev-embedded/avra/avra-1.3.0.recipe
index ebb4e332b..cedf95c90 100644
--- a/dev-embedded/avra/avra-1.3.0.recipe
+++ b/dev-embedded/avra/avra-1.3.0.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe
index f7179a591..6220b7fe7 100644
--- a/dev-embedded/avrdude/avrdude-6.0.1.recipe
+++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	lib:libftdi1$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
@@ -43,7 +43,7 @@ BUILD_REQUIRES="
 	devel:libelf$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:automake
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 054eff61b..f03f0039b 100644
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 "
 
@@ -48,7 +48,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:automake
diff --git a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
index 7bb3e57ec..3d2f2d7a3 100644
--- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
+++ b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:m6809_unknown_ld$secondaryArchSuffix
 "
 
@@ -41,7 +41,7 @@ BUILD_REQUIRES="
 	devel:libmpc$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/dev-embedded/libftdi/libftdi-1.0.recipe b/dev-embedded/libftdi/libftdi-1.0.recipe
index 5aabc734e..2f2accbea 100644
--- a/dev-embedded/libftdi/libftdi-1.0.recipe
+++ b/dev-embedded/libftdi/libftdi-1.0.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libconfuse$secondaryArchSuffix >= 2.5
 	lib:libstdc++$secondaryArchSuffix
 	libusb$secondaryArchSuffix >= 1.0
@@ -37,7 +37,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libconfuse${secondaryArchSuffix}_devel >= 2.5
 	libusb${secondaryArchSuffix}_devel
 	boost${secondaryArchSuffix}_devel
diff --git a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
index 1b81b6c35..94c0433b1 100644
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
@@ -30,14 +30,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-embedded/lwtools/lwtools-4.10.recipe b/dev-embedded/lwtools/lwtools-4.10.recipe
index a5f500803..381b99710 100644
--- a/dev-embedded/lwtools/lwtools-4.10.recipe
+++ b/dev-embedded/lwtools/lwtools-4.10.recipe
@@ -33,11 +33,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cc$secondaryArchSuffix
 	cmd:make
 "
diff --git a/dev-embedded/sdcc/sdcc-3.4.0.recipe b/dev-embedded/sdcc/sdcc-3.4.0.recipe
index e7e459ad4..efeed6cc5 100644
--- a/dev-embedded/sdcc/sdcc-3.4.0.recipe
+++ b/dev-embedded/sdcc/sdcc-3.4.0.recipe
@@ -63,7 +63,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -73,7 +73,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:automake
diff --git a/dev-embedded/stlink/stlink-1.0.0.recipe b/dev-embedded/stlink/stlink-1.0.0.recipe
index 0c833830a..b81e3ff60 100644
--- a/dev-embedded/stlink/stlink-1.0.0.recipe
+++ b/dev-embedded/stlink/stlink-1.0.0.recipe
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-embedded/stm32flash/stm32flash-0.3.recipe b/dev-embedded/stm32flash/stm32flash-0.3.recipe
index 0fc21057c..500cedf84 100644
--- a/dev-embedded/stm32flash/stm32flash-0.3.recipe
+++ b/dev-embedded/stm32flash/stm32flash-0.3.recipe
@@ -38,11 +38,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 "
diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
index 505bfd9ac..d02817585 100644
--- a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
+++ b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe
index 7cc7d6f16..f28eb422b 100644
--- a/dev-games/ode/ode-0.12.recipe
+++ b/dev-games/ode/ode-0.12.recipe
@@ -24,13 +24,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 	
 BUILD_PREREQUIRES="
@@ -70,6 +70,6 @@ PROVIDES_devel="
 	"
 	
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	ode$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe
index ce43ae3ca..f66506bd2 100644
--- a/dev-games/physfs/physfs-2.0.3.recipe
+++ b/dev-games/physfs/physfs-2.0.3.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe
index 79e278601..ff5be6047 100644
--- a/dev-java/ant_core/ant_core-1.9.2.recipe
+++ b/dev-java/ant_core/ant_core-1.9.2.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:java
 	"
 
diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
index e182f0ca6..efbb93e8a 100644
--- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
+++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
@@ -26,10 +26,10 @@ PROVIDES="
 	gnu_classpath = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 "
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index 4a42947dc..d22aaa01e 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -33,7 +33,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-java/jamvm/jamvm-2.0.0.recipe b/dev-java/jamvm/jamvm-2.0.0.recipe
index e635eb325..e163a27e5 100644
--- a/dev-java/jamvm/jamvm-2.0.0.recipe
+++ b/dev-java/jamvm/jamvm-2.0.0.recipe
@@ -33,7 +33,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-lang/brexx/brexx-1.3.2.recipe b/dev-lang/brexx/brexx-1.3.2.recipe
index aa18dd85b..98dc4814c 100644
--- a/dev-lang/brexx/brexx-1.3.2.recipe
+++ b/dev-lang/brexx/brexx-1.3.2.recipe
@@ -37,11 +37,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:make
diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe
index a3d28d934..1af446d1a 100644
--- a/dev-lang/erlang/erlang-16.03.recipe
+++ b/dev-lang/erlang/erlang-16.03.recipe
@@ -30,14 +30,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:libtool
 	cmd:perl
 	cmd:gcc
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:perl
 	cmd:make
 	cmd:gcc
diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe
index 0e4a4b6e5..f4efa3eb3 100644
--- a/dev-lang/fpc/fpc-2.6.2.recipe
+++ b/dev-lang/fpc/fpc-2.6.2.recipe
@@ -64,10 +64,10 @@ PROVIDES="
 	cmd:unitdiff$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	fpc == 2.6.2_bin
 "
 BUILD_PREREQUIRES="
diff --git a/dev-lang/fpc/fpc-2.6.2_bin.recipe b/dev-lang/fpc/fpc-2.6.2_bin.recipe
index 27db1154b..56119e590 100644
--- a/dev-lang/fpc/fpc-2.6.2_bin.recipe
+++ b/dev-lang/fpc/fpc-2.6.2_bin.recipe
@@ -21,10 +21,10 @@ PROVIDES="
 	cmd:fpc = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 "
 BUILD_PREREQUIRES="
 	binutils
diff --git a/dev-lang/golang/golang-1.3.recipe b/dev-lang/golang/golang-1.3.recipe
index c083ac7c6..c80d3a84e 100644
--- a/dev-lang/golang/golang-1.3.recipe
+++ b/dev-lang/golang/golang-1.3.recipe
@@ -45,10 +45,10 @@ if [ "$secondaryArchSuffix" != "" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe
index cdfe57f62..1f3566e52 100644
--- a/dev-lang/lua/lua-5.1.4.recipe
+++ b/dev-lang/lua/lua-5.1.4.recipe
@@ -14,10 +14,10 @@ PROVIDES="
 	lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc${secondaryArchSuffix}
 	"
diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe
index f4b4aaa27..f1790b97b 100644
--- a/dev-lang/lua/lua-5.2.1.recipe
+++ b/dev-lang/lua/lua-5.2.1.recipe
@@ -14,10 +14,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
diff --git a/dev-lang/lua/lua-5.2.3.recipe b/dev-lang/lua/lua-5.2.3.recipe
index 6818abddf..19ced86d0 100644
--- a/dev-lang/lua/lua-5.2.3.recipe
+++ b/dev-lang/lua/lua-5.2.3.recipe
@@ -14,10 +14,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
diff --git a/dev-lang/luajit/luajit-2.0.2.recipe b/dev-lang/luajit/luajit-2.0.2.recipe
index febaaa841..1fb575692 100644
--- a/dev-lang/luajit/luajit-2.0.2.recipe
+++ b/dev-lang/luajit/luajit-2.0.2.recipe
@@ -13,10 +13,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe
index c39073082..0dfb9bc71 100644
--- a/dev-lang/nasm/nasm-2.08.01.recipe
+++ b/dev-lang/nasm/nasm-2.08.01.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-lang/nasm/nasm-2.11.02.recipe b/dev-lang/nasm/nasm-2.11.02.recipe
index bd51cb63c..5f633ba0d 100644
--- a/dev-lang/nasm/nasm-2.11.02.recipe
+++ b/dev-lang/nasm/nasm-2.11.02.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:awk
diff --git a/dev-lang/nasm/nasm-2.11.05.recipe b/dev-lang/nasm/nasm-2.11.05.recipe
index cd77135c1..54e556c6f 100644
--- a/dev-lang/nasm/nasm-2.11.05.recipe
+++ b/dev-lang/nasm/nasm-2.11.05.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:awk
diff --git a/dev-lang/ocaml/ocaml-4.00.0.recipe b/dev-lang/ocaml/ocaml-4.00.0.recipe
index 97fad1ac3..cf3f18c67 100644
--- a/dev-lang/ocaml/ocaml-4.00.0.recipe
+++ b/dev-lang/ocaml/ocaml-4.00.0.recipe
@@ -65,12 +65,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:gcc
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.01.0.recipe
index ea84a679e..089a50f3f 100644
--- a/dev-lang/ocaml/ocaml-4.01.0.recipe
+++ b/dev-lang/ocaml/ocaml-4.01.0.recipe
@@ -65,11 +65,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	cmd:awk
diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
index bcbbc290e..f9892e157 100644
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
@@ -96,14 +96,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffx >= $haikuVersion
+	haiku$secondaryArchSuffx
 	lib:libfreetype$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe
index de478b035..9af7e6b87 100644
--- a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe
@@ -81,14 +81,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffx >= $haikuVersion
+	haiku$secondaryArchSuffx
 	lib:libfreetype$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe
index 492928bb3..0dced0af1 100644
--- a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe
@@ -83,14 +83,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffx >= $haikuVersion
+	haiku$secondaryArchSuffx
 	lib:libfreetype$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/dev-lang/orc/orc-0.4.19.recipe b/dev-lang/orc/orc-0.4.19.recipe
index 009d5cbad..b8706ec4d 100644
--- a/dev-lang/orc/orc-0.4.19.recipe
+++ b/dev-lang/orc/orc-0.4.19.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	lib:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index 8b2d4a341..97e832373 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -69,12 +69,12 @@ PROVIDES="
 	lib:libperl = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe
index e29d49b9e..20e42b8c0 100644
--- a/dev-lang/perl/perl-5.18.1.recipe
+++ b/dev-lang/perl/perl-5.18.1.recipe
@@ -78,12 +78,12 @@ PROVIDES="
 	lib:libperl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe
index 37ebd474a..a56051732 100644
--- a/dev-lang/perl/perl-5.18.2.recipe
+++ b/dev-lang/perl/perl-5.18.2.recipe
@@ -78,12 +78,12 @@ PROVIDES="
 	lib:libperl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:ld
diff --git a/dev-lang/php/php-5.4.34.recipe b/dev-lang/php/php-5.4.34.recipe
index bdf0a1ad0..8cfc6940f 100644
--- a/dev-lang/php/php-5.4.34.recipe
+++ b/dev-lang/php/php-5.4.34.recipe
@@ -34,7 +34,7 @@ GLOBAL_WRITABLE_FILES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libxml2
 	lib:libz
 "
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:bison
 	cmd:dos2unix
diff --git a/dev-lang/php/php-5.6.2.recipe b/dev-lang/php/php-5.6.2.recipe
index 0e0f4c72f..fb1056ae7 100644
--- a/dev-lang/php/php-5.6.2.recipe
+++ b/dev-lang/php/php-5.6.2.recipe
@@ -33,7 +33,7 @@ GLOBAL_WRITABLE_FILES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libxml2
 	lib:libz
 "
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:bison
 	cmd:dos2unix
diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe
index a33e1ae05..347e8e5f1 100644
--- a/dev-lang/python/python-2.6.8.recipe
+++ b/dev-lang/python/python-2.6.8.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	lib:libpython2.6 = 1.0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:nano
 	lib:libbz2
 	lib:libncurses
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
diff --git a/dev-lang/python/python-2.6.9.recipe b/dev-lang/python/python-2.6.9.recipe
index bc590b92c..e3eff4ab7 100644
--- a/dev-lang/python/python-2.6.9.recipe
+++ b/dev-lang/python/python-2.6.9.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	lib:libpython2.6 = 1.0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:nano
 	lib:libbz2
 	lib:libncurses
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe
index aa1a0bca4..538ea7e82 100644
--- a/dev-lang/python/python-2.7.6.recipe
+++ b/dev-lang/python/python-2.7.6.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libpython2.7 = 1.0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libbz2
 	lib:libncurses
 	lib:libssl
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
diff --git a/dev-lang/python/python-2.7.8.recipe b/dev-lang/python/python-2.7.8.recipe
index 15d017e8c..65ae16ac3 100644
--- a/dev-lang/python/python-2.7.8.recipe
+++ b/dev-lang/python/python-2.7.8.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libpython2.7 = 1.0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libbz2
 	lib:libncurses
 	lib:libssl
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.recipe b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
index af73c4423..e4643121a 100644
--- a/dev-lang/rebol/rebol-2.101.0.5.75.recipe
+++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
@@ -25,11 +25,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe
index ce57c7e7b..0d521a28f 100644
--- a/dev-lang/ruby/ruby-1.9.1.recipe
+++ b/dev-lang/ruby/ruby-1.9.1.recipe
@@ -38,7 +38,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libedit
 	lib:libz
 	lib:libcrypto
@@ -57,7 +57,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:g++
 	cmd:autoconf
diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe
index 772fc7477..41550c622 100644
--- a/dev-lang/ruby/ruby-1.9.3.recipe
+++ b/dev-lang/ruby/ruby-1.9.3.recipe
@@ -54,7 +54,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:autoconf
diff --git a/dev-lang/ruby/ruby-2.1.2.recipe b/dev-lang/ruby/ruby-2.1.2.recipe
index bb3e99bd6..71092ca80 100644
--- a/dev-lang/ruby/ruby-2.1.2.recipe
+++ b/dev-lang/ruby/ruby-2.1.2.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -51,7 +51,7 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libedit$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
index 170ffd3c1..886775857 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-lang/squirrel/squirrel-3.0.4.recipe b/dev-lang/squirrel/squirrel-3.0.4.recipe
index 370f57917..b30cce8e8 100644
--- a/dev-lang/squirrel/squirrel-3.0.4.recipe
+++ b/dev-lang/squirrel/squirrel-3.0.4.recipe
@@ -28,10 +28,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
diff --git a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
index a6605227d..6a35acd1f 100644
--- a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
+++ b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	cmd:swipl_ld$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
 	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
diff --git a/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe b/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe
index feccb15d3..b86c47d9e 100644
--- a/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe
+++ b/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	cmd:swipl_ld$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10
 	lib:libreadline$secondaryArchSuffix >= 6
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libreadline$secondaryArchSuffix >= 6
 	devel:libgmp$secondaryArchSuffix >= 10
 	devel:libncurses$secondaryArchSuffix
diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe
index 3d9ef9f79..27ada4246 100644
--- a/dev-lang/swig/swig-2.0.11.recipe
+++ b/dev-lang/swig/swig-2.0.11.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpcre
 	"
 
@@ -48,7 +48,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:libtoolize
 	cmd:make
 	cmd:gcc
diff --git a/dev-lang/tcc/tcc-0.9.26.recipe b/dev-lang/tcc/tcc-0.9.26.recipe
index 25679c42b..d15fe0c85 100644
--- a/dev-lang/tcc/tcc-0.9.26.recipe
+++ b/dev-lang/tcc/tcc-0.9.26.recipe
@@ -38,11 +38,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/dev-lang/tcl/tcl-8.5.15.recipe b/dev-lang/tcl/tcl-8.5.15.recipe
index b2c21199c..3deeeb951 100644
--- a/dev-lang/tcl/tcl-8.5.15.recipe
+++ b/dev-lang/tcl/tcl-8.5.15.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:make
 	cmd:gcc
diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe
index dee8be742..4b4b96b50 100644
--- a/dev-lang/tcl/tcl-8.5.9.recipe
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:make
 	cmd:gcc
diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe
index df4858b8a..77acb6220 100644
--- a/dev-lang/v8/v8-3.16.1.recipe
+++ b/dev-lang/v8/v8-3.16.1.recipe
@@ -38,13 +38,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:python
diff --git a/dev-lang/xamos/xamos-0.29.recipe b/dev-lang/xamos/xamos-0.29.recipe
index 0f9ae89dd..045a27479 100644
--- a/dev-lang/xamos/xamos-0.29.recipe
+++ b/dev-lang/xamos/xamos-0.29.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:sdl_image
 	devel:sdl_mixer
diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
index 76692b48f..6c28db0fa 100644
--- a/dev-lang/yab/yab-1.7.02.recipe
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -27,12 +27,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 
diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe
index 30336a0d6..65f7139b9 100644
--- a/dev-lang/yasm/yasm-1.1.0.recipe
+++ b/dev-lang/yasm/yasm-1.1.0.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	lib:libyasm = 1.1.0 compat >= 1.1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe
index 95d7575bc..bfe44d291 100644
--- a/dev-lang/yasm/yasm-1.2.0.recipe
+++ b/dev-lang/yasm/yasm-1.2.0.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 	devel:libyasm = $portVersion compat >= 1.2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe
index 6928dafe4..ae6bf599d 100644
--- a/dev-libs/apr/apr-1.4.6.recipe
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -14,12 +14,12 @@ PROVIDES="
 	lib:libapr_1 = 0.4.6 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index 4c42f26ff..32f103d6c 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
index 0cb40c651..be2bff01d 100644
--- a/dev-libs/apr_util/apr_util-1.3.10.recipe
+++ b/dev-libs/apr_util/apr_util-1.3.10.recipe
@@ -13,7 +13,7 @@ PROVIDES="
 	lib:libaprutil_1 = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	apr >= 1.3.9
 	expat >= 2.0
 	"
@@ -21,7 +21,7 @@ BUILD_REQUIRES="
 	$REQUIRES
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
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 cd19d3aa6..dc4c23c11 100644
--- a/dev-libs/apr_util/apr_util-1.4.1.recipe
+++ b/dev-libs/apr_util/apr_util-1.4.1.recipe
@@ -14,7 +14,7 @@ PROVIDES="
 	lib:libaprutil_1 = 0.4.1 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libapr_1
 	lib:libexpat
 	lib:libiconv
@@ -25,7 +25,7 @@ BUILD_REQUIRES="
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
diff --git a/dev-libs/apr_util/apr_util-1.5.3.recipe b/dev-libs/apr_util/apr_util-1.5.3.recipe
index 82b307208..d07bfa752 100644
--- a/dev-libs/apr_util/apr_util-1.5.3.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.3.recipe
@@ -14,7 +14,7 @@ PROVIDES="
 	lib:libaprutil_1 = 0.5.3 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libapr_1
 	lib:libexpat
 	lib:libiconv
@@ -25,7 +25,7 @@ BUILD_REQUIRES="
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
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 14c99b0f6..c09a934bd 100644
--- a/dev-libs/apr_util/apr_util-1.5.4.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.4.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libapr_1$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
index a2d049729..887ce87ad 100644
--- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
+++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
@@ -23,13 +23,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index d05f56c8b..4792a93d3 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	boost_atomic$secondaryArchSuffix == $portVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
 	boost_context$secondaryArchSuffix == $portVersion
@@ -54,7 +54,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix
@@ -182,7 +182,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	boost$secondaryArchSuffix == $portVersion
 	boost_atomic$secondaryArchSuffix == $portVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
@@ -215,7 +215,7 @@ PROVIDES_atomic="
 	"
 
 REQUIRES_atomic="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -226,7 +226,7 @@ PROVIDES_chrono="
 	"
 
 REQUIRES_chrono="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
@@ -238,7 +238,7 @@ PROVIDES_context="
 	"
 
 REQUIRES_context="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -249,7 +249,7 @@ PROVIDES_coroutine="
 	"
 
 REQUIRES_coroutine="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_context$secondaryArchSuffix == $portVersion
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libstdc++$secondaryArchSuffix
@@ -262,7 +262,7 @@ PROVIDES_date_time="
 	"
 
 REQUIRES_date_time="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -273,7 +273,7 @@ REQUIRES_date_time="
 #	"
 
 #REQUIRES_exception="
-#	haiku$secondaryArchSuffix >= $haikuVersion
+#	haiku$secondaryArchSuffix
 #	"
 
 PROVIDES_filesystem="
@@ -282,7 +282,7 @@ PROVIDES_filesystem="
 	"
 
 REQUIRES_filesystem="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
@@ -296,7 +296,7 @@ PROVIDES_graph="
 	"
 
 REQUIRES_graph="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_regex$secondaryArchSuffix == $portVersion
 	lib:libicuuc$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
@@ -311,7 +311,7 @@ PROVIDES_iostreams="
 	"
 
 REQUIRES_iostreams="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
@@ -324,7 +324,7 @@ PROVIDES_locale="
 	"
 
 REQUIRES_locale="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix == $portVersion
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libboost_thread$secondaryArchSuffix == $portVersion
@@ -342,7 +342,7 @@ PROVIDES_log="
 	"
 
 REQUIRES_log="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix == $portVersion
 	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
 	lib:libboost_system$secondaryArchSuffix == $portVersion
@@ -363,7 +363,7 @@ PROVIDES_math="
 	"
 
 REQUIRES_math="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -374,7 +374,7 @@ PROVIDES_program_options="
 	"
 
 REQUIRES_program_options="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -385,7 +385,7 @@ PROVIDES_random="
 	"
 
 REQUIRES_random="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -396,7 +396,7 @@ PROVIDES_regex="
 	"
 
 REQUIRES_regex="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
@@ -411,7 +411,7 @@ PROVIDES_serialization="
 	"
 
 REQUIRES_serialization="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -422,7 +422,7 @@ PROVIDES_signals="
 	"
 
 REQUIRES_signals="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -433,7 +433,7 @@ PROVIDES_system="
 	"
 
 REQUIRES_system="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -445,7 +445,7 @@ PROVIDES_test="
 	"
 
 REQUIRES_test="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -456,7 +456,7 @@ PROVIDES_thread="
 	"
 
 REQUIRES_thread="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
@@ -468,7 +468,7 @@ PROVIDES_timer="
 	"
 
 REQUIRES_timer="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix == $portVersion
 	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libstdc++$secondaryArchSuffix
@@ -481,7 +481,7 @@ PROVIDES_unit_test_framework="
 	"
 
 REQUIRES_unit_test_framework="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -492,7 +492,7 @@ PROVIDES_wave="
 	"
 
 REQUIRES_wave="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix == $portVersion
 	lib:libboost_date_time$secondaryArchSuffix == $portVersion
 	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
diff --git a/dev-libs/check/check-0.9.13.recipe b/dev-libs/check/check-0.9.13.recipe
index 75bdd1639..7aaaa991c 100644
--- a/dev-libs/check/check-0.9.13.recipe
+++ b/dev-libs/check/check-0.9.13.recipe
@@ -23,11 +23,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/dev-libs/check/check-0.9.14.recipe b/dev-libs/check/check-0.9.14.recipe
index 45f89e5e2..3527d7f54 100644
--- a/dev-libs/check/check-0.9.14.recipe
+++ b/dev-libs/check/check-0.9.14.recipe
@@ -26,11 +26,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe
index 877e0b6c4..138ace4bd 100644
--- a/dev-libs/chmlib/chmlib-0.40.recipe
+++ b/dev-libs/chmlib/chmlib-0.40.recipe
@@ -26,10 +26,10 @@ PROVIDES="
 	lib:libchm$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/dev-libs/cloog/cloog-0.18.1.recipe b/dev-libs/cloog/cloog-0.18.1.recipe
index 1b639b3be..5d02e4ce5 100644
--- a/dev-libs/cloog/cloog-0.18.1.recipe
+++ b/dev-libs/cloog/cloog-0.18.1.recipe
@@ -30,12 +30,12 @@ PROVIDES="
 	lib:libcloog_isl$secondaryArchSuffix = 4.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libisl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix
 	devel:libisl$secondaryArchSuffix
 	"
diff --git a/dev-libs/confuse/confuse-2.7.recipe b/dev-libs/confuse/confuse-2.7.recipe
index f82b8537e..5b9947346 100644
--- a/dev-libs/confuse/confuse-2.7.recipe
+++ b/dev-libs/confuse/confuse-2.7.recipe
@@ -26,13 +26,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 
diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe
index 4dbc09bff..73712a093 100644
--- a/dev-libs/cyassl/cyassl-2.8.0.recipe
+++ b/dev-libs/cyassl/cyassl-2.8.0.recipe
@@ -17,14 +17,14 @@ PROVIDES="
 	lib:libcyassl$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe
index 379849856..3cc8366c3 100644
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/expat/expat-2.1.0.recipe b/dev-libs/expat/expat-2.1.0.recipe
index b0bb7ea70..32003d061 100644
--- a/dev-libs/expat/expat-2.1.0.recipe
+++ b/dev-libs/expat/expat-2.1.0.recipe
@@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe
index e2eff5772..37bc7e780 100644
--- a/dev-libs/fribidi/fribidi-0.19.5.recipe
+++ b/dev-libs/fribidi/fribidi-0.19.5.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-libs/fribidi/fribidi-0.19.6.recipe b/dev-libs/fribidi/fribidi-0.19.6.recipe
index d8a638bda..0f6910c99 100644
--- a/dev-libs/fribidi/fribidi-0.19.6.recipe
+++ b/dev-libs/fribidi/fribidi-0.19.6.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index 92be8b050..38744b2b0 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -36,11 +36,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe
index a24266264..abdae921c 100644
--- a/dev-libs/glib/glib2-2.38.1.recipe
+++ b/dev-libs/glib/glib2-2.38.1.recipe
@@ -52,7 +52,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	gettext$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -68,7 +68,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
diff --git a/dev-libs/gmp/gmp-5.1.3.recipe b/dev-libs/gmp/gmp-5.1.3.recipe
index 8abc19575..8b75cfa20 100644
--- a/dev-libs/gmp/gmp-5.1.3.recipe
+++ b/dev-libs/gmp/gmp-5.1.3.recipe
@@ -22,10 +22,10 @@ PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
 	lib:libgmp$secondaryArchSuffix = 10.1.3 compat >= 10
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe
index b90da91fb..c322f55b7 100644
--- a/dev-libs/gmp/gmp-6.0.0.recipe
+++ b/dev-libs/gmp/gmp-6.0.0.recipe
@@ -23,10 +23,10 @@ PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 6.0
 	lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe
index 272604b39..cc388dcc7 100644
--- a/dev-libs/gnulib/gnulib-2013_12_17.recipe
+++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="" # No build, no requirements
diff --git a/dev-libs/hyphen/hyphen-2.8.8.recipe b/dev-libs/hyphen/hyphen-2.8.8.recipe
index 7366fc354..51649358d 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.recipe
+++ b/dev-libs/hyphen/hyphen-2.8.8.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	cmd:substrings.pl$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe
index 79708cb1f..dc85b3b00 100644
--- a/dev-libs/icu/icu-4.8.1.1.recipe
+++ b/dev-libs/icu/icu-4.8.1.1.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/dev-libs/icu/icu-54.1.recipe b/dev-libs/icu/icu-54.1.recipe
index 36c2194ed..f9aaf63ee 100644
--- a/dev-libs/icu/icu-54.1.recipe
+++ b/dev-libs/icu/icu-54.1.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	lib:libicuuc$secondaryArchSuffix = 54.1 compat >= 54
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -31,7 +31,7 @@ fi
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/isl/isl-0.13.recipe b/dev-libs/isl/isl-0.13.recipe
index a4bae4847..d6ce98d19 100644
--- a/dev-libs/isl/isl-0.13.recipe
+++ b/dev-libs/isl/isl-0.13.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 	lib:libisl$secondaryArchSuffix = 13.0.0 compat >= 13
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10.1.3
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix >= 10.1.3
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/isl/isl-0.14.recipe b/dev-libs/isl/isl-0.14.recipe
index a598e2eae..1dd681ad0 100644
--- a/dev-libs/isl/isl-0.14.recipe
+++ b/dev-libs/isl/isl-0.14.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 	lib:libisl$secondaryArchSuffix = 13.1.0 compat >= 13
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix >= 10.1.3
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix >= 10.1.3
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/jansson/jansson-2.5.recipe b/dev-libs/jansson/jansson-2.5.recipe
index e5f8073c3..f2ec4dc88 100644
--- a/dev-libs/jansson/jansson-2.5.recipe
+++ b/dev-libs/jansson/jansson-2.5.recipe
@@ -24,14 +24,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
diff --git a/dev-libs/json_c/json_c-0.12.recipe b/dev-libs/json_c/json_c-0.12.recipe
index 75493ab67..1f2f43fb0 100644
--- a/dev-libs/json_c/json_c-0.12.recipe
+++ b/dev-libs/json_c/json_c-0.12.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	lib:libjson_c = 2.0.1 compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:gcc
diff --git a/dev-libs/libassuan/libassuan-2.1.3.recipe b/dev-libs/libassuan/libassuan-2.1.3.recipe
index 4f19e3d4b..004a168a3 100644
--- a/dev-libs/libassuan/libassuan-2.1.3.recipe
+++ b/dev-libs/libassuan/libassuan-2.1.3.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgpg_error${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgpg_error${secondaryArchSuffix}
 	"
 
diff --git a/dev-libs/libcdio/libcdio-0.92.recipe b/dev-libs/libcdio/libcdio-0.92.recipe
index b96c6bf8e..089a5bb5e 100644
--- a/dev-libs/libcdio/libcdio-0.92.recipe
+++ b/dev-libs/libcdio/libcdio-0.92.recipe
@@ -33,7 +33,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe
index b9c8b138b..990ce95e1 100644
--- a/dev-libs/libclaw/libclaw-1.7.4.recipe
+++ b/dev-libs/libclaw/libclaw-1.7.4.recipe
@@ -44,7 +44,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -52,7 +52,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -101,6 +101,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libclaw$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe
index 223fa1316..eefe9126d 100644
--- a/dev-libs/libdwarf/libdwarf-20130729.recipe
+++ b/dev-libs/libdwarf/libdwarf-20130729.recipe
@@ -47,12 +47,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libelf$secondaryArchSuffix
 	"
 
diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.0.recipe
index 6bab30d64..3957bf4ce 100644
--- a/dev-libs/libebml/libebml-1.3.0.recipe
+++ b/dev-libs/libebml/libebml-1.3.0.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	lib:libebml$secondaryArchSuffix = 4
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-libs/libedit/libedit-2014_10_30_3.1.recipe b/dev-libs/libedit/libedit-2014_10_30_3.1.recipe
index f5880a2b6..8c2dda9b5 100644
--- a/dev-libs/libedit/libedit-2014_10_30_3.1.recipe
+++ b/dev-libs/libedit/libedit-2014_10_30_3.1.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	lib:libedit$secondaryArchSuffix = 0.0.52 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe
index 6bf8245ee..cb805ffd2 100644
--- a/dev-libs/libelf/libelf-0.8.13.recipe
+++ b/dev-libs/libelf/libelf-0.8.13.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	lib:libelf$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index c63da7b12..3c56fb503 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -23,13 +23,13 @@ PROVIDES="
 	lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index 4eb7d6fb5..4d467655a 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -34,14 +34,14 @@ PROVIDES="
 	lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	cmd:python
 	"
 #	haiku${secondaryArchSuffix} doesn't define included libraries yet
-#	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
+#	lib:libnetwork$secondaryArchSuffix
 BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libffi/libffi-3.0.13.recipe b/dev-libs/libffi/libffi-3.0.13.recipe
index 811077300..5bcde0c5a 100644
--- a/dev-libs/libffi/libffi-3.0.13.recipe
+++ b/dev-libs/libffi/libffi-3.0.13.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
diff --git a/dev-libs/libffi/libffi-3.2.1.recipe b/dev-libs/libffi/libffi-3.2.1.recipe
index 80d18f53f..23d40ca3f 100644
--- a/dev-libs/libffi/libffi-3.2.1.recipe
+++ b/dev-libs/libffi/libffi-3.2.1.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
index f7d6e9146..31868f7a5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgpg_error
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libgpg_error
 	"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
index a520e9f33..b494cd769 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libgpg_error${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgpg_error${secondaryArchSuffix}
 	"
 
@@ -62,6 +62,6 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	libgcrypt${secondaryArchSuffix} == $portVersion base
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libgpg_error${secondaryArchSuffix}
 	"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe
index 8d0a0e671..158f521b1 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libgpg_error${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgpg_error${secondaryArchSuffix}
 	"
 
@@ -62,6 +62,6 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	libgcrypt${secondaryArchSuffix} == $portVersion base
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libgpg_error${secondaryArchSuffix}
 	"
diff --git a/dev-libs/libgpg_error/libgpg_error-1.17.recipe b/dev-libs/libgpg_error/libgpg_error-1.17.recipe
index 35186975f..60b80cdb6 100644
--- a/dev-libs/libgpg_error/libgpg_error-1.17.recipe
+++ b/dev-libs/libgpg_error/libgpg_error-1.17.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe
index fc79a1225..95bb09f51 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.recipe
+++ b/dev-libs/libiconv/libiconv-1.13.1.recipe
@@ -26,12 +26,12 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe
index aa7268aa0..1f09afd2b 100644
--- a/dev-libs/libidl/libidl-0.6.8.recipe
+++ b/dev-libs/libidl/libidl-0.6.8.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libglib$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libglib$secondaryArchSuffix
 	"
 
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
index a45bb00fc..1e3988ceb 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 PROVIDES_devel="
@@ -37,7 +37,7 @@ REQUIRES_devel="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe
index a34e8ded8..9e05fac27 100644
--- a/dev-libs/libpcre/libpcre-8.21.recipe
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -34,12 +34,12 @@ PROVIDES="$PROVIDES
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe
index d50c21a9b..e0de75375 100644
--- a/dev-libs/libpcre/libpcre-8.33.recipe
+++ b/dev-libs/libpcre/libpcre-8.33.recipe
@@ -34,12 +34,12 @@ PROVIDES="$PROVIDES
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libpcre/libpcre-8.36.recipe b/dev-libs/libpcre/libpcre-8.36.recipe
index 181461f29..b2c65fe5e 100644
--- a/dev-libs/libpcre/libpcre-8.36.recipe
+++ b/dev-libs/libpcre/libpcre-8.36.recipe
@@ -34,12 +34,12 @@ PROVIDES="$PROVIDES
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libpcre/libpcre0-8.21.recipe b/dev-libs/libpcre/libpcre0-8.21.recipe
index d9357b3fd..cdce583dd 100644
--- a/dev-libs/libpcre/libpcre0-8.21.recipe
+++ b/dev-libs/libpcre/libpcre0-8.21.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
index a198e21b1..490b4b5d6 100644
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -18,14 +18,14 @@ PROVIDES="
 	devel:libpthread_stubs$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/dev-libs/librevenge/librevenge-0.0.0.recipe b/dev-libs/librevenge/librevenge-0.0.0.recipe
index d55003fd7..38b5f626e 100644
--- a/dev-libs/librevenge/librevenge-0.0.0.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.0.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	lib:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_filesystem$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-libs/librevenge/librevenge-0.0.1.recipe b/dev-libs/librevenge/librevenge-0.0.1.recipe
index 5d626a136..8f10a258c 100644
--- a/dev-libs/librevenge/librevenge-0.0.1.recipe
+++ b/dev-libs/librevenge/librevenge-0.0.1.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	lib:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_filesystem$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -41,7 +41,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoheader
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
index 921e0572a..204436253 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
@@ -10,12 +10,12 @@ ARCHITECTURES="x86_gcc2 ?x86"
 PROVIDES="libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion"
-REQUIRES="haiku >= $haikuVersion
+REQUIRES="haiku
 	lib:libexpat >= 1.5
 	lib:libz
 	"
 BUILD_REQUIRES="$REQUIRES"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
index 1a7e22288..b9edf6fad 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
@@ -10,12 +10,12 @@ ARCHITECTURES="x86_gcc2 ?x86"
 PROVIDES="libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion"
-REQUIRES="haiku >= $haikuVersion
+REQUIRES="haiku
 	lib:libexpat >= 1.5
 	lib:libz
 	"
 BUILD_REQUIRES="$REQUIRES"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
index 1f19d399e..8410e24e7 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
@@ -11,7 +11,7 @@ PROVIDES="libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion
 	"
-REQUIRES="haiku >= $haikuVersion
+REQUIRES="haiku
 	lib:libexpat
 	lib:libz
 	"
@@ -19,7 +19,7 @@ BUILD_REQUIRES="
 	devel:libexpat
 	devel:libz
 	"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
+BUILD_PREREQUIRES="haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
index 846d14650..61c0fc94c 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
@@ -14,7 +14,7 @@ PROVIDES="
 	lib:libsolvext$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -23,7 +23,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
index d78705f29..8806eadcc 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	lib:libsolvext$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/dev-libs/libtar/libtar-1.2.20.recipe b/dev-libs/libtar/libtar-1.2.20.recipe
index 6bd5455df..b1375a454 100644
--- a/dev-libs/libtar/libtar-1.2.20.recipe
+++ b/dev-libs/libtar/libtar-1.2.20.recipe
@@ -23,10 +23,10 @@ PROVIDES="
 	lib:libtar${secondaryArchSuffix} = 0.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
diff --git a/dev-libs/libtasn1/libtasn1-4.2.recipe b/dev-libs/libtasn1/libtasn1-4.2.recipe
index 025addfcd..3fe238562 100644
--- a/dev-libs/libtasn1/libtasn1-4.2.recipe
+++ b/dev-libs/libtasn1/libtasn1-4.2.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	cmd:asn1Parser$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/dev-libs/libtommath/libtommath-0.42.0.recipe b/dev-libs/libtommath/libtommath-0.42.0.recipe
index d1fcad3a9..49dbf4c16 100644
--- a/dev-libs/libtommath/libtommath-0.42.0.recipe
+++ b/dev-libs/libtommath/libtommath-0.42.0.recipe
@@ -22,16 +22,16 @@ PROVIDES_devel="
               "
 
 REQUIRES="
-        haiku$secondaryArchSuffix >= $haikuVersion
+        haiku$secondaryArchSuffix
         "
         
 REQUIRES_devel="
-              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              haiku${secondaryArchSuffix}_devel
               libtommath$secondaryArchSuffix == $portVersion base
               "
 
 BUILD_REQUIRES="
-              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              haiku${secondaryArchSuffix}_devel
               cmd:make
               cmd:cc
               cmd:ar
diff --git a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
index 867f53142..c8264cb3e 100644
--- a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
+++ b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	cmd:libusb_config$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	"
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 	devel:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:libtool
diff --git a/dev-libs/libusb/libusb-1.0.19.recipe b/dev-libs/libusb/libusb-1.0.19.recipe
index a43cf62ca..de73f2e0b 100644
--- a/dev-libs/libusb/libusb-1.0.19.recipe
+++ b/dev-libs/libusb/libusb-1.0.19.recipe
@@ -38,7 +38,7 @@ PROVIDES="
 	lib:libusb_1.0$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -51,7 +51,7 @@ fi
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:find
diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe
index da585ccd7..2a172bf80 100644
--- a/dev-libs/libxml2/libxml2-2.8.0.recipe
+++ b/dev-libs/libxml2/libxml2-2.8.0.recipe
@@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -53,8 +53,8 @@ if $pythonModuleEnabled; then
 fi
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	lib:libicudata$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-libs/libxml2/libxml2-2.9.1.recipe b/dev-libs/libxml2/libxml2-2.9.1.recipe
index 47729a43c..2c9491ca5 100644
--- a/dev-libs/libxml2/libxml2-2.9.1.recipe
+++ b/dev-libs/libxml2/libxml2-2.9.1.recipe
@@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -53,8 +53,8 @@ if $pythonModuleEnabled; then
 fi
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	lib:libicudata$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-libs/libxml2/libxml2-2.9.2.recipe b/dev-libs/libxml2/libxml2-2.9.2.recipe
index b9239ee23..5b19d6f69 100644
--- a/dev-libs/libxml2/libxml2-2.9.2.recipe
+++ b/dev-libs/libxml2/libxml2-2.9.2.recipe
@@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -53,8 +53,8 @@ if $pythonModuleEnabled; then
 fi
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	lib:libicudata$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe
index f3df75f24..f6d2e5a31 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.recipe
+++ b/dev-libs/libxslt/libxslt-1.1.28.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:libtoolize
diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe
index 10cae8a6e..5aea6a415 100644
--- a/dev-libs/libzip/libzip-0.10.1.recipe
+++ b/dev-libs/libzip/libzip-0.10.1.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	cmd:ziptorrent${secondaryArchSuffix}
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe
index b88c0d0d9..86ff4ab69 100644
--- a/dev-libs/libzip/libzip-0.11.2.recipe
+++ b/dev-libs/libzip/libzip-0.11.2.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	cmd:ziptorrent${secondaryArchSuffix}
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-libs/lzo/lzo-2.06.recipe b/dev-libs/lzo/lzo-2.06.recipe
index 1798a7d80..3233de18d 100644
--- a/dev-libs/lzo/lzo-2.06.recipe
+++ b/dev-libs/lzo/lzo-2.06.recipe
@@ -33,11 +33,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:awk
diff --git a/dev-libs/nspr/nspr-4.10.6.recipe b/dev-libs/nspr/nspr-4.10.6.recipe
index a2bde0a5e..34c117777 100644
--- a/dev-libs/nspr/nspr-4.10.6.recipe
+++ b/dev-libs/nspr/nspr-4.10.6.recipe
@@ -32,12 +32,12 @@ PROVIDES="
 	lib:libplds4$secondaryArchSuffix = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:aclocal
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/nspr/nspr-4.10.7.recipe b/dev-libs/nspr/nspr-4.10.7.recipe
index c1761c43f..1a12568cc 100644
--- a/dev-libs/nspr/nspr-4.10.7.recipe
+++ b/dev-libs/nspr/nspr-4.10.7.recipe
@@ -32,12 +32,12 @@ PROVIDES="
 	lib:libplds4$secondaryArchSuffix = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:aclocal
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/nss/nss-3.16.3.recipe b/dev-libs/nss/nss-3.16.3.recipe
index a23f6e12f..b4fadc9f0 100644
--- a/dev-libs/nss/nss-3.16.3.recipe
+++ b/dev-libs/nss/nss-3.16.3.recipe
@@ -92,13 +92,13 @@ PROVIDES="
 	lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libnspr4${secondaryArchSuffix} >= 4
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libnspr4${secondaryArchSuffix} >= 4
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libz${secondaryArchSuffix}
diff --git a/dev-libs/nss/nss-3.16.5.recipe b/dev-libs/nss/nss-3.16.5.recipe
index 297113144..d4bdb2c9b 100644
--- a/dev-libs/nss/nss-3.16.5.recipe
+++ b/dev-libs/nss/nss-3.16.5.recipe
@@ -92,13 +92,13 @@ PROVIDES="
 	lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libnspr4${secondaryArchSuffix} >= 4
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libnspr4${secondaryArchSuffix} >= 4
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libz${secondaryArchSuffix}
diff --git a/dev-libs/openssl/openssl-1.0.0n.recipe b/dev-libs/openssl/openssl-1.0.0n.recipe
index 7861a6d28..1f9f93725 100644
--- a/dev-libs/openssl/openssl-1.0.0n.recipe
+++ b/dev-libs/openssl/openssl-1.0.0n.recipe
@@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 if [ -n "$secondaryArchSuffix" ]; then
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/dev-libs/openssl/openssl-1.0.0o.recipe b/dev-libs/openssl/openssl-1.0.0o.recipe
index edbcfc882..c1cd4de04 100644
--- a/dev-libs/openssl/openssl-1.0.0o.recipe
+++ b/dev-libs/openssl/openssl-1.0.0o.recipe
@@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 if [ -n "$secondaryArchSuffix" ]; then
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/dev-libs/openssl/openssl-1.0.1g.recipe b/dev-libs/openssl/openssl-1.0.1g.recipe
index fce0a8dc6..bafc61ee5 100644
--- a/dev-libs/openssl/openssl-1.0.1g.recipe
+++ b/dev-libs/openssl/openssl-1.0.1g.recipe
@@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 if [ -n "$secondaryArchSuffix" ]; then
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/dev-libs/openssl/openssl-1.0.1h.recipe b/dev-libs/openssl/openssl-1.0.1h.recipe
index 859766d91..a757d73b6 100644
--- a/dev-libs/openssl/openssl-1.0.1h.recipe
+++ b/dev-libs/openssl/openssl-1.0.1h.recipe
@@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	ca_root_certificates
 	"
@@ -54,7 +54,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/dev-libs/polarssl/polarssl-1.3.7.recipe b/dev-libs/polarssl/polarssl-1.3.7.recipe
index adf1f4b80..0eb0c9980 100644
--- a/dev-libs/polarssl/polarssl-1.3.7.recipe
+++ b/dev-libs/polarssl/polarssl-1.3.7.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:cmake
diff --git a/dev-libs/polarssl/polarssl-1.3.8.recipe b/dev-libs/polarssl/polarssl-1.3.8.recipe
index 8e0dcb633..2d9a122e4 100644
--- a/dev-libs/polarssl/polarssl-1.3.8.recipe
+++ b/dev-libs/polarssl/polarssl-1.3.8.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:cmake
diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe
index c3a30e42b..c3e996159 100644
--- a/dev-libs/popt/popt-1.16.recipe
+++ b/dev-libs/popt/popt-1.16.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	lib:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:libtoolize
diff --git a/dev-libs/protobuf/protobuf-2.4.1.recipe b/dev-libs/protobuf/protobuf-2.4.1.recipe
index f72d05f40..e616b0031 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.recipe
+++ b/dev-libs/protobuf/protobuf-2.4.1.recipe
@@ -26,13 +26,13 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
index 0bc6193b3..7aa37a64d 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	lib:libtinyxml$secondaryArchSuffix = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -31,7 +31,7 @@ fi
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe
index e87544cf0..b90243a4f 100644
--- a/dev-libs/tinyxml2/tinyxml2-2.recipe
+++ b/dev-libs/tinyxml2/tinyxml2-2.recipe
@@ -18,10 +18,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-libs/udis86/udis86-1.7.2.recipe b/dev-libs/udis86/udis86-1.7.2.recipe
index 9a9109c7d..fd3952b15 100644
--- a/dev-libs/udis86/udis86-1.7.2.recipe
+++ b/dev-libs/udis86/udis86-1.7.2.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
index 9b4241b95..f9d12d3ec 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lua >= 5.2
 	"
 
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe b/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe
index 7cac49304..481da4454 100644
--- a/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe
+++ b/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/dev-perl/html_parser/html_parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe
index 746baa915..6586d6050 100644
--- a/dev-perl/html_parser/html_parser-3.70.recipe
+++ b/dev-perl/html_parser/html_parser-3.70.recipe
@@ -10,7 +10,7 @@ PROVIDES="
 	html_parser = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	perl
 	"
 COPYRIGHT="
@@ -23,7 +23,7 @@ LICENSE="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl"
diff --git a/dev-perl/html_parser/html_parser-3.71.recipe b/dev-perl/html_parser/html_parser-3.71.recipe
index b1968d4c7..71b9f2b62 100644
--- a/dev-perl/html_parser/html_parser-3.71.recipe
+++ b/dev-perl/html_parser/html_parser-3.71.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 	html_parser = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	perl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe
index fa524dade..e78aecfbe 100644
--- a/dev-perl/xml_parser/xml_parser-2.36.recipe
+++ b/dev-perl/xml_parser/xml_parser-2.36.recipe
@@ -15,13 +15,13 @@ PROVIDES="
 	xml_parser = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libexpat
 	perl
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libexpat
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-python/argh/argh-0.26.1.recipe b/dev-python/argh/argh-0.26.1.recipe
index 954eabb67..e0cdbfafc 100644
--- a/dev-python/argh/argh-0.26.1.recipe
+++ b/dev-python/argh/argh-0.26.1.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	python_setuptools
 	"
 
diff --git a/dev-python/cython/cython-0.20.2.recipe b/dev-python/cython/cython-0.20.2.recipe
index 9ff03fa10..9c0c17c09 100644
--- a/dev-python/cython/cython-0.20.2.recipe
+++ b/dev-python/cython/cython-0.20.2.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:python
diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe
index 5d0125c4a..eeb948ed6 100644
--- a/dev-python/docutils/docutils-0.11.recipe
+++ b/dev-python/docutils/docutils-0.11.recipe
@@ -34,13 +34,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 
diff --git a/dev-python/dulwich/dulwich-0.9.7.recipe b/dev-python/dulwich/dulwich-0.9.7.recipe
index 560e5c3ea..088b9dbff 100644
--- a/dev-python/dulwich/dulwich-0.9.7.recipe
+++ b/dev-python/dulwich/dulwich-0.9.7.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:gcc
 	"
diff --git a/dev-python/imaging/python_imaging-1.1.7.recipe b/dev-python/imaging/python_imaging-1.1.7.recipe
index 249abdc3e..25c90fba6 100644
--- a/dev-python/imaging/python_imaging-1.1.7.recipe
+++ b/dev-python/imaging/python_imaging-1.1.7.recipe
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel$secondaryArchSuffix >= $haikuVersion
+	haiku_devel$secondaryArchSuffix
 	cmd:gcc
 	cmd:python
 "
diff --git a/dev-python/iniparse/iniparse-0.4.recipe b/dev-python/iniparse/iniparse-0.4.recipe
index a07bc555b..2abd99603 100644
--- a/dev-python/iniparse/iniparse-0.4.recipe
+++ b/dev-python/iniparse/iniparse-0.4.recipe
@@ -33,12 +33,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:python$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-python/lxml/python_lxml-3.3.5.recipe b/dev-python/lxml/python_lxml-3.3.5.recipe
index 90bf1a573..c9f131acb 100644
--- a/dev-python/lxml/python_lxml-3.3.5.recipe
+++ b/dev-python/lxml/python_lxml-3.3.5.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -39,7 +39,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/dev-python/mechanize/python_mechanize-0.2.5.recipe b/dev-python/mechanize/python_mechanize-0.2.5.recipe
index c12dd74ec..f8c809d01 100644
--- a/dev-python/mechanize/python_mechanize-0.2.5.recipe
+++ b/dev-python/mechanize/python_mechanize-0.2.5.recipe
@@ -42,13 +42,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:python
 	python_setuptools
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	python_setuptools
 	"
 
diff --git a/dev-python/mock/python_mock-1.0.1.recipe b/dev-python/mock/python_mock-1.0.1.recipe
index ba2d9764c..db320df76 100644
--- a/dev-python/mock/python_mock-1.0.1.recipe
+++ b/dev-python/mock/python_mock-1.0.1.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 
diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe
index 68eb1e0dd..58fa8d2e5 100644
--- a/dev-python/ordereddict/ordereddict-1.1.recipe
+++ b/dev-python/ordereddict/ordereddict-1.1.recipe
@@ -18,14 +18,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python < 2.7
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python < 2.7
 	"
 
diff --git a/dev-python/pathtools/pathtools-0.1.2.recipe b/dev-python/pathtools/pathtools-0.1.2.recipe
index 0cda667d2..103c7905b 100644
--- a/dev-python/pathtools/pathtools-0.1.2.recipe
+++ b/dev-python/pathtools/pathtools-0.1.2.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	python_setuptools
 	"
 
diff --git a/dev-python/pygame/pygame-1.9.1.recipe b/dev-python/pygame/pygame-1.9.1.recipe
index 4290a985e..824913455 100644
--- a/dev-python/pygame/pygame-1.9.1.recipe
+++ b/dev-python/pygame/pygame-1.9.1.recipe
@@ -51,7 +51,7 @@ REQUIRES="
 #	portmap  |
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	python >= 2.6.4
 	gcc${secondaryArchSuffix}
 	libsdl${secondaryArchSuffix}_devel >= 1.2.14
diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-1.6.recipe
index 833272325..632cd6bbf 100644
--- a/dev-python/pygments/pygments-1.6.recipe
+++ b/dev-python/pygments/pygments-1.6.recipe
@@ -29,12 +29,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:python$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-python/python_dateutil/python_dateutil-1.5.recipe b/dev-python/python_dateutil/python_dateutil-1.5.recipe
index 1a6acf800..ad556d586 100644
--- a/dev-python/python_dateutil/python_dateutil-1.5.recipe
+++ b/dev-python/python_dateutil/python_dateutil-1.5.recipe
@@ -21,13 +21,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	#python_setuptools
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	python_setuptools
 	"
 
diff --git a/dev-python/python_setuptools/python_setuptools-5.3.recipe b/dev-python/python_setuptools/python_setuptools-5.3.recipe
index 8ec7dde6f..ef864736a 100644
--- a/dev-python/python_setuptools/python_setuptools-5.3.recipe
+++ b/dev-python/python_setuptools/python_setuptools-5.3.recipe
@@ -18,14 +18,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:sed
 	"
diff --git a/dev-python/pyyaml/pyyaml-3.11.recipe b/dev-python/pyyaml/pyyaml-3.11.recipe
index 19ad24e4c..c0607c714 100644
--- a/dev-python/pyyaml/pyyaml-3.11.recipe
+++ b/dev-python/pyyaml/pyyaml-3.11.recipe
@@ -31,13 +31,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 #TODO: eventually depend on http://pyyaml.org/wiki/LibYAML
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:sed
 	python_setuptools
 	"
diff --git a/dev-python/requests/python_requests-2.3.0.recipe b/dev-python/requests/python_requests-2.3.0.recipe
index ddc46a0e6..4c18ed21f 100644
--- a/dev-python/requests/python_requests-2.3.0.recipe
+++ b/dev-python/requests/python_requests-2.3.0.recipe
@@ -22,14 +22,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	# actually has its own copy...
 	#ca_root_certificates
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-python/twisted/python_twisted-13.2.0.recipe b/dev-python/twisted/python_twisted-13.2.0.recipe
index fb3af8b87..c0a04735f 100644
--- a/dev-python/twisted/python_twisted-13.2.0.recipe
+++ b/dev-python/twisted/python_twisted-13.2.0.recipe
@@ -67,7 +67,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	python_zope.interface >= 3.6.0
 	cmd:python
 	"
@@ -77,7 +77,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:gcc
 	"
diff --git a/dev-python/urllib3/urllib3-1.9.1.recipe b/dev-python/urllib3/urllib3-1.9.1.recipe
index 50bbe7846..d800d3f29 100644
--- a/dev-python/urllib3/urllib3-1.9.1.recipe
+++ b/dev-python/urllib3/urllib3-1.9.1.recipe
@@ -32,12 +32,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-python/watchdog/watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe
index bf2ef3f52..602e6cb07 100644
--- a/dev-python/watchdog/watchdog-0.8.2.recipe
+++ b/dev-python/watchdog/watchdog-0.8.2.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	argh
 	pathtools
@@ -29,7 +29,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	python_setuptools
 	"
 
diff --git a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe
index 5fda124cd..362500581 100644
--- a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe
+++ b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 
diff --git a/dev-qt/automoc/automoc-0.9.88.recipe b/dev-qt/automoc/automoc-0.9.88.recipe
index 793e17888..291d2ec24 100644
--- a/dev-qt/automoc/automoc-0.9.88.recipe
+++ b/dev-qt/automoc/automoc-0.9.88.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	"
 
@@ -35,7 +35,7 @@ BUILD_PREREQUIRES="
 	"	
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	"
 
diff --git a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
index 647340d7e..18404de4c 100644
--- a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
+++ b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
@@ -69,7 +69,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libqt4$secondaryArchSuffix >= 4.8
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
@@ -115,7 +115,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:automoc4
@@ -166,7 +166,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	kdelibs4${secondaryArchSuffix} == $portVersion base
 	lib:libxml2$secondaryArchSuffix
diff --git a/dev-qt/libattica/libattica-0.4.2.recipe b/dev-qt/libattica/libattica-0.4.2.recipe
index ad36e6ed1..d9bdab32b 100644
--- a/dev-qt/libattica/libattica-0.4.2.recipe
+++ b/dev-qt/libattica/libattica-0.4.2.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libqt4$secondaryArchSuffix >= 4.8
 	"
 
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:make
@@ -49,7 +49,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	libattica$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe
index e39e91016..b6304f7bc 100644
--- a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe
+++ b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libqjson$secondaryArchSuffix
 	lib:libdbus_1$secondaryArchSuffix
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	devel:libqjson$secondaryArchSuffix
 	devel:libdbus_1$secondaryArchSuffix
diff --git a/dev-qt/libqt4/libqt4-4.8.6.3.recipe b/dev-qt/libqt4/libqt4-4.8.6.3.recipe
index b70d2f9a1..418feaab0 100644
--- a/dev-qt/libqt4/libqt4-4.8.6.3.recipe
+++ b/dev-qt/libqt4/libqt4-4.8.6.3.recipe
@@ -48,7 +48,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -70,7 +70,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
 	cmd:make
@@ -140,7 +140,7 @@ PROVIDES_devel="
 # and thus build Qt apps without any SSL support.
 REQUIRES_devel="
 	libqt4$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
diff --git a/dev-qt/libqt4/libqt4-4.8.6.4.recipe b/dev-qt/libqt4/libqt4-4.8.6.4.recipe
index 2bd8953e1..3dc452135 100644
--- a/dev-qt/libqt4/libqt4-4.8.6.4.recipe
+++ b/dev-qt/libqt4/libqt4-4.8.6.4.recipe
@@ -48,7 +48,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -70,7 +70,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
 	cmd:make
@@ -140,7 +140,7 @@ PROVIDES_devel="
 # and thus build Qt apps without any SSL support.
 REQUIRES_devel="
 	libqt4$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
index 85619506f..060fcc1e1 100644
--- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
+++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8.0
 	"
 
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
 	"
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel == $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
 	"
 
diff --git a/dev-qt/qca2/qca2-2.0.3.recipe b/dev-qt/qca2/qca2-2.0.3.recipe
index eb1c9ebe4..a847f86da 100644
--- a/dev-qt/qca2/qca2-2.0.3.recipe
+++ b/dev-qt/qca2/qca2-2.0.3.recipe
@@ -35,13 +35,13 @@ PROVIDES_devel="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libqt4$secondaryArchSuffix >= 4.8
 	ca_root_certificates
 	"
 
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	qca2$secondaryArchSuffix == $portVersion base
 	"
@@ -54,7 +54,7 @@ BUILD_PREREQUIRES="
 	"	
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	"
 
diff --git a/dev-qt/qjson/qjson-0.8.1.recipe b/dev-qt/qjson/qjson-0.8.1.recipe
index bdbe23d26..b2d416aca 100644
--- a/dev-qt/qjson/qjson-0.8.1.recipe
+++ b/dev-qt/qjson/qjson-0.8.1.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	"
 
@@ -39,7 +39,7 @@ BUILD_PREREQUIRES="
 	"	
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	"
 	
diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe
index e92b84ac1..9c379c2bd 100644
--- a/dev-scheme/chicken/chicken-4.8.0.5.recipe
+++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:gcc
 	cmd:ld
 	"
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
index 8493e7882..a53f9bcfd 100644
--- a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
+++ b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-util/acr/acr-0.9.9_git.recipe b/dev-util/acr/acr-0.9.9_git.recipe
index cfc83560e..6ef46d1a5 100644
--- a/dev-util/acr/acr-0.9.9_git.recipe
+++ b/dev-util/acr/acr-0.9.9_git.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:amr = $portVersion compat >= 0.9.9
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -33,7 +33,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:getopt
 	cmd:make
diff --git a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
index a686d0f70..6db512e50 100644
--- a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
+++ b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
@@ -45,7 +45,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-util/astyle/astyle-2.05.recipe b/dev-util/astyle/astyle-2.05.recipe
index 4d3794786..235201377 100644
--- a/dev-util/astyle/astyle-2.05.recipe
+++ b/dev-util/astyle/astyle-2.05.recipe
@@ -40,11 +40,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:g++$secondaryArchSuffix
 	"
diff --git a/dev-util/bakefile/bakefile-0.2.8.recipe b/dev-util/bakefile/bakefile-0.2.8.recipe
index 579b3be2f..4bcf695af 100644
--- a/dev-util/bakefile/bakefile-0.2.8.recipe
+++ b/dev-util/bakefile/bakefile-0.2.8.recipe
@@ -19,14 +19,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:gcc
 	cmd:make
diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
index 4ce8957a1..ac1a17e92 100644
--- a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
+++ b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe
@@ -43,7 +43,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	python_twisted
 	"
@@ -51,7 +51,7 @@ REQUIRES="
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 
diff --git a/dev-util/byacc/byacc-20140422.recipe b/dev-util/byacc/byacc-20140422.recipe
index c216c2c50..da7138b45 100644
--- a/dev-util/byacc/byacc-20140422.recipe
+++ b/dev-util/byacc/byacc-20140422.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 
 BUILD_PREREQUIRES="
diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe
index e7672ad56..89937f905 100644
--- a/dev-util/ccache/ccache-3.1.9.recipe
+++ b/dev-util/ccache/ccache-3.1.9.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz >= 1
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe
index 1da2a50f9..b0c9defec 100644
--- a/dev-util/cmake/cmake-2.8.11.2.recipe
+++ b/dev-util/cmake/cmake-2.8.11.2.recipe
@@ -22,14 +22,14 @@ PROVIDES="
 	cmd:ctest = $portVersion compat >= 2.8
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 	"
 BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
diff --git a/dev-util/cmake/cmake-3.0.0.recipe b/dev-util/cmake/cmake-3.0.0.recipe
index c0fb5a465..db871e9c3 100644
--- a/dev-util/cmake/cmake-3.0.0.recipe
+++ b/dev-util/cmake/cmake-3.0.0.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
@@ -40,8 +40,8 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe
index 9394c30c3..ae45376b0 100644
--- a/dev-util/cppunit/cppunit-1.12.1.recipe
+++ b/dev-util/cppunit/cppunit-1.12.1.recipe
@@ -28,12 +28,12 @@ PROVIDES="
 	lib:libcppunit_1.12 = $portVersion compat >= 1.12
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:libtoolize
 	cmd:autoreconf
 	cmd:g++
diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe
index dd2641b9e..45675a1dc 100644
--- a/dev-util/cscope/cscope-15.7a.recipe
+++ b/dev-util/cscope/cscope-15.7a.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 	"
 
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:autoreconf
diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe
index 1d2f2415f..1e0f2483f 100644
--- a/dev-util/ctags/ctags-5.8.recipe
+++ b/dev-util/ctags/ctags-5.8.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	cmd:ctags = $portVersion compat >= 5.8
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe
index 39f5492ff..344007c73 100644
--- a/dev-util/fastdep/fastdep-0.16.recipe
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-util/fenris/fenris-0.07.recipe b/dev-util/fenris/fenris-0.07.recipe
index 2c1e7c885..1e96f2361 100644
--- a/dev-util/fenris/fenris-0.07.recipe
+++ b/dev-util/fenris/fenris-0.07.recipe
@@ -58,7 +58,7 @@ PROVIDES="
 # TODO: add missing optional deps
 #
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	cmd:awk
 	coreutils
 	diffutils
@@ -69,7 +69,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:file
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-util/gdb/gdb-7.7.recipe b/dev-util/gdb/gdb-7.7.recipe
index baf71ce9e..a9e9f7354 100644
--- a/dev-util/gdb/gdb-7.7.recipe
+++ b/dev-util/gdb/gdb-7.7.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libintl
 	lib:libncurses
@@ -43,7 +43,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-util/global/global-6.3.recipe b/dev-util/global/global-6.3.recipe
index e314fa1c9..98a986c60 100644
--- a/dev-util/global/global-6.3.recipe
+++ b/dev-util/global/global-6.3.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	ncurses
 	cmd:ctags
 	cmd:sort
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoreconf
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe
index c4196d033..5c584b8b7 100644
--- a/dev-util/gperf/gperf-3.0.4.recipe
+++ b/dev-util/gperf/gperf-3.0.4.recipe
@@ -25,13 +25,13 @@ PROVIDES="
 	cmd:gperf = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-util/gtk_doc/gtk_doc-1.20.recipe b/dev-util/gtk_doc/gtk_doc-1.20.recipe
index 53e44a96d..93f4f0707 100644
--- a/dev-util/gtk_doc/gtk_doc-1.20.recipe
+++ b/dev-util/gtk_doc/gtk_doc-1.20.recipe
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:gcc
diff --git a/dev-util/gyp/gyp-r1948.recipe b/dev-util/gyp/gyp-r1948.recipe
index ff9ab967f..988db89d4 100644
--- a/dev-util/gyp/gyp-r1948.recipe
+++ b/dev-util/gyp/gyp-r1948.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	python_setuptools
 	"
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 
diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe
index 5ec691dd9..843606f00 100644
--- a/dev-util/idutils/idutils-4.6.recipe
+++ b/dev-util/idutils/idutils-4.6.recipe
@@ -34,14 +34,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe
index 8330b4660..ea60149ba 100644
--- a/dev-util/indent/indent-2.2.10.recipe
+++ b/dev-util/indent/indent-2.2.10.recipe
@@ -28,18 +28,18 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
     lib:libiconv$secondaryArchSuffix
     lib:libintl$secondaryArchSuffix
     "
 
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
 	gettext$secondaryArchSuffix
     "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe
index 5ee52214b..0fff8db85 100644
--- a/dev-util/intltool/intltool-0.40.6.recipe
+++ b/dev-util/intltool/intltool-0.40.6.recipe
@@ -31,13 +31,13 @@ PROVIDES="
 	cmd:intltoolize$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:file
 	cmd:perl
 	xml_parser
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	xml_parser
 	"
 BUILD_PREREQUIRES="
diff --git a/dev-util/ninja/ninja-1.5.1.recipe b/dev-util/ninja/ninja-1.5.1.recipe
index 0ca0db200..7b52e8348 100644
--- a/dev-util/ninja/ninja-1.5.1.recipe
+++ b/dev-util/ninja/ninja-1.5.1.recipe
@@ -27,14 +27,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:python
 	cmd:g++$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe
index d74818d29..3564d2789 100644
--- a/dev-util/patchutils/patchutils-0.3.3.recipe
+++ b/dev-util/patchutils/patchutils-0.3.3.recipe
@@ -45,7 +45,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:perl
 	cmd:diff
 	cmd:patch
@@ -53,7 +53,7 @@ REQUIRES="
 
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
index 052d0e0aa..9a8f50d0d 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
index e28258ed7..d8787f913 100644
--- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
+++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe
index 99d3f3f2c..5d9fa3036 100644
--- a/dev-util/ragel/ragel-6.8.recipe
+++ b/dev-util/ragel/ragel-6.8.recipe
@@ -29,10 +29,10 @@ PROVIDES="
 	cmd:ragel$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe
index 41affab7c..f57695d57 100644
--- a/dev-util/scons/scons-2.2.0.recipe
+++ b/dev-util/scons/scons-2.2.0.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	cmd:sconsign_2.2.0 = $portVersion compat >= 2.2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe
index 9307bc62d..40d5891c9 100644
--- a/dev-util/scons/scons-2.3.1.recipe
+++ b/dev-util/scons/scons-2.3.1.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	cmd:sconsign_$portVersion = $portVersion compat >= 2.3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
diff --git a/dev-util/uncrustify/uncrustify-0.60.recipe b/dev-util/uncrustify/uncrustify-0.60.recipe
index c52ccdf5d..24a9dff2a 100644
--- a/dev-util/uncrustify/uncrustify-0.60.recipe
+++ b/dev-util/uncrustify/uncrustify-0.60.recipe
@@ -33,13 +33,13 @@ PROVIDES="
 	cmd:uncrustify = $portVersion compat >= 0.60
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe
index 70fd830db..4a1ed6c18 100644
--- a/dev-vcs/bzr/bzr-2.6.0.recipe
+++ b/dev-vcs/bzr/bzr-2.6.0.recipe
@@ -29,13 +29,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpython2.7$secondaryArchSuffix
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpython2.7$secondaryArchSuffix
 	"
 
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index 1658ea96b..15aed537c 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -50,7 +50,7 @@ PROVIDES="
 	cmd:rcs2log = $portVersion compat >= 1.12
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:nano
 	cmd:perl
 	lib:libz
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libz >= 1.1.4
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/dev-vcs/cvsps/cvsps-2.2b1.recipe b/dev-vcs/cvsps/cvsps-2.2b1.recipe
index 7e2295506..70d83e307 100644
--- a/dev-vcs/cvsps/cvsps-2.2b1.recipe
+++ b/dev-vcs/cvsps/cvsps-2.2b1.recipe
@@ -27,14 +27,14 @@ PROVIDES="
 	cmd:cvsps = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-vcs/fossil/fossil-1.28.recipe b/dev-vcs/fossil/fossil-1.28.recipe
index 2aee98bff..c17375f54 100644
--- a/dev-vcs/fossil/fossil-1.28.recipe
+++ b/dev-vcs/fossil/fossil-1.28.recipe
@@ -16,12 +16,12 @@ PROVIDES="
 	cmd:fossil = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	openssl >= 1.0.0
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz >= 1.2.3
 	openssl_devel >= 1.0.0
 	"
diff --git a/dev-vcs/fossil/fossil-1.29.recipe b/dev-vcs/fossil/fossil-1.29.recipe
index 9950c7af6..bc0561548 100644
--- a/dev-vcs/fossil/fossil-1.29.recipe
+++ b/dev-vcs/fossil/fossil-1.29.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 	cmd:fossil = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	openssl >= 1.0.0
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libz >= 1.2.3
 	openssl_devel >= 1.0.0
 	"
diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe
index fb4865ba4..9f0f51fca 100644
--- a/dev-vcs/git/git-1.7.10.2.recipe
+++ b/dev-vcs/git/git-1.7.10.2.recipe
@@ -58,7 +58,7 @@ PROVIDES_svn="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:man
 	cmd:nano
 	cmd:perl
@@ -69,23 +69,23 @@ REQUIRES="
 	lib:libz
 	"
 REQUIRES_arch="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_cvs="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_daemon="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_email="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_svn="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 	
@@ -101,7 +101,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe
index 6614006ac..e8e512a89 100644
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -62,7 +62,7 @@ PROVIDES_svn="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:man
 	cmd:nano
 	cmd:perl >= 5
@@ -77,28 +77,28 @@ REQUIRES="
 	vendor_perl
 	"
 REQUIRES_arch="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_cvs="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	cmd:cvsps
 	"
 REQUIRES_daemon="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_email="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_remote_helpers="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 REQUIRES_svn="
-	haiku >= $haikuVersion
+	haiku
 	git == $portVersion base
 	"
 
@@ -117,7 +117,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:find
 	cmd:gcc
diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
index 932a92806..cd852ac67 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	cmd:hg = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:nano
 	lib:libintl
@@ -25,7 +25,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe
index cb46dd3b6..368c565e0 100644
--- a/dev-vcs/mercurial/mercurial-2.8.1.recipe
+++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:nano
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe
index 0edd1c388..b15b57a97 100644
--- a/dev-vcs/mercurial/mercurial-2.9.1.recipe
+++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:nano
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe
index af343a973..2c71fb38b 100644
--- a/dev-vcs/mercurial/mercurial-2.9.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:nano
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe
index 09095fc0b..0b060f40e 100644
--- a/dev-vcs/mercurial/mercurial-3.2.1.recipe
+++ b/dev-vcs/mercurial/mercurial-3.2.1.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python < 3
 	cmd:nano
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe
index 8d6b2d171..ac5800dd0 100644
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -40,7 +40,7 @@ PROVIDES="
 	lib:libsvn_wc_1 = 0.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libapr_1
 	lib:libaprutil_1
 	lib:libcrypto
@@ -65,7 +65,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	cmd:aclocal
 	cmd:autoconf
diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.10.recipe
index 3fec3ed8e..2d64dd0f5 100644
--- a/dev-vcs/subversion/subversion-1.8.10.recipe
+++ b/dev-vcs/subversion/subversion-1.8.10.recipe
@@ -40,7 +40,7 @@ PROVIDES="
 	lib:libsvn_ra_serf_1 = 0.0.0 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libapr_1
 	lib:libaprutil_1
 	lib:libcrypto
@@ -65,7 +65,7 @@ BUILD_REQUIRES="
 	devel:libserf_1
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:pkg_config
 	cmd:python
 	cmd:aclocal
diff --git a/dev-vcs/tig/tig-2.0.2.recipe b/dev-vcs/tig/tig-2.0.2.recipe
index 0602a4ab4..358b14280 100644
--- a/dev-vcs/tig/tig-2.0.2.recipe
+++ b/dev-vcs/tig/tig-2.0.2.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	cmd:tig$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:asciidoc
 	cmd:autoconf
 	cmd:git
diff --git a/games-action/barrage/barrage-1.0.4.recipe b/games-action/barrage/barrage-1.0.4.recipe
index dd2c33da5..3579a3060 100644
--- a/games-action/barrage/barrage-1.0.4.recipe
+++ b/games-action/barrage/barrage-1.0.4.recipe
@@ -21,13 +21,13 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer 
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 "
diff --git a/games-action/maelstrom/maelstrom-3.0.6.recipe b/games-action/maelstrom/maelstrom-3.0.6.recipe
index def64fb01..8af9c3d85 100644
--- a/games-action/maelstrom/maelstrom-3.0.6.recipe
+++ b/games-action/maelstrom/maelstrom-3.0.6.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	app:Maelstrom
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libSDL_net$secondaryArchSuffix
 	"
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	devel:libSDL_net$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autom4te
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/games-action/quake3/quake3-0.6.1.recipe b/games-action/quake3/quake3-0.6.1.recipe
index 65890bf45..3146395b3 100644
--- a/games-action/quake3/quake3-0.6.1.recipe
+++ b/games-action/quake3/quake3-0.6.1.recipe
@@ -21,13 +21,13 @@ PROVIDES="
 	quake3$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.recipe b/games-arcade/alienblaster/alienblaster-1.1.0.recipe
index ce8bb32fc..64813668f 100644
--- a/games-arcade/alienblaster/alienblaster-1.1.0.recipe
+++ b/games-arcade/alienblaster/alienblaster-1.1.0.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 	"
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3.recipe b/games-arcade/circuslinux/circuslinux-1.0.3.recipe
index 75ac37ce5..42e655527 100644
--- a/games-arcade/circuslinux/circuslinux-1.0.3.recipe
+++ b/games-arcade/circuslinux/circuslinux-1.0.3.recipe
@@ -19,14 +19,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libSDL_image
 	lib:libSDL_mixer
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libSDL_image
 	devel:libSDL_mixer
diff --git a/games-arcade/edgar/edgar-1.16_1.recipe b/games-arcade/edgar/edgar-1.16_1.recipe
index 07c0aa503..473ac9dd8 100644
--- a/games-arcade/edgar/edgar-1.16_1.recipe
+++ b/games-arcade/edgar/edgar-1.16_1.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	cmd:edgar = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libintl
 	lib:libpng
 	lib:libSDL
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libintl
 	devel:libpng
 	devel:libSDL
diff --git a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
index 71acbfcda..3171e18bd 100644
--- a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
+++ b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
@@ -35,8 +35,8 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/giddy3/giddy3-1.4.recipe b/games-arcade/giddy3/giddy3-1.4.recipe
index 9b95f7b16..dcf634eb2 100644
--- a/games-arcade/giddy3/giddy3-1.4.recipe
+++ b/games-arcade/giddy3/giddy3-1.4.recipe
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index e0c0dcbf1..ff81c85db 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libSDL_image$secondaryArchSuffix
 	lib:libSDL_mixer$secondaryArchSuffix
@@ -35,8 +35,8 @@ BUILD_REQUIRES="
 	devel:libGLU$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/mog/mog-0.63.1548.recipe b/games-arcade/mog/mog-0.63.1548.recipe
index 238b0e768..9aade712d 100644
--- a/games-arcade/mog/mog-0.63.1548.recipe
+++ b/games-arcade/mog/mog-0.63.1548.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libSDL_image$secondaryArchSuffix
 	lib:libSDL_mixer$secondaryArchSuffix
@@ -25,8 +25,8 @@ BUILD_REQUIRES="
 	devel:libSDL_sound$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4.recipe b/games-arcade/moleinvasion/moleinvasion-0.4.recipe
index 2219c3b25..7dfc886e8 100644
--- a/games-arcade/moleinvasion/moleinvasion-0.4.recipe
+++ b/games-arcade/moleinvasion/moleinvasion-0.4.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgl
 	lib:libsdl
 	lib:libsdl_mixer
@@ -28,7 +28,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 	devel:libsdl_image
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 55d0e5075..a14612159 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
@@ -34,7 +34,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libsdl2$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
@@ -68,7 +68,7 @@ BUILD_REQUIRES="
 	boost_devel${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
index d4e9fc9d9..5b8e8c46a 100644
--- a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
+++ b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libSDL_image$secondaryArchSuffix
 	lib:libSDL_mixer$secondaryArchSuffix
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	devel:libSDL_ttf$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
index 3e0835cdb..3a572b47c 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 	devel:libsmpeg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
index 463f07e10..ed3a4384c 100644
--- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
+++ b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
@@ -13,15 +13,15 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/slime_volley/slime_volley-2.4.2.recipe b/games-arcade/slime_volley/slime_volley-2.4.2.recipe
index 4ac282913..30c746670 100644
--- a/games-arcade/slime_volley/slime_volley-2.4.2.recipe
+++ b/games-arcade/slime_volley/slime_volley-2.4.2.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libintl
 	lib:libsdl
 	lib:libsdl_image
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:make
diff --git a/games-arcade/super_transball/super_transball-2.1.5.recipe b/games-arcade/super_transball/super_transball-2.1.5.recipe
index 70e4fd1c2..412840fa1 100644
--- a/games-arcade/super_transball/super_transball-2.1.5.recipe
+++ b/games-arcade/super_transball/super_transball-2.1.5.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libSDL_image$secondaryArchSuffix
 	lib:libSDL_mixer$secondaryArchSuffix
@@ -27,8 +27,8 @@ BUILD_REQUIRES="
 	devel:libSGE$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-arcade/supertux/supertux-0.1.3.recipe b/games-arcade/supertux/supertux-0.1.3.recipe
index 76367d8a0..7488cfd46 100644
--- a/games-arcade/supertux/supertux-0.1.3.recipe
+++ b/games-arcade/supertux/supertux-0.1.3.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:supertux$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix >= 0.11.4
@@ -30,7 +30,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix >= 1.2.8
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
 	devel:libSDL_1.2$secondaryArchSuffix >= 0.11.4
diff --git a/games-arcade/xrick/xrick-021212.recipe b/games-arcade/xrick/xrick-021212.recipe
index 13061da70..797a10f58 100644
--- a/games-arcade/xrick/xrick-021212.recipe
+++ b/games-arcade/xrick/xrick-021212.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	app:xrick = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -21,8 +21,8 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe
index 0333fe419..4ba02ec2e 100644
--- a/games-emulation/dosbox/dosbox-0.74.recipe
+++ b/games-emulation/dosbox/dosbox-0.74.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	app:dosbox$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_net$secondaryArchSuffix
 	lib:libsdl_sound$secondaryArchSuffix
@@ -40,7 +40,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libglu$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
index ffd5e7a50..1c5db8c7f 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe
index a5def5e45..89cd5cc56 100644
--- a/games-engines/gemrb/gemrb-0.8.1.recipe
+++ b/games-engines/gemrb/gemrb-0.8.1.recipe
@@ -26,14 +26,14 @@ PROVIDES="
         "
  
 REQUIRES="
-        haiku$secondaryArchSuffix >= $haikuVersion
+        haiku$secondaryArchSuffix
         lib:libSDL_1.2$secondaryArchSuffix
         lib:libz$secondaryArchSuffix
         lib:libutil$secondaryArchSuffix
         "
  
 BUILD_REQUIRES="
-        haiku${secondaryArchSuffix}_devel >= $haikuVersion
+        haiku${secondaryArchSuffix}_devel
         devel:libsdl_1.2$secondaryArchSuffix
         devel:libz$secondaryArchSuffix
         "
diff --git a/games-engines/love/love-0.9.1.recipe b/games-engines/love/love-0.9.1.recipe
index 7c19d3d9c..8cba9daba 100644
--- a/games-engines/love/love-0.9.1.recipe
+++ b/games-engines/love/love-0.9.1.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	lib:liblove$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	lib:libvorbisfile$secondaryArchSuffix
@@ -50,7 +50,7 @@ REQUIRES="
 	lib:libgcc_s$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL2$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libvorbisfile$secondaryArchSuffix
diff --git a/games-engines/ponscripter/ponscripter-20111009.recipe b/games-engines/ponscripter/ponscripter-20111009.recipe
index 121e9a436..b1a983db7 100644
--- a/games-engines/ponscripter/ponscripter-20111009.recipe
+++ b/games-engines/ponscripter/ponscripter-20111009.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	cmd:ponscr
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libsdl${secondaryArchSuffix} >= 1.2.14
 	sdl_image${secondaryArchSuffix} >= 1.2.10
 	sdl_ttf${secondaryArchSuffix} >= 1.2
@@ -40,7 +40,7 @@ REQUIRES="
 	zlib${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 "
 
 BUILD_REQUIRES="
diff --git a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
index 3a2f07149..c6f9191ed 100644
--- a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
+++ b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libvorbis
 	lib:libogg
 	lib:libFLAC
@@ -43,7 +43,7 @@ REQUIRES="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libvorbis
 	devel:libogg
 	devel:libFLAC
diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index c4f465e0e..d44c183f4 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libFLAC++$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -43,7 +43,7 @@ REQUIRES="
 "
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
 	devel:libFLAC++$secondaryArchSuffix
diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe
index 57ddbaab3..07f3ab873 100644
--- a/games-engines/scummvm/scummvm-1.7.0.recipe
+++ b/games-engines/scummvm/scummvm-1.7.0.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -44,7 +44,7 @@ REQUIRES="
 "
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
 	devel:libFLAC$secondaryArchSuffix
diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe
index 4597efaf0..aa8999287 100644
--- a/games-engines/solarus/solarus-1.1.1.recipe
+++ b/games-engines/solarus/solarus-1.1.1.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	cmd:solarus = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libSDL$secondaryArchSuffix
 	lib:libsdl_ttf$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
@@ -29,7 +29,7 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL$secondaryArchSuffix
 	devel:libsdl_ttf$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe
index 9073df1cb..b5f29ced8 100644
--- a/games-kids/dragonmemory/dragonmemory-1.recipe
+++ b/games-kids/dragonmemory/dragonmemory-1.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	app:dragonmemory = $portVersion"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion 
+	haiku_devel 
 	devel:libsdl
 	devel:libsdl_image
 	devel:libsdl_mixer
diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe
index 4434a25b4..7c194a6f4 100644
--- a/games-kids/pipepanic/pipepanic-0.1.3.recipe
+++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	app:pipepanic = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	cmd:xres
 	"
diff --git a/games-puzzle/abrick/abrick-1.12.recipe b/games-puzzle/abrick/abrick-1.12.recipe
index 19591c682..a7da7e9e3 100644
--- a/games-puzzle/abrick/abrick-1.12.recipe
+++ b/games-puzzle/abrick/abrick-1.12.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	app:abrick = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libSDL_mixer
 	lib:libSDL_image
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libSDL
 	devel:libSDL_mixer
 	devel:libSDL_image
diff --git a/games-puzzle/blobwars/blobwars-1.19.recipe b/games-puzzle/blobwars/blobwars-1.19.recipe
index 93350ab89..a7ed66d70 100644
--- a/games-puzzle/blobwars/blobwars-1.19.recipe
+++ b/games-puzzle/blobwars/blobwars-1.19.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	app:blobwars = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libSDL_mixer
 	lib:libSDL_image
@@ -31,7 +31,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libSDL
 	devel:libSDL_mixer
 	devel:libSDL_image
diff --git a/games-puzzle/gemdropx/gemdropx-0.9.recipe b/games-puzzle/gemdropx/gemdropx-0.9.recipe
index a23d6f2bf..e4c5d835b 100644
--- a/games-puzzle/gemdropx/gemdropx-0.9.recipe
+++ b/games-puzzle/gemdropx/gemdropx-0.9.recipe
@@ -27,13 +27,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl
 	lib:libsdl_mixer
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl
 	devel:libsdl_mixer
 	"
diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe
index d0891a46f..ab2f97c18 100644
--- a/games-puzzle/gemz/gemz-0.97.0.recipe
+++ b/games-puzzle/gemz/gemz-0.97.0.recipe
@@ -22,13 +22,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
 	"
diff --git a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe
index 28c7bc5cc..513d176bd 100644
--- a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe
+++ b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer
 	lib:libsdl_net
@@ -33,7 +33,7 @@ REQUIRES="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:sdl_mixer
 	devel:sdl_net
diff --git a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe
index e985dde37..a60248823 100644
--- a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe
+++ b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer 
 	lib:libsdl_net
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 	devel:libsdl_net
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe
index bb7b0b790..a5b6c1eaf 100644
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe
@@ -23,13 +23,13 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer 
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 "
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.recipe b/games-puzzle/lpairs/lpairs-1.0.4.recipe
index 04b9e9ba2..137eeec41 100644
--- a/games-puzzle/lpairs/lpairs-1.0.4.recipe
+++ b/games-puzzle/lpairs/lpairs-1.0.4.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 "
 
diff --git a/games-puzzle/ltris/ltris-1.0.19.recipe b/games-puzzle/ltris/ltris-1.0.19.recipe
index ab48509b1..487bcf18c 100644
--- a/games-puzzle/ltris/ltris-1.0.19.recipe
+++ b/games-puzzle/ltris/ltris-1.0.19.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libsdl_mixer
 	lib:libintl
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
 	devel:libintl
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
index 5da7e81e1..7801bdb0a 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
@@ -13,7 +13,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 	devel:libsdl_mixer$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
index 3d8e2d59c..47857930c 100644
--- a/games-puzzle/neverball/neverball-1.5.4.recipe
+++ b/games-puzzle/neverball/neverball-1.5.4.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libphysfs$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
@@ -39,7 +39,7 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libphysfs$secondaryArchSuffix
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
diff --git a/games-puzzle/neverball/neverball-1.6.0.recipe b/games-puzzle/neverball/neverball-1.6.0.recipe
index f7423ddec..fe4885355 100644
--- a/games-puzzle/neverball/neverball-1.6.0.recipe
+++ b/games-puzzle/neverball/neverball-1.6.0.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libphysfs$secondaryArchSuffix
 	lib:libsdl2$secondaryArchSuffix
 	lib:libsdl2_mixer$secondaryArchSuffix
@@ -39,7 +39,7 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libphysfs$secondaryArchSuffix
 	devel:libsdl2$secondaryArchSuffix
 	devel:libsdl2_mixer$secondaryArchSuffix
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
index decd12bc8..2bcd6ab84 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
@@ -23,13 +23,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
 	"
diff --git a/games-puzzle/sdllopan/sdllopan-10.recipe b/games-puzzle/sdllopan/sdllopan-10.recipe
index f6d6a1ec9..70987f6b1 100644
--- a/games-puzzle/sdllopan/sdllopan-10.recipe
+++ b/games-puzzle/sdllopan/sdllopan-10.recipe
@@ -24,15 +24,15 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/games-puzzle/wizznic/wizznic-0.9.9.recipe b/games-puzzle/wizznic/wizznic-0.9.9.recipe
index 8966f4185..e8e597d18 100644
--- a/games-puzzle/wizznic/wizznic-0.9.9.recipe
+++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
@@ -43,7 +43,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:sdl_config$secondaryArchSuffix
diff --git a/games-roguelike/angband/angband-3.5.0.recipe b/games-roguelike/angband/angband-3.5.0.recipe
index f24e7985c..284f26501 100644
--- a/games-roguelike/angband/angband-3.5.0.recipe
+++ b/games-roguelike/angband/angband-3.5.0.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libSDL_1.2
 	lib:libSDL_image_1.2
 	lib:libSDL_mixer_1.2
@@ -94,7 +94,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/games-rpg/fheroes2/fheroes2-r3182.recipe b/games-rpg/fheroes2/fheroes2-r3182.recipe
index 23807aaac..76698e112 100644
--- a/games-rpg/fheroes2/fheroes2-r3182.recipe
+++ b/games-rpg/fheroes2/fheroes2-r3182.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
@@ -45,7 +45,7 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe
index fcfebb1ab..675ec591b 100644
--- a/games-rpg/flare/flare-0.19.recipe
+++ b/games-rpg/flare/flare-0.19.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
@@ -31,7 +31,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:sdl_mixer$secondaryArchSuffix
 	devel:sdl_image$secondaryArchSuffix
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
index 9dcffc232..d4c231e1c 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 	cmd:make_atlas$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	freedroidrpg_data == $portVersion
 	lib:libsdl$secondaryArchSuffix
 	#lib:libsdl_mixer$secondaryArchSuffix
@@ -56,7 +56,7 @@ REQUIRES="
 	lib:libgl$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	#devel:libsdl_mixer$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
@@ -119,7 +119,7 @@ PROVIDES_data="
 	freedroidrpg_data = $portVersion
 "
 REQUIRES_data="
-	haiku >= $haikuVersion
+	haiku
 "
 SUMMARY_data="FreedroidRPG data files"
 ARCHITECTURES_data="any"
diff --git a/games-simulation/corsix_th/corsix_th-0.30.recipe b/games-simulation/corsix_th/corsix_th-0.30.recipe
index 42ac22e3d..7e2a4552f 100644
--- a/games-simulation/corsix_th/corsix_th-0.30.recipe
+++ b/games-simulation/corsix_th/corsix_th-0.30.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix
@@ -34,7 +34,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix
diff --git a/games-simulation/openttd/openttd-1.4.3.recipe b/games-simulation/openttd/openttd-1.4.3.recipe
index 0bcd0ac7f..4638e6f3f 100644
--- a/games-simulation/openttd/openttd-1.4.3.recipe
+++ b/games-simulation/openttd/openttd-1.4.3.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
@@ -34,7 +34,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:liblzma$secondaryArchSuffix
diff --git a/games-sports/xmoto/xmoto-0.5.11.recipe b/games-sports/xmoto/xmoto-0.5.11.recipe
index 141fe5c52..d7d62c7d7 100644
--- a/games-sports/xmoto/xmoto-0.5.11.recipe
+++ b/games-sports/xmoto/xmoto-0.5.11.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	cmd:xmoto$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -57,7 +57,7 @@ BUILD_REQUIRES="
 	devel:libgl$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:sed
diff --git a/games-strategy/freeciv/freeciv-2.4.3.recipe b/games-strategy/freeciv/freeciv-2.4.3.recipe
index 989f7d15b..c41b3c8b0 100644
--- a/games-strategy/freeciv/freeciv-2.4.3.recipe
+++ b/games-strategy/freeciv/freeciv-2.4.3.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -56,7 +56,7 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
diff --git a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
index 8b688b187..9094614eb 100644
--- a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
+++ b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
@@ -22,14 +22,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	#lib:mesa_swrast
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
diff --git a/games-strategy/uqm/uqm-0.7.0.recipe b/games-strategy/uqm/uqm-0.7.0.recipe
index cf3618a3a..cc5d91bff 100644
--- a/games-strategy/uqm/uqm-0.7.0.recipe
+++ b/games-strategy/uqm/uqm-0.7.0.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/games-strategy/vcmi/vcmi-0.94.recipe b/games-strategy/vcmi/vcmi-0.94.recipe
index b3e0bf244..dd0cbeed7 100644
--- a/games-strategy/vcmi/vcmi-0.94.recipe
+++ b/games-strategy/vcmi/vcmi-0.94.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
@@ -45,7 +45,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe
index 8417b868d..92451dd63 100644
--- a/haiku-apps/a_book/a_book-1.1.recipe
+++ b/haiku-apps/a_book/a_book-1.1.recipe
@@ -15,11 +15,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
index 8c42cd51e..a83ab0175 100644
--- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
+++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libaa
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libaa
 	"
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/album/album-0.9.3.recipe b/haiku-apps/album/album-0.9.3.recipe
index 252c6743f..bec201385 100644
--- a/haiku-apps/album/album-0.9.3.recipe
+++ b/haiku-apps/album/album-0.9.3.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiptcdata$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libiptcdata$secondaryArchSuffix
 	"
 
diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
index 25d855148..c656af22d 100644
--- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe
+++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
@@ -19,10 +19,10 @@ PROVIDES="
 	lib:APlayerKit = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 "
 BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe
index 07dc07ec6..15488698f 100644
--- a/haiku-apps/armyknife/armyknife-4.3.0.recipe
+++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	app:ArmyKnife = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libtag$secondaryArchSuffix
 	lib:libsanta$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	taglib${secondaryArchSuffix}_devel
 	libsanta${secondaryArchSuffix}_devel
 	"
diff --git a/haiku-apps/artpaint/artpaint-2.1.0git.recipe b/haiku-apps/artpaint/artpaint-2.1.0git.recipe
index a461e1e22..4382e43d6 100644
--- a/haiku-apps/artpaint/artpaint-2.1.0git.recipe
+++ b/haiku-apps/artpaint/artpaint-2.1.0git.recipe
@@ -19,10 +19,10 @@ PROVIDES="
 	app:ArtPaint = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe
index c170b092c..1964bfbe5 100644
--- a/haiku-apps/backup/backup-0.0.1.recipe
+++ b/haiku-apps/backup/backup-0.0.1.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe
index 187eae185..2070acb24 100644
--- a/haiku-apps/bafx/bafx-0.0.1.recipe
+++ b/haiku-apps/bafx/bafx-0.0.1.recipe
@@ -15,7 +15,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
index 3d2fab87a..22608bb64 100644
--- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	app:bdhcalc = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe
index 056c99e25..83381bd5e 100644
--- a/haiku-apps/beae/beae-1.2.recipe
+++ b/haiku-apps/beae/beae-1.2.recipe
@@ -15,11 +15,11 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe
index 3c3b7133c..86dc8d459 100644
--- a/haiku-apps/beam/beam-1.2alpha.recipe
+++ b/haiku-apps/beam/beam-1.2alpha.recipe
@@ -19,7 +19,7 @@ BUILD_REQUIRES="
 	devel:libssl
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:jam
 	cmd:gcc
 	cmd:bison
diff --git a/haiku-apps/becasso/becasso-2.0.recipe b/haiku-apps/becasso/becasso-2.0.recipe
index 8f588b59e..e1a1fef82 100644
--- a/haiku-apps/becasso/becasso-2.0.recipe
+++ b/haiku-apps/becasso/becasso-2.0.recipe
@@ -20,8 +20,8 @@ BUILD_PREREQUIRES="
 	cmd:jam"
 	
 BUILD_REQUIRES="
-	haiku >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku
+	haiku_devel
 	devel:libz"
 		
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe
index 2ef33aedc..e9ccc0d9f 100644
--- a/haiku-apps/beezer/beezer-0.99.hg.recipe
+++ b/haiku-apps/beezer/beezer-0.99.hg.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe
index 1aeee59c6..1318204ab 100644
--- a/haiku-apps/beget/beget-1.2.3.recipe
+++ b/haiku-apps/beget/beget-1.2.3.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:wget$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe
index b7157680b..66255f20b 100644
--- a/haiku-apps/behappy/behappy-1.06e_git.recipe
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	app:BeHappy = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 #	app:netsurf >= 2.6
 "
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe
index fe19629d4..a86db265f 100644
--- a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe
+++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsqlite3
 	lib:liblayout
 	"
@@ -37,7 +37,7 @@ BUILD_PREREQUIRES="
 
 BUILD_REQUIRES="
 	makefile_engine
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsqlite3
 	devel:liblayout
 	"
diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe
index 9cff00604..051ea8ed9 100644
--- a/haiku-apps/belife/belife-1.0.0.recipe
+++ b/haiku-apps/belife/belife-1.0.0.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -32,7 +32,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/bemines/bemines-1.0b2.recipe b/haiku-apps/bemines/bemines-1.0b2.recipe
index 7ce5ce14e..bf3092174 100644
--- a/haiku-apps/bemines/bemines-1.0b2.recipe
+++ b/haiku-apps/bemines/bemines-1.0b2.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 "
 
diff --git a/haiku-apps/bepdf/bepdf-1.2.0.recipe b/haiku-apps/bepdf/bepdf-1.2.0.recipe
index 4a62b1e61..77090a8e7 100644
--- a/haiku-apps/bepdf/bepdf-1.2.0.recipe
+++ b/haiku-apps/bepdf/bepdf-1.2.0.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:liblayout
 	lib:libsanta
 	lib:libfreetype
@@ -41,7 +41,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:liblayout
 	devel:libsanta
 	devel:libfreetype
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
index 573b37ebc..e7a4eba2e 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
index 67349650d..3811e4355 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
index 1a4052fa1..d60703c9a 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/beshare/beshare-4.recipe b/haiku-apps/beshare/beshare-4.recipe
index 2eed8a17b..662c62529 100644
--- a/haiku-apps/beshare/beshare-4.recipe
+++ b/haiku-apps/beshare/beshare-4.recipe
@@ -43,12 +43,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	#lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	#devel:libz$secondaryArchSuffix
 	#devel:muscle$secondaryArchSuffix
 	"
diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binary_clock/binary_clock-2.0.recipe
index 7dac3c762..ef07650c9 100644
--- a/haiku-apps/binary_clock/binary_clock-2.0.recipe
+++ b/haiku-apps/binary_clock/binary_clock-2.0.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
index 1c8f94142..f0f8c5c2c 100644
--- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 REQUIRES="
 	lib:libcurl
 	lib:libz
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	devel:libcurl
 	devel:libz
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
index bd923a629..a60fc3cf4 100644
--- a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 REQUIRES="
 	lib:libcurl
 	lib:libz
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	devel:libcurl
 	devel:libz
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
index 43fb7e597..753b7c193 100644
--- a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 REQUIRES="
 	lib:libcurl
 	lib:libz
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	devel:libcurl
 	devel:libz
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe
index 446b63a21..d9900164b 100644
--- a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe
+++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 REQUIRES="
 	lib:libcurl
 	lib:libz
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	devel:libcurl
 	devel:libz
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
index ace579a61..63ae58aa0 100644
--- a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
+++ b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
@@ -26,13 +26,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:cdrecord
 	cmd:mkisofs
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/butterfly/butterfly-1.6.2.recipe b/haiku-apps/butterfly/butterfly-1.6.2.recipe
index b10f73e85..fe867787a 100644
--- a/haiku-apps/butterfly/butterfly-1.6.2.recipe
+++ b/haiku-apps/butterfly/butterfly-1.6.2.recipe
@@ -18,10 +18,10 @@ PROVIDES="
 	app:Butterfly = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe
index 2b3010364..f23636c4e 100644
--- a/haiku-apps/capitalbe/capitalbe-1.1.recipe
+++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsqlite3
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsqlite3
 	"
 
diff --git a/haiku-apps/caya/caya-2013.10.12.recipe b/haiku-apps/caya/caya-2013.10.12.recipe
index 55c858ee2..30520ff1d 100644
--- a/haiku-apps/caya/caya-2013.10.12.recipe
+++ b/haiku-apps/caya/caya-2013.10.12.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	lib:libexpat
 	lib:libssl
@@ -23,7 +23,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:jam
diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe
index a71583d8b..bda8b5a89 100644
--- a/haiku-apps/cdplayer/cdplayer-1.0.recipe
+++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe
@@ -26,11 +26,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe
index 6ff520339..0643f3a94 100644
--- a/haiku-apps/chat/chat-20100903.recipe
+++ b/haiku-apps/chat/chat-20100903.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libexpat$SecondaryArchSuffix
 	"
diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
index c79ed73c6..f2999945d 100644
--- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
+++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	taglib_devel
 	"
 
diff --git a/haiku-apps/clipup/clipup-2.0.3.recipe b/haiku-apps/clipup/clipup-2.0.3.recipe
index dded03900..decbe35e2 100644
--- a/haiku-apps/clipup/clipup-2.0.3.recipe
+++ b/haiku-apps/clipup/clipup-2.0.3.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	app:ClipUp = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -29,7 +29,7 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe
index c1921e6ff..b80fab883 100644
--- a/haiku-apps/clockwerk/clockwerk-git.recipe
+++ b/haiku-apps/clockwerk/clockwerk-git.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	app:Clockwerk = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
index a0a6339d7..dbfb887cf 100644
--- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	app:CmakeHaiku = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:cmake
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/haiku-apps/colors/colors-2.3.recipe b/haiku-apps/colors/colors-2.3.recipe
index b88b0b3bb..1aa125576 100644
--- a/haiku-apps/colors/colors-2.3.recipe
+++ b/haiku-apps/colors/colors-2.3.recipe
@@ -30,7 +30,7 @@ REQUIRES=""
 
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe
index d26ef8797..d70b2fbb4 100644
--- a/haiku-apps/converttolf/converttolf-0.0.0.recipe
+++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD()
 {
diff --git a/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe b/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe
index a07440498..25fade4b1 100644
--- a/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe
+++ b/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	app:CopyNameToClipboard = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
index 0e9852022..848f3b38c 100644
--- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
+++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
@@ -18,11 +18,11 @@ PROVIDES="
         "
 
 REQUIRES="
-        haiku >= $haikuVersion
+        haiku
         "
 
 BUILD_REQUIRES="
-              haiku_devel >= $haikuVersion
+              haiku_devel
               cmd:make
               cmd:gcc
               cmd:xres
diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
index a4f72a619..95e433d68 100644
--- a/haiku-apps/digiclock/digiclock-1.0.recipe
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -19,10 +19,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion"
+	haiku_devel"
 
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
index ced9f7eac..a90b59b49 100644
--- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
+++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
index ac608767a..8834cff26 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libdjvulibre$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -33,7 +33,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libdjvulibre$secondaryArchSuffix
 	devel:libmupdf$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
diff --git a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
index fad7d6b60..27b762d59 100644
--- a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
+++ b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe
@@ -11,7 +11,7 @@ PROVIDES="
 	addon:DuckSaver = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -20,7 +20,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/einsteinium/einsteinium-20141023.recipe b/haiku-apps/einsteinium/einsteinium-20141023.recipe
index e6867d7f3..57f859cc3 100644
--- a/haiku-apps/einsteinium/einsteinium-20141023.recipe
+++ b/haiku-apps/einsteinium/einsteinium-20141023.recipe
@@ -21,13 +21,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsqlite3
 	lib:libxml2
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	devel:libsqlite3
 	devel:libxml2
diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe
index d402d789c..ecd397cda 100644
--- a/haiku-apps/filecropper/filecropper-1.recipe
+++ b/haiku-apps/filecropper/filecropper-1.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/filer/filer-1.0.0beta3.recipe b/haiku-apps/filer/filer-1.0.0beta3.recipe
index 74042b323..f7442f7b9 100644
--- a/haiku-apps/filer/filer-1.0.0beta3.recipe
+++ b/haiku-apps/filer/filer-1.0.0beta3.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsqlite3
 	"
 
@@ -35,7 +35,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsqlite3
 	"
 
diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
index 8680cb656..2e1b64d91 100644
--- a/haiku-apps/filwip/filwip-1.0.0.recipe
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -29,7 +29,7 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe
index ab80fa62c..d78636953 100644
--- a/haiku-apps/finance/finance-1.0.0.recipe
+++ b/haiku-apps/finance/finance-1.0.0.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	app:Finance = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	cmd:xres
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe
index 8335b90c5..02992996c 100644
--- a/haiku-apps/foldershaper/foldershaper-1.0.recipe
+++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe
index 366c7b2f4..77525b44d 100644
--- a/haiku-apps/fontboy/fontboy-0.9.7.recipe
+++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	app:FontBoy = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 USER_SETTINGS_FILES="
 	settings/Fontboy_prefs
diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe
index fb54c05f9..c1be91b9a 100644
--- a/haiku-apps/fortuna/fortuna-1.0.0.recipe
+++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -32,7 +32,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/friss/friss-0.8.0.recipe b/haiku-apps/friss/friss-0.8.0.recipe
index 70e27e505..a68ce55d2 100644
--- a/haiku-apps/friss/friss-0.8.0.recipe
+++ b/haiku-apps/friss/friss-0.8.0.recipe
@@ -15,7 +15,7 @@ PROVIDES="
 BUILD_REQUIRES="
 	cmd:jam
 	cmd:gcc
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD()
 {
diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe
index eca43be0b..27d716bd3 100644
--- a/haiku-apps/ftppositive/ftppositive-1.0.recipe
+++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/globe/globe-0.4.recipe b/haiku-apps/globe/globe-0.4.recipe
index f2f168474..43fe364f3 100644
--- a/haiku-apps/globe/globe-0.4.recipe
+++ b/haiku-apps/globe/globe-0.4.recipe
@@ -12,11 +12,11 @@ REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:make
diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
index 9fb01b977..b44264002 100644
--- a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
+++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
@@ -23,12 +23,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
 	"
 
diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe
index 6a22b4e3d..fb5ff5e32 100644
--- a/haiku-apps/hare/hare-1.1.1.recipe
+++ b/haiku-apps/hare/hare-1.1.1.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:lame
 	cmd:oggenc$secondaryArchSuffix
 	cmd:flac$secondaryArchSuffix
@@ -30,7 +30,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libtag$secondaryArchSuffix
 	"
 
diff --git a/haiku-apps/hdialog/hdialog-0.1_git.recipe b/haiku-apps/hdialog/hdialog-0.1_git.recipe
index 314909963..e4374286c 100644
--- a/haiku-apps/hdialog/hdialog-0.1_git.recipe
+++ b/haiku-apps/hdialog/hdialog-0.1_git.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:make
diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe
index 22ebdf6a8..79f1666a5 100644
--- a/haiku-apps/jammin/jammin-0.1.0.recipe
+++ b/haiku-apps/jammin/jammin-0.1.0.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
index 03e09df07..2e01a0130 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	keymapswitcher = $portVersion compat >= 1.2.7
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:ld
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
index 867262f5e..9d327c79b 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	app:KeymapSwitcher = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
index e94097d48..991ae6cda 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	keymapswitcher = $portVersion compat >= 1.2.7
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:ld
diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe
index 18a706ed8..2e42a6dd6 100644
--- a/haiku-apps/konfetti/konfetti-1.0.0.recipe
+++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	app:Konfetti = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -24,7 +24,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/launchpad/launchpad-1.3.recipe b/haiku-apps/launchpad/launchpad-1.3.recipe
index fc66e8d47..2b52392cd 100644
--- a/haiku-apps/launchpad/launchpad-1.3.recipe
+++ b/haiku-apps/launchpad/launchpad-1.3.recipe
@@ -20,17 +20,17 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libprefs
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	lib:libprefs
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/haiku-apps/lava/lava-1.0.recipe b/haiku-apps/lava/lava-1.0.recipe
index c10365b3f..551898d8c 100644
--- a/haiku-apps/lava/lava-1.0.recipe
+++ b/haiku-apps/lava/lava-1.0.recipe
@@ -15,12 +15,12 @@ PROVIDES="
 	add_on:Lava = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libburndevice
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libburndevice
 	"
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe
index cfdb8959e..54c535e35 100644
--- a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe
+++ b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:jam
 	cmd:unzip
diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe
index eee731325..cb38cae71 100644
--- a/haiku-apps/masterpiece/masterpiece-r742.recipe
+++ b/haiku-apps/masterpiece/masterpiece-r742.recipe
@@ -24,13 +24,13 @@ PROVIDES="
 	app:MasterPiece = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:liblayout
 	lib:libpython2.7
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libpython2.7
 	"
diff --git a/haiku-apps/microbe/microbe-20130728.recipe b/haiku-apps/microbe/microbe-20130728.recipe
index 9fb4073d4..76456ea1d 100644
--- a/haiku-apps/microbe/microbe-20130728.recipe
+++ b/haiku-apps/microbe/microbe-20130728.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:mkdepend
 	cmd:make
diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
index 18afdbe34..d36c1f15f 100644
--- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
+++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -34,7 +34,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 PATCHES="minimizeall-1.0.0.patch"
diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe
index 7fa822c5f..200b038d1 100644
--- a/haiku-apps/mkdepend/mkdepend-1.7.recipe
+++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	cmd:mkdepend = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	"
diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
index db50806ae..902d6de8c 100644
--- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -14,10 +14,10 @@ PROVIDES="
 	app:MrPeeps = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe
index 11c2822aa..806787a5b 100644
--- a/haiku-apps/netpulse/netpulse-0.2.3.recipe
+++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe
@@ -20,7 +20,7 @@ REQUIRES=""
 
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/haiku-apps/nightandday/nightsandday-0.1.2.recipe b/haiku-apps/nightandday/nightsandday-0.1.2.recipe
index fc18a58bf..dedfc5069 100644
--- a/haiku-apps/nightandday/nightsandday-0.1.2.recipe
+++ b/haiku-apps/nightandday/nightsandday-0.1.2.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD()
diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
index 77b67d99c..cded4d3d9 100644
--- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
+++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:optipng$optipngSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:as
diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe
index d5f850172..60cf19651 100644
--- a/haiku-apps/organizer/organizer-0.1.recipe
+++ b/haiku-apps/organizer/organizer-0.1.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libGL
 	makefile_engine
 	cmd:gcc
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 USER_SETTINGS_FILES="
diff --git a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
index 3b49e9f17..3c062ec13 100644
--- a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
+++ b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:python
 	cmd:sed
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	python_setuptools
 	"
 
diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe
index fa1e4077f..9bdec1b6d 100644
--- a/haiku-apps/paladin/paladin-1.3.recipe
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	cmd:rez = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpcre
 	cmd:fastdep
 	cmd:ccache
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
 	devel:libpcre
 "
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/haiku-apps/paladin/paladin-20141022.recipe b/haiku-apps/paladin/paladin-20141022.recipe
index 1295b54d9..ecac0b523 100644
--- a/haiku-apps/paladin/paladin-20141022.recipe
+++ b/haiku-apps/paladin/paladin-20141022.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpcre
 	lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libpcre
 	devel:libz
 	"
diff --git a/haiku-apps/pecorename/pecorename-1.5.recipe b/haiku-apps/pecorename/pecorename-1.5.recipe
index a8ee966af..edda66da8 100644
--- a/haiku-apps/pecorename/pecorename-1.5.recipe
+++ b/haiku-apps/pecorename/pecorename-1.5.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	app:PecoRename = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe
index 40d499dfc..1964886cd 100644
--- a/haiku-apps/peek/peek-20140206.recipe
+++ b/haiku-apps/peek/peek-20140206.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -29,7 +29,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe
index 3e018b8d1..f2cefbbbe 100644
--- a/haiku-apps/phantomlimb/phantomlimb-1.recipe
+++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -35,7 +35,7 @@ BUILD_PREREQUIRES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD()
diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
index d2cb3e7c2..dda261d54 100644
--- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
+++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe
@@ -15,10 +15,10 @@ PROVIDES="
 	app:PPViewer = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:g++
diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe
index 754692d93..d965a62e6 100644
--- a/haiku-apps/querywatcher/querywatcher-1.4.recipe
+++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
index b2b4a080e..9e6fbd518 100644
--- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
+++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
@@ -18,10 +18,10 @@ PROVIDES="
 	app:quicklaunch = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
index da8537ee2..d22691790 100644
--- a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
+++ b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
@@ -18,10 +18,10 @@ PROVIDES="
 	app:QuickLaunch = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
index 1cbcbc3f4..672daa2d7 100644
--- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
+++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
index a5a229142..8e0ef8774 100644
--- a/haiku-apps/recibe/recibe-1.0b1.recipe
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsqlite3
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libsqlite3
 	"
 
diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
index 7a78c17ee..dde1f6f49 100644
--- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	addon:rcinputdevice = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -32,7 +32,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe
index 0ad131b77..ad2b26ea2 100644
--- a/haiku-apps/rename/rename-3.9.0.recipe
+++ b/haiku-apps/rename/rename-3.9.0.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	app:rename = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	makefile_engine
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
index d1b8a0cc2..6860697a9 100644
--- a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
+++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe
index ce693f781..7e92e36d7 100644
--- a/haiku-apps/resourcer/resourcer-1.0.recipe
+++ b/haiku-apps/resourcer/resourcer-1.0.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -28,7 +28,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend"
 	
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/rez/rez-108.recipe b/haiku-apps/rez/rez-108.recipe
index 259c972a5..135d7ce4b 100644
--- a/haiku-apps/rez/rez-108.recipe
+++ b/haiku-apps/rez/rez-108.recipe
@@ -14,12 +14,12 @@ SOURCE_DIR="Rez-1.0"
 REVISION="1"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:make
 	cmd:flex
 	cmd:bison
diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe
index 7ff5210aa..3e3daa8c0 100644
--- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe
+++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
index c059d28ec..6dd8e6c45 100644
--- a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
+++ b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:awk
 	cmd:wget
 	cmd:unzip
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsword$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	icu${secondaryArchSuffix}_devel
diff --git a/haiku-apps/seeker/seeker-1.0.recipe b/haiku-apps/seeker/seeker-1.0.recipe
index 7b0dd91fa..268b3b29e 100644
--- a/haiku-apps/seeker/seeker-1.0.recipe
+++ b/haiku-apps/seeker/seeker-1.0.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsanta
 	"
 
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
     cmd:ld
diff --git a/haiku-apps/shredder/shredder-1.0.0.recipe b/haiku-apps/shredder/shredder-1.0.0.recipe
index b9e07f76a..578553f0b 100644
--- a/haiku-apps/shredder/shredder-1.0.0.recipe
+++ b/haiku-apps/shredder/shredder-1.0.0.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:make
 	cmd:gcc
diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe
index 62c04e8d6..f1fb5e84a 100644
--- a/haiku-apps/slayer/slayer-0.9.recipe
+++ b/haiku-apps/slayer/slayer-0.9.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	"
 
diff --git a/haiku-apps/sortsave/sortsave-1.0.recipe b/haiku-apps/sortsave/sortsave-1.0.recipe
index 68fa57e09..4d8f59731 100644
--- a/haiku-apps/sortsave/sortsave-1.0.recipe
+++ b/haiku-apps/sortsave/sortsave-1.0.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion"
+	haiku_devel"
 
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-apps/substrate/substrate-1.0.recipe b/haiku-apps/substrate/substrate-1.0.recipe
index 932eb950a..0fef123bd 100644
--- a/haiku-apps/substrate/substrate-1.0.recipe
+++ b/haiku-apps/substrate/substrate-1.0.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -27,7 +27,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe
index bd7f8307e..3ac3683f3 100644
--- a/haiku-apps/sum_it/sum_it-0.2beta.recipe
+++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe
index 0158096eb..eceee8761 100644
--- a/haiku-apps/systeminfo/systeminfo-2.recipe
+++ b/haiku-apps/systeminfo/systeminfo-2.recipe
@@ -25,11 +25,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe
index 277c5efaa..c00265afc 100644
--- a/haiku-apps/takenotes/takenotes-1.0.0.recipe
+++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
index b62f9d3fc..13a213ac5 100644
--- a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
+++ b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	"
 REQUIRES=""
 
-BUILD_REQUIRES="haiku >= $haikuVersion"
+BUILD_REQUIRES="haiku"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe
index f02a03927..4da81207d 100644
--- a/haiku-apps/textsaver/textsaver-1.0.recipe
+++ b/haiku-apps/textsaver/textsaver-1.0.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion"
+	haiku_devel"
 
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe
index e8ad70e53..29013cdf3 100644
--- a/haiku-apps/thememanager/thememanager-1.0_git.recipe
+++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe
@@ -17,10 +17,10 @@ PROVIDES="
 	app:ThemeManager = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe
index a292964a7..c779ba02e 100644
--- a/haiku-apps/timecop/timecop-0.61.recipe
+++ b/haiku-apps/timecop/timecop-0.61.recipe
@@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 !ppc"
 CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94"
 
 REQUIRES="
-	haiku >= $haikuVersion 
+	haiku 
 "
 	
 PROVIDES="
@@ -23,7 +23,7 @@ PROVIDES="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe
index 4d0e3c9ce..ef253b700 100644
--- a/haiku-apps/tolmach/tolmach-1.1.0.recipe
+++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe
index b398df881..fae73c6d6 100644
--- a/haiku-apps/torrentor/torrentor-0.0.5.recipe
+++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libssl${secondaryArchSuffix}
 	lib:libcurl${secondaryArchSuffix}
 	lib:libevent${secondaryArchSuffix}
@@ -34,7 +34,7 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libevent${secondaryArchSuffix}
 	devel:libssl${secondaryArchSuffix}
 	devel:libcurl${secondaryArchSuffix}
diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe
index 68df9c5ff..f026386dd 100644
--- a/haiku-apps/trackergrep/trackergrep-5.1.recipe
+++ b/haiku-apps/trackergrep/trackergrep-5.1.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/ubertuber/ubertuber-0.9.10.recipe b/haiku-apps/ubertuber/ubertuber-0.9.10.recipe
index 67a4d0d25..c554a6c41 100644
--- a/haiku-apps/ubertuber/ubertuber-0.9.10.recipe
+++ b/haiku-apps/ubertuber/ubertuber-0.9.10.recipe
@@ -30,11 +30,11 @@ PROVIDES="
 	app:UberTuber = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:youtube_dl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
index b536dc221..c5ddd0c96 100644
--- a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
+++ b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	"
 
diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe
index be0677f1b..2d8e9c716 100644
--- a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe
+++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe
@@ -23,11 +23,11 @@ PROVIDES="
 	app:ubertuber = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:youtube_dl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/ubertuber/ubertuber-0.9.9.recipe b/haiku-apps/ubertuber/ubertuber-0.9.9.recipe
index 89ed1584b..e610c3862 100644
--- a/haiku-apps/ubertuber/ubertuber-0.9.9.recipe
+++ b/haiku-apps/ubertuber/ubertuber-0.9.9.recipe
@@ -30,12 +30,12 @@ PROVIDES="
 	app:ubertuber = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	cmd:youtube_dl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
index 485ac883d..872fd49f8 100644
--- a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
+++ b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
@@ -17,7 +17,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/haiku-apps/vision/vision-0.9.7.r949.recipe b/haiku-apps/vision/vision-0.9.7.r949.recipe
index 940c2f892..705606842 100644
--- a/haiku-apps/vision/vision-0.9.7.r949.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r949.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	app:Vision = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:find
 	cmd:gcc
 	cmd:ld
diff --git a/haiku-apps/waveview/waveview-1.0.recipe b/haiku-apps/waveview/waveview-1.0.recipe
index a173ee062..2acdae34e 100644
--- a/haiku-apps/waveview/waveview-1.0.recipe
+++ b/haiku-apps/waveview/waveview-1.0.recipe
@@ -15,13 +15,13 @@ PROVIDES="
 	"
  
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpcre
 	lib:libpcreposix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libpcre
 	devel:libpcreposix
 	"
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD()
diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe
index 23b06c5fe..da59332b4 100644
--- a/haiku-apps/whisper/whisper-1.2.recipe
+++ b/haiku-apps/whisper/whisper-1.2.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.2.recipe b/haiku-apps/yab_ide/yab_ide-2.2.2.recipe
index 98bd9090f..6295aa0e1 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.2.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.2.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 		"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	yab$secondaryArchSuffix >= 1.7.02
 	devel:libncurses$secondaryArchSuffix
@@ -31,7 +31,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 "
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe
index da89bf515..076e83268 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 		"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	yab$secondaryArchSuffix >= 1.7.02
 	devel:libncurses$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 "
diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe
index b1479ef31..45db64af4 100644
--- a/haiku-games/becheckers/becheckers-1.0.1.recipe
+++ b/haiku-games/becheckers/becheckers-1.0.1.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-games/bespider/bespider-0.1.0.recipe b/haiku-games/bespider/bespider-0.1.0.recipe
index 002a1a37c..707f7ccd9 100644
--- a/haiku-games/bespider/bespider-0.1.0.recipe
+++ b/haiku-games/bespider/bespider-0.1.0.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-1.1.recipe
index 25ab71ea5..2dae91d2c 100644
--- a/haiku-games/bevexed/bevexed-1.1.recipe
+++ b/haiku-games/bevexed/bevexed-1.1.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-games/guitarmaster/guitarmaster-r21.recipe b/haiku-games/guitarmaster/guitarmaster-r21.recipe
index ceaf4fdfa..c266f96c8 100644
--- a/haiku-games/guitarmaster/guitarmaster-r21.recipe
+++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe
@@ -17,12 +17,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	"
 
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
index f8f554ed6..2bbb541d7 100644
--- a/haiku-games/puri/puri-0.3.9.1.recipe
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -24,13 +24,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libglu$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	"
diff --git a/haiku-games/w6/w6-1.7.recipe b/haiku-games/w6/w6-1.7.recipe
index 6130be20d..f61d3dc9e 100644
--- a/haiku-games/w6/w6-1.7.recipe
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -22,10 +22,10 @@ PROVIDES="
 	app:w6 = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe
index e24665865..4d1d32e71 100644
--- a/haiku-libs/ale/ale-0.9.1.recipe
+++ b/haiku-libs/ale/ale-0.9.1.recipe
@@ -30,10 +30,10 @@ PROVIDES="
 	app:ALEditor = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
index b54bb4539..53cb21cd2 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
@@ -38,7 +38,7 @@ PROVIDES="
 	lib:libwtf$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	icu$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -48,7 +48,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	icu${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
index 247dc8f8b..6184aed68 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
@@ -31,7 +31,7 @@ PROVIDES="
 	lib:libwtf$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	icu$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -41,8 +41,8 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	icu${secondaryArchSuffix}_devel
 	cmd:pkg_config
 	devel:libjpeg$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
index 4d3551f9d..1ace490fb 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	icu$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -39,8 +39,8 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	icu${secondaryArchSuffix}_devel
 	cmd:pkg_config
 	devel:libruby$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
index 5c0452b39..608e296bf 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -39,8 +39,8 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
index 07d7b7124..a3b865868 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -41,8 +41,8 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
index 0113d6281..95291bc0c 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -40,8 +40,8 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
index 3a5237b48..ae50d63f5 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -40,8 +40,8 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
index 6d992ca9a..6b9dc620e 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	lib:libWebKit$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -43,8 +43,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
index 39d1fb7ff..7e57895ab 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -47,8 +47,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
index aa53e9a76..fd7921b39 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
index a726061eb..9fe2da312 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -50,8 +50,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
index f9bebf71b..881181196 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -50,8 +50,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
index c556d5fd5..a0cfc4905 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
index e1e0c4382..b204d735e 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
index 5c35fae3e..bf4d5e17a 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
index 17413af27..d509a894f 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -48,8 +48,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
index b78b014af..ac71b09d1 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -48,8 +48,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
index 4ac4143e3..166e779df 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -49,8 +49,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
index 0889d09b5..d10000ba9 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -50,8 +50,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
index 8b9d5c32b..828a83f7f 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	cmd:jsc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -50,8 +50,8 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/haiku-libs/libburndevice/libburndevice-1.0.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe
index f4377bbf7..da9aec72b 100644
--- a/haiku-libs/libburndevice/libburndevice-1.0.recipe
+++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 	lib:libburndevice$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:cdrecord
 	"
 
@@ -29,7 +29,7 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe
index caca21844..974fe9dae 100644
--- a/haiku-libs/libprefs/libprefs-1.2.5.recipe
+++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe
@@ -17,15 +17,15 @@ PROVIDES="
 	lib:libprefs$secondaryArchSuffix = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku$secondaryArchSuffix
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc
 "
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/haiku-libs/libsanta/libsanta-3.0.1.recipe b/haiku-libs/libsanta/libsanta-3.0.1.recipe
index cce9fbd2a..12b1ec4d9 100644
--- a/haiku-libs/libsanta/libsanta-3.0.1.recipe
+++ b/haiku-libs/libsanta/libsanta-3.0.1.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/haiku-libs/libwalter/libwalter-97.recipe b/haiku-libs/libwalter/libwalter-97.recipe
index 3fcaa7f10..da836ff93 100644
--- a/haiku-libs/libwalter/libwalter-97.recipe
+++ b/haiku-libs/libwalter/libwalter-97.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	lib:libwalter$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	cmd:jam
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 SOURCE_DIR="LibWalter-59fdad559ee3dbcc58675cb27502ececce795bbc"
 
diff --git a/haiku-misc/rssavers/rssavers-0.2.recipe b/haiku-misc/rssavers/rssavers-0.2.recipe
index 747af004f..7f60c9eaa 100644
--- a/haiku-misc/rssavers/rssavers-0.2.recipe
+++ b/haiku-misc/rssavers/rssavers-0.2.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	addon:Plasma = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgl
 	lib:libglu
 	"
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 	devel:libglu
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD()
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
index 3e0ac1ec4..0f42ec5ad 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libQtGui$secondaryArchSuffix
 	lib:libQtCore$secondaryArchSuffix
 	"
diff --git a/media-gfx/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe
index c3a556817..b19e8ba33 100644
--- a/media-gfx/exiv2/exiv2-0.24.recipe
+++ b/media-gfx/exiv2/exiv2-0.24.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	lib:libexiv2$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:autoconf
 	cmd:make
diff --git a/media-gfx/fontforge/fontforge-20141126.recipe b/media-gfx/fontforge/fontforge-20141126.recipe
index 7aa04eebc..729a75e09 100644
--- a/media-gfx/fontforge/fontforge-20141126.recipe
+++ b/media-gfx/fontforge/fontforge-20141126.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libgioftp$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -50,7 +50,7 @@ REQUIRES="
 	lib:libltdl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
@@ -109,5 +109,5 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	fontforge$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
diff --git a/media-gfx/graphite2/graphite2-1.2.4.recipe b/media-gfx/graphite2/graphite2-1.2.4.recipe
index a851ab29a..f02d01e43 100644
--- a/media-gfx/graphite2/graphite2-1.2.4.recipe
+++ b/media-gfx/graphite2/graphite2-1.2.4.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	lib:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -68,6 +68,6 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	graphite2$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe
index 60915fb14..8ea406e70 100644
--- a/media-gfx/graphviz/graphviz-2.26.3.recipe
+++ b/media-gfx/graphviz/graphviz-2.26.3.recipe
@@ -79,7 +79,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -89,7 +89,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe b/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe
index 8275ba090..030d22c6a 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe
+++ b/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libbz2
 	lib:libfreetype
 	lib:libjpeg
@@ -67,7 +67,7 @@ BUILD_REQUIRES="
 #	devel:libcms
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe
index 3edbfe0c4..ea3dedab1 100644
--- a/media-gfx/optipng/optipng-0.7.4.recipe
+++ b/media-gfx/optipng/optipng-0.7.4.recipe
@@ -18,13 +18,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng
 	lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpng
 	devel:libz
 	"
diff --git a/media-gfx/pngcrush/pngcrush-1.7.81.recipe b/media-gfx/pngcrush/pngcrush-1.7.81.recipe
index 3354448b3..275a63889 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.81.recipe
+++ b/media-gfx/pngcrush/pngcrush-1.7.81.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpng16
 	lib:libz
 	"
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/media-gfx/qrencode/qrencode-3.3.0.recipe b/media-gfx/qrencode/qrencode-3.3.0.recipe
index 2a3ab01f0..065a8adf8 100644
--- a/media-gfx/qrencode/qrencode-3.3.0.recipe
+++ b/media-gfx/qrencode/qrencode-3.3.0.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	lib:libqrencode$secondaryArchSuffix  = 3.3.0 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -36,7 +36,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe
index 4efd7b376..49b525b33 100644
--- a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe
+++ b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	qrencode_kdl = $portVersion
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	"
@@ -61,5 +61,5 @@ PROVIDES_devel="
 	devel:libqrencode_kdl = 3.3.0 compat >= 3
 	"
 REQUIRES_devel="
-	haiku >= $haikuVersion
+	haiku
 	"
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
index b849bfbb6..6271e1be4 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libfribidi
 	lib:libiconv
 	lib:libintl
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel  >= $haikuVersion
+	haiku_devel
 	devel:libfribidi
 	devel:libiconv
 	devel:libintl
diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe
index 831ae872d..bdf844721 100644
--- a/media-libs/a52dec/a52dec-0.7.4.recipe
+++ b/media-libs/a52dec/a52dec-0.7.4.recipe
@@ -25,14 +25,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe
index f47de0ca0..64a0cea6c 100644
--- a/media-libs/aalib/aalib-1.4rc4.recipe
+++ b/media-libs/aalib/aalib-1.4rc4.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe
index fe45935fd..2f420db9b 100644
--- a/media-libs/allegro/allegro-4.4.1.1.recipe
+++ b/media-libs/allegro/allegro-4.4.1.1.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng
 	lib:libz
 	lib:libogg
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:cmake
@@ -79,7 +79,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	allegro$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe
index 0b19c96ae..54fc9b085 100644
--- a/media-libs/allegro/allegro-4.4.2.recipe
+++ b/media-libs/allegro/allegro-4.4.2.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
@@ -43,7 +43,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
@@ -96,6 +96,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	allegro$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/devil/devil-1.7.8.recipe b/media-libs/devil/devil-1.7.8.recipe
index 9722b388c..fd23e4774 100644
--- a/media-libs/devil/devil-1.7.8.recipe
+++ b/media-libs/devil/devil-1.7.8.recipe
@@ -12,7 +12,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -65,7 +65,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	devil$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/media-libs/djvulibre/djvulibre-3.5.25.recipe b/media-libs/djvulibre/djvulibre-3.5.25.recipe
index 45f784f93..d70ea50b0 100644
--- a/media-libs/djvulibre/djvulibre-3.5.25.recipe
+++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe
@@ -46,7 +46,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
@@ -62,7 +62,7 @@ BUILD_REQUIRES="
 #needs devel:libtiff too but that isn't provided by anything
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:aclocal
diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe
index 6f8c5676e..2ed315a18 100644
--- a/media-libs/faac/faac-1.28.recipe
+++ b/media-libs/faac/faac-1.28.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe
index ef79da56f..45ebeb10b 100644
--- a/media-libs/faad2/faad2-2.7.recipe
+++ b/media-libs/faad2/faad2-2.7.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/flac/flac-1.3.1.recipe b/media-libs/flac/flac-1.3.1.recipe
index a7310c6bd..fb139c55a 100644
--- a/media-libs/flac/flac-1.3.1.recipe
+++ b/media-libs/flac/flac-1.3.1.recipe
@@ -37,14 +37,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	"
diff --git a/media-libs/flickcurl/flickcurl-1.26.recipe b/media-libs/flickcurl/flickcurl-1.26.recipe
index 9313814d0..3cb7caab8 100644
--- a/media-libs/flickcurl/flickcurl-1.26.recipe
+++ b/media-libs/flickcurl/flickcurl-1.26.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	cmd:flickrdf$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	# required by libcurl and libxml2
@@ -44,7 +44,7 @@ REQUIRES="
 	lib:libcrypto$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	"
diff --git a/media-libs/fontconfig/fontconfig-2.11.0.recipe b/media-libs/fontconfig/fontconfig-2.11.0.recipe
index 4808b7513..35b8c01a8 100644
--- a/media-libs/fontconfig/fontconfig-2.11.0.recipe
+++ b/media-libs/fontconfig/fontconfig-2.11.0.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/fontconfig/fontconfig-2.11.1.recipe b/media-libs/fontconfig/fontconfig-2.11.1.recipe
index 76867e639..f91baaab0 100644
--- a/media-libs/fontconfig/fontconfig-2.11.1.recipe
+++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/freetype/freetype-2.5.3.recipe b/media-libs/freetype/freetype-2.5.3.recipe
index ae7780a1c..23113d9d4 100644
--- a/media-libs/freetype/freetype-2.5.3.recipe
+++ b/media-libs/freetype/freetype-2.5.3.recipe
@@ -21,13 +21,13 @@ PROVIDES="
 	lib:libfreetype$secondaryArchSuffix = 6.11.2 compat >= 6
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1
 	lib:libpng16$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
diff --git a/media-libs/gd/gd-2.1.recipe b/media-libs/gd/gd-2.1.recipe
index 3094fafc9..5bb77a769 100644
--- a/media-libs/gd/gd-2.1.recipe
+++ b/media-libs/gd/gd-2.1.recipe
@@ -15,14 +15,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpng
 	lib:libjpeg
 	lib:libgif
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe
index b4a66d6d0..cdcf9f9df 100644
--- a/media-libs/giflib/giflib-5.0.5.recipe
+++ b/media-libs/giflib/giflib-5.0.5.recipe
@@ -40,11 +40,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 	
 BUILD_PREREQUIRES="
diff --git a/media-libs/giflib/giflib-5.1.0.recipe b/media-libs/giflib/giflib-5.1.0.recipe
index eacfa0641..111d9f31a 100644
--- a/media-libs/giflib/giflib-5.1.0.recipe
+++ b/media-libs/giflib/giflib-5.1.0.recipe
@@ -40,11 +40,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 	
 BUILD_PREREQUIRES="
diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe
index 4d5082cfc..19f9ca382 100644
--- a/media-libs/glew/glew-1.10.0.recipe
+++ b/media-libs/glew/glew-1.10.0.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 	lib:libGLEW$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -76,7 +76,7 @@ PROVIDES_util="
 
 REQUIRES_util="
 	glew$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libGLEW$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
diff --git a/media-libs/glew/glew-1.11.0.recipe b/media-libs/glew/glew-1.11.0.recipe
index 8240f9859..0c7db2597 100644
--- a/media-libs/glew/glew-1.11.0.recipe
+++ b/media-libs/glew/glew-1.11.0.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 	lib:libGLEW$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -78,7 +78,7 @@ PROVIDES_util="
 
 REQUIRES_util="
 	glew$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libGLEW$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe
index 3533dac45..40bdcb2af 100644
--- a/media-libs/guilib/guilib-1.2.1.recipe
+++ b/media-libs/guilib/guilib-1.2.1.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	"
 	
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.29.recipe b/media-libs/harfbuzz/harfbuzz-0.9.29.recipe
index 3614601c9..de2c0d39a 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.29.recipe
+++ b/media-libs/harfbuzz/harfbuzz-0.9.29.recipe
@@ -19,7 +19,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:automake
 	cmd:gcc
 	cmd:gtkdocize
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe b/media-libs/harfbuzz/harfbuzz-0.9.36.recipe
index f9f9c661b..f596c98b4 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe
+++ b/media-libs/harfbuzz/harfbuzz-0.9.36.recipe
@@ -38,7 +38,7 @@ PROVIDES="
 	cmd:hb_shape$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libgraphite2$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe
index 8a84ba709..b574ef42f 100644
--- a/media-libs/ilmbase/ilmbase-2.1.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe
@@ -37,10 +37,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe
index eadf7f232..bd9209d1f 100644
--- a/media-libs/ilmbase/ilmbase-2.2.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe
@@ -34,11 +34,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/im/im-3.8.recipe b/media-libs/im/im-3.8.recipe
index c0de5b612..2d5a1e4b8 100644
--- a/media-libs/im/im-3.8.recipe
+++ b/media-libs/im/im-3.8.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 "
 
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe
index c1233dd90..84b608274 100644
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -24,11 +24,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -101,6 +101,6 @@ if [ -z "$secondaryArchSuffix" ]; then
 		"
 	REQUIRES_tools="
 		jasper$secondaryArchSuffix == $portVersion base
-		haiku$secondaryArchSuffix >= $haikuVersion
+		haiku$secondaryArchSuffix
 		"
 fi
diff --git a/media-libs/jbig2dec/jbig2dec-0.11.recipe b/media-libs/jbig2dec/jbig2dec-0.11.recipe
index df2951fee..12547a688 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11.recipe
+++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe
@@ -29,11 +29,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe
index 7907ab95d..8d5e49dc1 100644
--- a/media-libs/jgmod/jgmod-0.99.recipe
+++ b/media-libs/jgmod/jgmod-0.99.recipe
@@ -23,7 +23,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:liballeg
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/jpeg/jpeg-8d.recipe b/media-libs/jpeg/jpeg-8d.recipe
index d2cbbe6f0..6809d7fe4 100644
--- a/media-libs/jpeg/jpeg-8d.recipe
+++ b/media-libs/jpeg/jpeg-8d.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 8
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -101,7 +101,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:wrjpgcom = $portVersion compat >= 8
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
+		haiku
 		jpeg == $portVersion base
 		"
 fi
diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe
index 0ee9396a2..dc65e6f27 100644
--- a/media-libs/jpeg/jpeg-9.recipe
+++ b/media-libs/jpeg/jpeg-9.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -99,7 +99,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:wrjpgcom = $portVersion compat >= 9
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
+		haiku
 		jpeg == $portVersion base
 		"
 fi
diff --git a/media-libs/jpeg/jpeg-9a.recipe b/media-libs/jpeg/jpeg-9a.recipe
index 2a4761230..d35e169a1 100644
--- a/media-libs/jpeg/jpeg-9a.recipe
+++ b/media-libs/jpeg/jpeg-9a.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	lib:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -96,7 +96,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:wrjpgcom = $portVersion compat >= 9
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
+		haiku
 		jpeg == $portVersion base
 		"
 fi
diff --git a/media-libs/lcms/lcms-2.6.recipe b/media-libs/lcms/lcms-2.6.recipe
index 0d22644ff..54f17e369 100644
--- a/media-libs/lcms/lcms-2.6.recipe
+++ b/media-libs/lcms/lcms-2.6.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe
index 9e26cdd58..7caaf2fc9 100644
--- a/media-libs/leptonica/leptonica-1.69.recipe
+++ b/media-libs/leptonica/leptonica-1.69.recipe
@@ -28,7 +28,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -37,7 +37,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgif$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
@@ -91,7 +91,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
 
@@ -311,6 +311,6 @@ PROVIDES_tools="
 	cmd:yuvtest$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_tools="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/leptonica/leptonica-1.71.recipe b/media-libs/leptonica/leptonica-1.71.recipe
index 7a24e2c72..db1bbeff4 100644
--- a/media-libs/leptonica/leptonica-1.71.recipe
+++ b/media-libs/leptonica/leptonica-1.71.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgif$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
@@ -86,7 +86,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
 
@@ -307,6 +307,6 @@ PROVIDES_tools="
 	cmd:yuvtest$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_tools="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/libaacs/libaacs-0.7.1.recipe b/media-libs/libaacs/libaacs-0.7.1.recipe
index 1be72437c..e6511a764 100644
--- a/media-libs/libaacs/libaacs-0.7.1.recipe
+++ b/media-libs/libaacs/libaacs-0.7.1.recipe
@@ -31,12 +31,12 @@ PROVIDES="
 	lib:libaacs$secondaryArchSuffix = 0.4.1 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	"
diff --git a/media-libs/libao/libao-1.2.0.recipe b/media-libs/libao/libao-1.2.0.recipe
index 5379b6394..e537ad163 100644
--- a/media-libs/libao/libao-1.2.0.recipe
+++ b/media-libs/libao/libao-1.2.0.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	lib:libao$secondaryArchSuffix = 4.1.0 compat >= 4
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
index 478cc305f..2fcdffd06 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -25,11 +25,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-libs/libass/libass-0.11.2.recipe b/media-libs/libass/libass-0.11.2.recipe
index 657db363d..f0db69802 100644
--- a/media-libs/libass/libass-0.11.2.recipe
+++ b/media-libs/libass/libass-0.11.2.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	lib:libass$secondaryArchSuffix = 5.0.0 compat >= 5
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libenca$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -41,7 +41,7 @@ REQUIRES="
 	lib:libgraphite2$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libenca$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
diff --git a/media-libs/libass/libass-0.12.0.recipe b/media-libs/libass/libass-0.12.0.recipe
index bb88df8ae..4a9650e50 100644
--- a/media-libs/libass/libass-0.12.0.recipe
+++ b/media-libs/libass/libass-0.12.0.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	lib:libass$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libenca$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -41,7 +41,7 @@ REQUIRES="
 	lib:libgraphite2$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libenca$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
diff --git a/media-libs/libaubio/libaubio-0.4.1.recipe b/media-libs/libaubio/libaubio-0.4.1.recipe
index ad9801676..1f05a3130 100644
--- a/media-libs/libaubio/libaubio-0.4.1.recipe
+++ b/media-libs/libaubio/libaubio-0.4.1.recipe
@@ -39,11 +39,11 @@ PROVIDES="$PROVIDES
 fi
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 #	lib:libsamplerate$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 #	devel:libsamplerate$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/libbdplus/libbdplus-0.1.1.recipe b/media-libs/libbdplus/libbdplus-0.1.1.recipe
index 23ed03db6..2c017a206 100644
--- a/media-libs/libbdplus/libbdplus-0.1.1.recipe
+++ b/media-libs/libbdplus/libbdplus-0.1.1.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	lib:libbdplus$secondaryArchSuffix = 0.0.1 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	"
diff --git a/media-libs/libbluray/libbluray-0.6.1.recipe b/media-libs/libbluray/libbluray-0.6.1.recipe
index 1301e5edc..6eaabfb61 100644
--- a/media-libs/libbluray/libbluray-0.6.1.recipe
+++ b/media-libs/libbluray/libbluray-0.6.1.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	cmd:bd_info$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	# required by freetype
@@ -36,7 +36,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	# required by freetype
diff --git a/media-libs/libbluray/libbluray-0.6.2.recipe b/media-libs/libbluray/libbluray-0.6.2.recipe
index bb70295c0..e48bf03e1 100644
--- a/media-libs/libbluray/libbluray-0.6.2.recipe
+++ b/media-libs/libbluray/libbluray-0.6.2.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	cmd:bd_info$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	# required by freetype
@@ -36,7 +36,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	# required by freetype
diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe
index 13d81ed26..74d4dfc4c 100644
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -14,7 +14,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libintl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 "
@@ -24,7 +24,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libcdr/libcdr-0.1.1.recipe b/media-libs/libcdr/libcdr-0.1.1.recipe
index 634cf31c8..3b75ececc 100644
--- a/media-libs/libcdr/libcdr-0.1.1.recipe
+++ b/media-libs/libcdr/libcdr-0.1.1.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libcdr_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
@@ -59,7 +59,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe
index b0b6ce05e..e9d98474e 100644
--- a/media-libs/libcoverart/libcoverart-1.0.0.recipe
+++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjansson$secondaryArchSuffix
 	lib:libneon$secondaryArchSuffix
 	"
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libcuefile/libcuefile-r475.recipe b/media-libs/libcuefile/libcuefile-r475.recipe
index 861de42dd..e1851b0d1 100644
--- a/media-libs/libcuefile/libcuefile-r475.recipe
+++ b/media-libs/libcuefile/libcuefile-r475.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdca/libdca-0.0.5.recipe b/media-libs/libdca/libdca-0.0.5.recipe
index 527e54ab8..b79a7a5f0 100644
--- a/media-libs/libdca/libdca-0.0.5.recipe
+++ b/media-libs/libdca/libdca-0.0.5.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:gcc
 	cmd:libtoolize
diff --git a/media-libs/libdv/libdv-1.0.0.recipe b/media-libs/libdv/libdv-1.0.0.recipe
index 6dc72151a..175580126 100644
--- a/media-libs/libdv/libdv-1.0.0.recipe
+++ b/media-libs/libdv/libdv-1.0.0.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	lib:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl_1.2$secondaryArchSuffix
 	lib:libpopt$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl_1.2$secondaryArchSuffix
 	devel:libpopt${secondaryArchSuffix}
 	"
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
index e12f6e97d..888aa3ba9 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
+++ b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
@@ -31,10 +31,10 @@ PROVIDES="
 	lib:libdvbpsi$secondaryArchSuffix = 9.0.0 compat >= 9
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index 79dfba430..756d52e3d 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
index b4ccf681a..686955787 100644
--- a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index 86105c68c..c53d87497 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -23,17 +23,17 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libdvdread${secondaryArchSuffix}
 	libdvdcss${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libdvdread${secondaryArchSuffix}_devel
 	libdvdcss${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
index d7d9d59d0..6659f456c 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libdvdread$secondaryArchSuffix
 	libdvdcss$secondaryArchSuffix
 	"
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.1.recipe b/media-libs/libdvdnav/libdvdnav-5.0.1.recipe
index e12eff88d..71263d1d5 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.1.recipe
+++ b/media-libs/libdvdnav/libdvdnav-5.0.1.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libdvdread$secondaryArchSuffix
 	# required by libdvdread
 	libdvdcss$secondaryArchSuffix
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdvdread/libdvdread-4.2.0.recipe b/media-libs/libdvdread/libdvdread-4.2.0.recipe
index 131107030..dc4a4274d 100644
--- a/media-libs/libdvdread/libdvdread-4.2.0.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe
@@ -26,15 +26,15 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe
index db0db7896..ed19a0088 100644
--- a/media-libs/libdvdread/libdvdread-4.2.1.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libdvdread/libdvdread-5.0.0.recipe b/media-libs/libdvdread/libdvdread-5.0.0.recipe
index 5786717f1..aaccc6653 100644
--- a/media-libs/libdvdread/libdvdread-5.0.0.recipe
+++ b/media-libs/libdvdread/libdvdread-5.0.0.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libdvdcss$secondaryArchSuffix
 	"
 
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libebur128/libebur128-1.0.1.recipe b/media-libs/libebur128/libebur128-1.0.1.recipe
index 822cf1c4a..c820ecd37 100644
--- a/media-libs/libebur128/libebur128-1.0.1.recipe
+++ b/media-libs/libebur128/libebur128-1.0.1.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	lib:libebur128$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 #	lib:libspeexdsp$secondaryArchSuffix
 
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 	"
 #	devel:libspeexdsp$secondaryArchSuffix
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:cmake
diff --git a/media-libs/libfreehand/libfreehand-0.1.0.recipe b/media-libs/libfreehand/libfreehand-0.1.0.recipe
index 114bda284..a068dd982 100644
--- a/media-libs/libfreehand/libfreehand-0.1.0.recipe
+++ b/media-libs/libfreehand/libfreehand-0.1.0.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	lib:libfreehand_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/media-libs/libharu/libharu-2.3.0.recipe b/media-libs/libharu/libharu-2.3.0.recipe
index a52130444..4c8258a92 100644
--- a/media-libs/libharu/libharu-2.3.0.recipe
+++ b/media-libs/libharu/libharu-2.3.0.recipe
@@ -31,12 +31,12 @@ PROVIDES="
 	lib:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpng$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
diff --git a/media-libs/libicns/libicns-0.8.1.recipe b/media-libs/libicns/libicns-0.8.1.recipe
index ee4e5eca6..776263440 100644
--- a/media-libs/libicns/libicns-0.8.1.recipe
+++ b/media-libs/libicns/libicns-0.8.1.recipe
@@ -30,13 +30,13 @@ if [ -z "$secondaryArchSuffix" ]; then
 	"
 fi
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjasper$secondaryArchSuffix
 	lib:libpng15$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libjasper$secondaryArchSuffix
 	devel:libpng15$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix >= 1.0.4
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 3b022fab1..29ab77a1e 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -13,12 +13,12 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
index 579d1f6a2..49fa2f8d0 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
@@ -23,12 +23,12 @@ PROVIDES="
 	lib:libiptcdata = 0.3.3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libintl
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/liblo/liblo-0.28.recipe b/media-libs/liblo/liblo-0.28.recipe
index 0dd1acaa2..532ce3904 100644
--- a/media-libs/liblo/liblo-0.28.recipe
+++ b/media-libs/liblo/liblo-0.28.recipe
@@ -26,10 +26,10 @@ PROVIDES="
 	lib:liblo$secondaryArchSuffix = 7.2.0 compat >= 7
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.1.recipe
index 6a1ea69d7..ed79ef7aa 100644
--- a/media-libs/libmatroska/libmatroska-1.4.1.recipe
+++ b/media-libs/libmatroska/libmatroska-1.4.1.recipe
@@ -17,14 +17,14 @@ PROVIDES="
 	lib:libmatroska$secondaryArchSuffix = 6
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libebml$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libebml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.2.recipe
index b16f25d0b..8ee6a419d 100644
--- a/media-libs/libmetalink/libmetalink-0.1.2.recipe
+++ b/media-libs/libmetalink/libmetalink-0.1.2.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	lib:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	"
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe
index 7f669ea73..9e978eaec 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.recipe
+++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe
@@ -19,14 +19,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe
index 17a189b25..50a61ff9c 100644
--- a/media-libs/libmng/libmng-1.0.10.recipe
+++ b/media-libs/libmng/libmng-1.0.10.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 1.0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -28,7 +28,7 @@ BUILD_REQUIRES="
 	libpng >= 1.5
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake == 1.12
diff --git a/media-libs/libmng/libmng-2.0.2.recipe b/media-libs/libmng/libmng-2.0.2.recipe
index 7867a0553..67640f4a9 100644
--- a/media-libs/libmng/libmng-2.0.2.recipe
+++ b/media-libs/libmng/libmng-2.0.2.recipe
@@ -20,12 +20,12 @@ PROVIDES="
 	lib:libmng$secondaryArchSuffix = 2.0.2 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
index 4f2cc88d4..d18675619 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	lib:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -32,7 +32,7 @@ fi
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
index 353c73252..39d214ed5 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
@@ -33,7 +33,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -41,7 +41,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
index 1db509681..acac3501d 100644
--- a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
+++ b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	lib:libmpdclient$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	glib2$secondaryArchSuffix >= 2
 	lib:libexpat$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	"
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
index 61e2b73d4..2cae0d9ae 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
@@ -28,14 +28,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/media-libs/libmtp/libmtp-1.1.6.recipe b/media-libs/libmtp/libmtp-1.1.6.recipe
index 28a6c8c70..dc99af2c9 100644
--- a/media-libs/libmtp/libmtp-1.1.6.recipe
+++ b/media-libs/libmtp/libmtp-1.1.6.recipe
@@ -28,13 +28,13 @@ PROVIDES="
 	"
 # add cmd provides
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
diff --git a/media-libs/libmtp/libmtp-1.1.8.recipe b/media-libs/libmtp/libmtp-1.1.8.recipe
index a93576981..8f1fdc2ac 100644
--- a/media-libs/libmtp/libmtp-1.1.8.recipe
+++ b/media-libs/libmtp/libmtp-1.1.8.recipe
@@ -48,7 +48,7 @@ PROVIDES="
 	cmd:mtp_trexist$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
@@ -57,7 +57,7 @@ REQUIRES="
 	lib:libgpg_error$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
index 8f36aeef5..65f3587d4 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
@@ -14,12 +14,12 @@ PROVIDES="
 	libnsbmp = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:make
diff --git a/media-libs/libnsgif/libnsgif-0.1.1.recipe b/media-libs/libnsgif/libnsgif-0.1.1.recipe
index 13e2f7c05..93d482163 100644
--- a/media-libs/libnsgif/libnsgif-0.1.1.recipe
+++ b/media-libs/libnsgif/libnsgif-0.1.1.recipe
@@ -14,12 +14,12 @@ PROVIDES="
 	libnsgif = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"	
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:make
diff --git a/media-libs/libogg/libogg-1.3.2.recipe b/media-libs/libogg/libogg-1.3.2.recipe
index f6d0c9877..314109df4 100644
--- a/media-libs/libogg/libogg-1.3.2.recipe
+++ b/media-libs/libogg/libogg-1.3.2.recipe
@@ -29,12 +29,12 @@ PROVIDES="
 	lib:libogg$secondaryArchSuffix = 0.8.2 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libopus/libopus-1.1.recipe b/media-libs/libopus/libopus-1.1.recipe
index b7f6fb3d3..b240db603 100644
--- a/media-libs/libopus/libopus-1.1.recipe
+++ b/media-libs/libopus/libopus-1.1.recipe
@@ -19,10 +19,10 @@ PROVIDES="
 	lib:libopus$secondaryArchSuffix = 0.5.0 compat >= 0.5
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.20.recipe
index 89f61613c..a47415858 100644
--- a/media-libs/libpng/libpng-1.5.20.recipe
+++ b/media-libs/libpng/libpng-1.5.20.recipe
@@ -22,11 +22,11 @@ PROVIDES="
 	lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.51.recipe
index 2c43ec138..8406b6ca9 100644
--- a/media-libs/libpng/libpng12-1.2.51.recipe
+++ b/media-libs/libpng/libpng12-1.2.51.recipe
@@ -26,11 +26,11 @@ PROVIDES="
 	lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.15.recipe
index 64a3139b0..39fde2cdc 100644
--- a/media-libs/libpng/libpng16-1.6.15.recipe
+++ b/media-libs/libpng/libpng16-1.6.15.recipe
@@ -23,11 +23,11 @@ PROVIDES="
 	lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
@@ -74,7 +74,7 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libpng16$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_devel="
diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe
index 8d2bfed39..d73b6b78b 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4.recipe
+++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe
@@ -56,7 +56,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		"
 fi
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng15$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
@@ -69,7 +69,7 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpng15$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
diff --git a/media-libs/libreplaygain/libreplaygain-r475.recipe b/media-libs/libreplaygain/libreplaygain-r475.recipe
index b29283c78..10302f278 100644
--- a/media-libs/libreplaygain/libreplaygain-r475.recipe
+++ b/media-libs/libreplaygain/libreplaygain-r475.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
index 43fae6d02..e79484741 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
@@ -23,10 +23,10 @@ PROVIDES="
 	lib:libsamplerate$secondaryArchSuffix = 15.12.0 compat >= 15
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 8e553d167..77706ab02 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	"
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe
index e7ec94f24..8c279af4b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 #	lib:libGL
 	lib:libglu
 	lib:libpng
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe
index 7cdfd7bca..ec87a917e 100644
--- a/media-libs/libsdl2/libsdl2-2.0.1.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -34,7 +34,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/media-libs/libsdl2/libsdl2-2.0.3.recipe b/media-libs/libsdl2/libsdl2-2.0.3.recipe
index 0fd176b99..5c92df11f 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.3.recipe
@@ -22,14 +22,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe
index d0ef6a4ac..ecf62070c 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -32,13 +32,13 @@ PROVIDES="
 	lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libflac$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libflac$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
index 92a2e4ae9..a15bff467 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
@@ -18,14 +18,14 @@ PROVIDES="
 	libsvgtiny = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	devel:libwapcaplet
 	devel:libdom
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:gperf
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
index 7cd2469e4..eb4c4b373 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	libsvgtiny = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 BUILD_REQUIRES="
 	devel:libwapcaplet
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	devel:libparserutils
 "
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:gperf
diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe
index 093bd94bd..b1eb65293 100644
--- a/media-libs/libtheora/libtheora-1.1.1.recipe
+++ b/media-libs/libtheora/libtheora-1.1.1.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	lib:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -39,7 +39,7 @@ BUILD_REQUIRES="
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe
index 0bfcad5f6..52ad0a0df 100644
--- a/media-libs/libvisio/libvisio-0.0.31.recipe
+++ b/media-libs/libvisio/libvisio-0.0.31.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	lib:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
@@ -57,7 +57,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	pkgconfig$secondaryArchSuffix >= 0.27
 	cmd:aclocal
 	cmd:libtoolize
diff --git a/media-libs/libvisio/libvisio-0.1.0.recipe b/media-libs/libvisio/libvisio-0.1.0.recipe
index bae669e64..cf0c0a270 100644
--- a/media-libs/libvisio/libvisio-0.1.0.recipe
+++ b/media-libs/libvisio/libvisio-0.1.0.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	lib:libvisio_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:libtoolize
 	cmd:autoconf
diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe
index c72404a47..5539fc299 100644
--- a/media-libs/libvorbis/libvorbis-1.3.2.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libvorbis/libvorbis-1.3.4.recipe b/media-libs/libvorbis/libvorbis-1.3.4.recipe
index 46d8c4083..8eb8a30e4 100644
--- a/media-libs/libvorbis/libvorbis-1.3.4.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.4.recipe
@@ -28,14 +28,14 @@ PROVIDES="
 	lib:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe
index 6752a37dc..5b871e6dc 100644
--- a/media-libs/libvpx/libvpx-1.0.0.recipe
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -33,14 +33,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-libs/libwebp/libwebp-0.3.1.recipe b/media-libs/libwebp/libwebp-0.3.1.recipe
index 3c4af73b3..6507483c8 100644
--- a/media-libs/libwebp/libwebp-0.3.1.recipe
+++ b/media-libs/libwebp/libwebp-0.3.1.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:autoconf
diff --git a/media-libs/libwebp/libwebp-0.4.1.recipe b/media-libs/libwebp/libwebp-0.4.1.recipe
index b6e87187b..8c199f7da 100644
--- a/media-libs/libwebp/libwebp-0.4.1.recipe
+++ b/media-libs/libwebp/libwebp-0.4.1.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:autoconf
diff --git a/media-libs/libxcm/libxcm-0.5.3.recipe b/media-libs/libxcm/libxcm-0.5.3.recipe
index 887507cbf..dcffab8d9 100644
--- a/media-libs/libxcm/libxcm-0.5.3.recipe
+++ b/media-libs/libxcm/libxcm-0.5.3.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	lib:libXcmX11$secondaryArchSuffix = 0.0.5 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe
index e615bc967..70d7c0724 100644
--- a/media-libs/openal/openal-1.13.0.recipe
+++ b/media-libs/openal/openal-1.13.0.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
@@ -69,6 +69,6 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libopenal$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe
index e021bb54c..4cd513825 100644
--- a/media-libs/openexr/openexr-2.1.0.recipe
+++ b/media-libs/openexr/openexr-2.1.0.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libilmbase$secondaryArchSuffix == $portVersion
 	lib:libHalf$secondaryArchSuffix == $portVersion
 	lib:libIex_2_1$secondaryArchSuffix == $portVersion
@@ -51,7 +51,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	ilmbase${secondaryArchSuffix}_devel == $portVersion
 	devel:libilmbase$secondaryArchSuffix == $portVersion
 	devel:libHalf$secondaryArchSuffix == $portVersion
diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe
index 4a91bf9e2..277edbfce 100644
--- a/media-libs/openexr/openexr-2.2.0.recipe
+++ b/media-libs/openexr/openexr-2.2.0.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libhalf$secondaryArchSuffix == 12.0.0
 	lib:libiex_2_2$secondaryArchSuffix == 12.0.0
 	lib:libiexmath_2_2$secondaryArchSuffix == 12.0.0
@@ -51,7 +51,7 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	ilmbase${secondaryArchSuffix}_devel == $portVersion
 	devel:libhalf$secondaryArchSuffix == 12.0.0
 	devel:libiex$secondaryArchSuffix == 12.0.0
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
index d3df26e96..4a4357e49 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -51,7 +51,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
@@ -64,7 +64,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:aclocal
 	cmd:autoreconf
diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe
index 6b0a86547..da1512036 100644
--- a/media-libs/openjpeg/openjpeg-2.1.0.recipe
+++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 #needs devel:libtiff too but that isn't provided by anything
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/pnglite/pnglite-0.1.17.recipe b/media-libs/pnglite/pnglite-0.1.17.recipe
index 1955c8a03..530604b5a 100644
--- a/media-libs/pnglite/pnglite-0.1.17.recipe
+++ b/media-libs/pnglite/pnglite-0.1.17.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	lib:libpnglite$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe
index 29a4c7f80..15d71ef7c 100644
--- a/media-libs/portaudio/portaudio-19.recipe
+++ b/media-libs/portaudio/portaudio-19.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
diff --git a/media-libs/schroedinger/schroedinger-1.0.11.recipe b/media-libs/schroedinger/schroedinger-1.0.11.recipe
index 43303b290..89c2972c4 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11.recipe
+++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe
@@ -29,11 +29,11 @@ PROVIDES="
 	lib:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:liborc_0.4$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:liborc_0.4$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
index 121cd0fdd..d22c2f7ce 100644
--- a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
+++ b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc${secondaryArchSuffix}
diff --git a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
index c089e4877..44f5c7105 100644
--- a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
+++ b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libSDL2_2.0${secondaryArchSuffix}
 	lib:libGL$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -41,7 +41,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL${secondaryArchSuffix}
 	devel:libSDL2${secondaryArchSuffix}
     devel:libjpeg$secondaryArchSuffix
diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
index 30f2436d1..f9956a6bc 100644
--- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
+++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix # No clue, it wants it
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
@@ -51,7 +51,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
index 6018c30f8..6983b652b 100644
--- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
+++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libfreetype${secondaryArchSuffix}
 	lib:libSDL2_2.0${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
@@ -35,7 +35,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfreetype${secondaryArchSuffix}
 	devel:libSDL2${secondaryArchSuffix}
 	devel:libz${secondaryArchSuffix}
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
index ddb4cc2d4..32247eeef 100644
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
+++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libsdl$secondaryArchSuffix
 	"
 
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index b76b2aaa9..6ba8927b4 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -38,7 +38,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index 3558b0326..a07e06751 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libSDL$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe
index 6b3163549..ef629f2c2 100644
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	"
diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
index 0b448df44..6cc3a450c 100644
--- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
+++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
@@ -38,7 +38,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
index 7477afec8..5b596da0c 100644
--- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
+++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
@@ -25,7 +25,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -35,7 +35,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe
index 99d97aa54..9a9829527 100644
--- a/media-libs/smpeg/smpeg-0.4.5.recipe
+++ b/media-libs/smpeg/smpeg-0.4.5.recipe
@@ -33,7 +33,7 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	"
diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe
index 7e17dc1ba..b89de4ea4 100644
--- a/media-libs/speex/speex-1.2~rc1.recipe
+++ b/media-libs/speex/speex-1.2~rc1.recipe
@@ -39,14 +39,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index 932a6a1f0..80757e938 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	"
 
diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe
index af6dfa0bf..5e3cc64fc 100644
--- a/media-libs/taglib/taglib-1.9.1.recipe
+++ b/media-libs/taglib/taglib-1.9.1.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:cmake
 	cmd:make
diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe
index e684bb993..040cf1326 100644
--- a/media-libs/tiff/tiff-3.9.6.recipe
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	lib:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -120,7 +120,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:tiffsplit = $portVersion compat >= 3     
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
+		haiku
 		lib:libjpeg
 		lib:libz
 		tiff == $portVersion base
diff --git a/media-libs/tiff/tiff4-4.0.3.recipe b/media-libs/tiff/tiff4-4.0.3.recipe
index 6cbf258cb..b404da91c 100644
--- a/media-libs/tiff/tiff4-4.0.3.recipe
+++ b/media-libs/tiff/tiff4-4.0.3.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	lib:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -133,7 +133,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 		cmd:tiffsplit
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
+		haiku
 		tiff4 == $portVersion base
 		lib:libjpeg
 		lib:libz
diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe
index e977acd7c..4ea12d7ec 100644
--- a/media-libs/vigra/vigra-1.10.0.recipe
+++ b/media-libs/vigra/vigra-1.10.0.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	lib:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe
index 051854bc3..86034e6c5 100644
--- a/media-libs/x264/x264-20140308.recipe
+++ b/media-libs/x264/x264-20140308.recipe
@@ -26,10 +26,10 @@ PROVIDES="
 	lib:libx264$secondaryArchSuffix = 142 compat >= 142
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe
index 026d861a4..3b1ba907b 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2.recipe
+++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 
 BUILD_PREREQUIRES="
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index 0a590c85c..d80f09ce4 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libFLAC$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -35,7 +35,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libFLAC$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
index e5bc65ec6..b2548625f 100644
--- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
+++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-sound/hivelytracker/hivelytracker-1.8.recipe b/media-sound/hivelytracker/hivelytracker-1.8.recipe
index 205a0af79..276b38395 100644
--- a/media-sound/hivelytracker/hivelytracker-1.8.recipe
+++ b/media-sound/hivelytracker/hivelytracker-1.8.recipe
@@ -22,13 +22,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libsdl
 	lib:libfreetype
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libfreetype
 	devel:sdl_image
 	devel:sdl_ttf
diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe
index 2c9ece8bb..b582deb68 100644
--- a/media-sound/lame/lame-3.99.5.recipe
+++ b/media-sound/lame/lame-3.99.5.recipe
@@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then
 		"
 fi
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	"
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe
index 69d74cf63..f29a68835 100644
--- a/media-sound/milkytracker/milkytracker-0.90.86.recipe
+++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe
@@ -37,14 +37,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.3
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:jam
diff --git a/media-sound/mpc/musicpc-0.26.recipe b/media-sound/mpc/musicpc-0.26.recipe
index b423bbf0e..b72fd1386 100644
--- a/media-sound/mpc/musicpc-0.26.recipe
+++ b/media-sound/mpc/musicpc-0.26.recipe
@@ -26,14 +26,14 @@ PROVIDES="
 	cmd:mpc$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libmpdclient$secondaryArchSuffix
 	glib2_x86 >= 2
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	boost${secondaryArchSuffix}_devel
 	devel:libmpdclient$secondaryArchSuffix
 	glib2${secondaryArchSuffix}_devel
diff --git a/media-sound/mpd/mpd-0.18.12_git.recipe b/media-sound/mpd/mpd-0.18.12_git.recipe
index affa8062b..5bef61f25 100644
--- a/media-sound/mpd/mpd-0.18.12_git.recipe
+++ b/media-sound/mpd/mpd-0.18.12_git.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	"
 #FIXME: expat not detected (missing .pc ?)
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	boost$secondaryArchSuffix
 	lib:libmpdclient$secondaryArchSuffix
@@ -53,7 +53,7 @@ REQUIRES="
 	lib:libvorbis$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	boost${secondaryArchSuffix}_devel
 	devel:libmpdclient$secondaryArchSuffix
 	icu${secondaryArchSuffix}_devel
diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.12.1.recipe
index a6bbe04c5..df56242fd 100644
--- a/media-sound/mpg123/mpg123-1.12.1.recipe
+++ b/media-sound/mpg123/mpg123-1.12.1.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -58,7 +58,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	mpg123$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/media-sound/musepack_tools/musepack_tools-r475.recipe b/media-sound/musepack_tools/musepack_tools-r475.recipe
index 8c0f81414..a9785bd14 100644
--- a/media-sound/musepack_tools/musepack_tools-r475.recipe
+++ b/media-sound/musepack_tools/musepack_tools-r475.recipe
@@ -33,7 +33,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcuefile$secondaryArchSuffix
 	lib:libreplaygain$secondaryArchSuffix
 "
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe
index a41d54291..e3cea0b52 100644
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -40,7 +40,7 @@ REQUIRES="
 	lib:libmad$secondaryArchSuffix >= 0.2.1
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libSDL_1.2$secondaryArchSuffix >= 0.11.4
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
diff --git a/media-sound/opensound/opensound-4.2_git.recipe b/media-sound/opensound/opensound-4.2_git.recipe
index 9ecc34225..a309bd716 100644
--- a/media-sound/opensound/opensound-4.2_git.recipe
+++ b/media-sound/opensound/opensound-4.2_git.recipe
@@ -21,11 +21,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-sound/protrekkr/protrekkr-2.5.4.recipe b/media-sound/protrekkr/protrekkr-2.5.4.recipe
index 134b90153..add794a96 100644
--- a/media-sound/protrekkr/protrekkr-2.5.4.recipe
+++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe
@@ -27,14 +27,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libSDL$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libSDL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:make
diff --git a/media-sound/redoflacs/redoflacs-0.30.recipe b/media-sound/redoflacs/redoflacs-0.30.recipe
index 1ee4eff5c..60ad190e7 100644
--- a/media-sound/redoflacs/redoflacs-0.30.recipe
+++ b/media-sound/redoflacs/redoflacs-0.30.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:bash$secondaryArchSuffix
 	cmd:flac$secondaryArchSuffix
 	"
diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.3.13.recipe
index 51cd56052..8bc76293d 100644
--- a/media-sound/twolame/twolame-0.3.13.recipe
+++ b/media-sound/twolame/twolame-0.3.13.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
index 99b77058b..071d2a48f 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
@@ -38,7 +38,7 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libvorbis$secondaryArchSuffix
 	devel:libFLAC$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
diff --git a/media-video/ffmpeg/ffmpeg-0.10.14.recipe b/media-video/ffmpeg/ffmpeg-0.10.14.recipe
index 751c9a4df..cbd3d0b4c 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.14.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.10.14.recipe
@@ -42,7 +42,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
@@ -63,7 +63,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/ffmpeg/ffmpeg-0.11.5.recipe b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
index 3ec3efc02..b0bec726f 100644
--- a/media-video/ffmpeg/ffmpeg-0.11.5.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.11.5.recipe
@@ -50,7 +50,7 @@ if [ -z "$secondaryArchSuffix" ] && [ "$effectiveTargetArchitecture" != "x86_gcc
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
@@ -73,7 +73,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/ffmpeg/ffmpeg-2.3.recipe b/media-video/ffmpeg/ffmpeg-2.3.recipe
index a95ece19a..dbf9fd671 100644
--- a/media-video/ffmpeg/ffmpeg-2.3.recipe
+++ b/media-video/ffmpeg/ffmpeg-2.3.recipe
@@ -43,7 +43,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
@@ -66,7 +66,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/ffmpeg/ffmpeg-2.4.2.recipe b/media-video/ffmpeg/ffmpeg-2.4.2.recipe
index 8e6ae98a9..ed3ffb081 100644
--- a/media-video/ffmpeg/ffmpeg-2.4.2.recipe
+++ b/media-video/ffmpeg/ffmpeg-2.4.2.recipe
@@ -43,7 +43,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
@@ -66,7 +66,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe
index 35f50e2f7..e283ac04b 100644
--- a/media-video/gnash/gnash-0.8.10.recipe
+++ b/media-video/gnash/gnash-0.8.10.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	app:Gnash = $portVersion
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
@@ -47,7 +47,7 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
diff --git a/media-video/handbrake/handbrake-0.9.9.recipe b/media-video/handbrake/handbrake-0.9.9.recipe
index 02719dbde..6991624a1 100644
--- a/media-video/handbrake/handbrake-0.9.9.recipe
+++ b/media-video/handbrake/handbrake-0.9.9.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:HandBrakeCLI$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:liba52$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix
 	lib:libmpeg2$secondaryArchSuffix
@@ -47,7 +47,7 @@ REQUIRES="
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:liba52$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix
 	devel:libmpeg2$secondaryArchSuffix
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.1.0.recipe
index 0393f5096..271586063 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0.recipe
+++ b/media-video/mjpegtools/mjpegtools-2.1.0.recipe
@@ -85,7 +85,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng15$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -96,7 +96,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/media-video/rtmpdump/rtmpdump-2.4_git.recipe b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
index 33b55287a..493bba47d 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_git.recipe
+++ b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 # commands are provided in /bin regardless
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe
index 246ae1771..8f175ce36 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.recipe
+++ b/media-video/vcdimager/vcdimager-0.7.24.recipe
@@ -42,7 +42,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcdio$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libpopt$secondaryArchSuffix
@@ -59,7 +59,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe
index 14bea855e..652b44e6d 100644
--- a/media-video/vlc/vlc-0.8.6i.recipe
+++ b/media-video/vlc/vlc-0.8.6i.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libintl
 	lib:libiconv
 "
@@ -88,7 +88,7 @@ BUILD_REQUIRES="
 #	devel:libx264$secondaryArchSuffix
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:bison
 	cmd:gcc$secondaryArchSuffix
diff --git a/net-analyzer/mtr/mtr-0.73.recipe b/net-analyzer/mtr/mtr-0.73.recipe
index 25ffd3181..f5912783a 100644
--- a/net-analyzer/mtr/mtr-0.73.recipe
+++ b/net-analyzer/mtr/mtr-0.73.recipe
@@ -27,17 +27,17 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	devel:libncurses$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-analyzer/netcat/netcat-1.10.recipe b/net-analyzer/netcat/netcat-1.10.recipe
index ab08dbdc3..21c57f886 100644
--- a/net-analyzer/netcat/netcat-1.10.recipe
+++ b/net-analyzer/netcat/netcat-1.10.recipe
@@ -17,10 +17,10 @@ PROVIDES="
 	cmd:nc = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/net-analyzer/netperf/netperf-2.6.0.recipe b/net-analyzer/netperf/netperf-2.6.0.recipe
index 5e2a2d20d..a9143a79f 100644
--- a/net-analyzer/netperf/netperf-2.6.0.recipe
+++ b/net-analyzer/netperf/netperf-2.6.0.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	cmd:netserver
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe
index 2874f1726..da5f2e183 100644
--- a/net-dialup/minicom/minicom-2.6.2.recipe
+++ b/net-dialup/minicom/minicom-2.6.2.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
diff --git a/net-dns/c_ares/c_ares-1.10.0.recipe b/net-dns/c_ares/c_ares-1.10.0.recipe
index 59540d256..7988cee12 100644
--- a/net-dns/c_ares/c_ares-1.10.0.recipe
+++ b/net-dns/c_ares/c_ares-1.10.0.recipe
@@ -38,13 +38,13 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES=""
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
diff --git a/net-dns/libidn/libidn-1.29.recipe b/net-dns/libidn/libidn-1.29.recipe
index a7fe10a85..4fb8dc81b 100644
--- a/net-dns/libidn/libidn-1.29.recipe
+++ b/net-dns/libidn/libidn-1.29.recipe
@@ -20,12 +20,12 @@ PROVIDES="
 	cmd:idn$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/net-fs/samba/samba-3.6.24.recipe b/net-fs/samba/samba-3.6.24.recipe
index 2d68e9e72..1113473cb 100644
--- a/net-fs/samba/samba-3.6.24.recipe
+++ b/net-fs/samba/samba-3.6.24.recipe
@@ -67,7 +67,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -84,7 +84,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtoolize
 	cmd:perl
diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe
index ad2406a01..fcd759c5f 100644
--- a/net-ftp/lftp/lftp-4.4.16.recipe
+++ b/net-ftp/lftp/lftp-4.4.16.recipe
@@ -27,14 +27,14 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	ca_root_certificates
 	lib:libreadline$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libreadline$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe
index a10980f85..c2443c98b 100644
--- a/net-irc/quassel/quassel-0.10.0.recipe
+++ b/net-irc/quassel/quassel-0.10.0.recipe
@@ -36,7 +36,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libz${secondaryArchSuffix}
 	"
@@ -53,7 +53,7 @@ BUILD_PREREQUIRES="
 	"	
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
 	devel:libz${secondaryArchSuffix}
 	"
diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index ebc34f5c9..2f5077e6d 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -36,7 +36,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libQtCore$secondaryArchSuffix >= 4.8
 	lib:libQtGui$secondaryArchSuffix >= 4.8
 	"
@@ -51,7 +51,7 @@ BUILD_PREREQUIRES="
 	"	
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libQtCore$secondaryArchSuffix >= 4.8
 	devel:libQtGui$secondaryArchSuffix >= 4.8
 	"
diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe
index f6240277b..720a42bf1 100644
--- a/net-libs/enet/enet-1.3.0.recipe
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -23,11 +23,11 @@ PROVIDES="
 	lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/net-libs/gloox/gloox-1.0.12.recipe b/net-libs/gloox/gloox-1.0.12.recipe
index 597a27927..206fbad56 100644
--- a/net-libs/gloox/gloox-1.0.12.recipe
+++ b/net-libs/gloox/gloox-1.0.12.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	"
diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe
index 161170ba2..cf866aa40 100644
--- a/net-libs/gloox/gloox-1.0.9.recipe
+++ b/net-libs/gloox/gloox-1.0.9.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	"
diff --git a/net-libs/gnutls/gnutls-2.8.6.recipe b/net-libs/gnutls/gnutls-2.8.6.recipe
index c467c8860..e516514d0 100644
--- a/net-libs/gnutls/gnutls-2.8.6.recipe
+++ b/net-libs/gnutls/gnutls-2.8.6.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgcrypt
 	lib:libgpg_error
 "
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc
diff --git a/net-libs/hubbub/hubbub-0.3.0.recipe b/net-libs/hubbub/hubbub-0.3.0.recipe
index e11267e74..53b93ef26 100644
--- a/net-libs/hubbub/hubbub-0.3.0.recipe
+++ b/net-libs/hubbub/hubbub-0.3.0.recipe
@@ -22,7 +22,7 @@ PROVIDES="
 	lib:libhubbub = $portVersion compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	devel:libparserutils
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	netsurf_buildsystem >= 0.3.0
 	cmd:gcc
 	cmd:make
diff --git a/net-libs/libdom/libdom-0.1.0.recipe b/net-libs/libdom/libdom-0.1.0.recipe
index e9de20b52..b21ca6732 100644
--- a/net-libs/libdom/libdom-0.1.0.recipe
+++ b/net-libs/libdom/libdom-0.1.0.recipe
@@ -15,7 +15,7 @@ PROVIDES="
 	lib:libdom = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libexpat
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
diff --git a/net-libs/libdom/libdom-0.1.1.recipe b/net-libs/libdom/libdom-0.1.1.recipe
index 4b41e4ea0..39f7549a1 100644
--- a/net-libs/libdom/libdom-0.1.1.recipe
+++ b/net-libs/libdom/libdom-0.1.1.recipe
@@ -16,7 +16,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:perl
diff --git a/net-libs/libnatpmp/libnatpmp-20140401.recipe b/net-libs/libnatpmp/libnatpmp-20140401.recipe
index fc091fec2..79a3e5c0d 100644
--- a/net-libs/libnatpmp/libnatpmp-20140401.recipe
+++ b/net-libs/libnatpmp/libnatpmp-20140401.recipe
@@ -23,10 +23,10 @@ PROVIDES="
 	cmd:natpmpc
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe
index d0a9ab37b..08cf1e30f 100644
--- a/net-libs/libssh2/libssh2-1.4.3.recipe
+++ b/net-libs/libssh2/libssh2-1.4.3.recipe
@@ -26,13 +26,13 @@ PROVIDES="
 	lib:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/net-libs/neon/neon-0.29.6.recipe b/net-libs/neon/neon-0.29.6.recipe
index 39bd445f8..f2f4a46e5 100644
--- a/net-libs/neon/neon-0.29.6.recipe
+++ b/net-libs/neon/neon-0.29.6.recipe
@@ -34,7 +34,7 @@ PROVIDES="
 	lib:libneon$secondaryArchSuffix = 27.2.6 compat >= 27.2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -49,7 +49,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:libtoolize
diff --git a/net-libs/neon/neon-0.30.1.recipe b/net-libs/neon/neon-0.30.1.recipe
index d2c0a5642..5e575414c 100644
--- a/net-libs/neon/neon-0.30.1.recipe
+++ b/net-libs/neon/neon-0.30.1.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -47,7 +47,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:libtoolize
diff --git a/net-libs/serf/serf-1.3.8.recipe b/net-libs/serf/serf-1.3.8.recipe
index ac8eab22b..e811e015d 100644
--- a/net-libs/serf/serf-1.3.8.recipe
+++ b/net-libs/serf/serf-1.3.8.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -32,7 +32,7 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/net-misc/axel/axel-2.4.recipe b/net-misc/axel/axel-2.4.recipe
index 51f909eed..6f13d7890 100644
--- a/net-misc/axel/axel-2.4.recipe
+++ b/net-misc/axel/axel-2.4.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 "
 
 REQUIRES="
-		haiku >= $haikuVersion
+		haiku
 "
 
 BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-		haiku_devel >= $haikuVersion
+		haiku_devel
 		cmd:gcc
 		cmd:make
 "
diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
index 22d6203a1..36e8af97a 100644
--- a/net-misc/berdp/berdp-1.recipe
+++ b/net-misc/berdp/berdp-1.recipe
@@ -26,11 +26,11 @@ BUILD_PREREQUIRES="
 
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion 
+	haiku_devel 
 	"
 	
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:rdesktop
 	"
 
diff --git a/net-misc/curl/curl-7.38.0.recipe b/net-misc/curl/curl-7.38.0.recipe
index dcc944aab..f0f6e0d3d 100644
--- a/net-misc/curl/curl-7.38.0.recipe
+++ b/net-misc/curl/curl-7.38.0.recipe
@@ -21,7 +21,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	ca_root_certificates
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -31,7 +31,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/net-misc/curl/curl-7.39.0.recipe b/net-misc/curl/curl-7.39.0.recipe
index fa4f2f675..9062c8385 100644
--- a/net-misc/curl/curl-7.39.0.recipe
+++ b/net-misc/curl/curl-7.39.0.recipe
@@ -21,7 +21,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	ca_root_certificates
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -31,7 +31,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/net-misc/gophernicus/gophernicus-1.5.recipe b/net-misc/gophernicus/gophernicus-1.5.recipe
index 1bddd97aa..f701fa55e 100644
--- a/net-misc/gophernicus/gophernicus-1.5.recipe
+++ b/net-misc/gophernicus/gophernicus-1.5.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/net-misc/mosh/mosh-1.2.4.recipe b/net-misc/mosh/mosh-1.2.4.recipe
index 0b0d5800f..86ba7d6fc 100644
--- a/net-misc/mosh/mosh-1.2.4.recipe
+++ b/net-misc/mosh/mosh-1.2.4.recipe
@@ -33,7 +33,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libncursesw$secondaryArchSuffix
@@ -51,7 +51,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:automake
 	cmd:awk
diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe
index 186d420be..ec2615541 100644
--- a/net-misc/muscle/muscle-6.00.recipe
+++ b/net-misc/muscle/muscle-6.00.recipe
@@ -35,11 +35,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	"
 
diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe
index 546a3b3dd..cbbb1a59c 100644
--- a/net-misc/openssh/openssh-5.8p2.recipe
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	cmd:sshd = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libcrypto
 	lib:libedit
 	lib:libssl
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	openssl
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index 01ee39429..0ef2c35a6 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 	cmd:sshd = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:login
 	cmd:passwd
 	lib:libcrypto
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-misc/openssh/openssh-6.5p1.recipe b/net-misc/openssh/openssh-6.5p1.recipe
index dfcdd1f0f..522f8922f 100644
--- a/net-misc/openssh/openssh-6.5p1.recipe
+++ b/net-misc/openssh/openssh-6.5p1.recipe
@@ -44,7 +44,7 @@ PROVIDES="
 	cmd:sshd = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:login
 	cmd:passwd
 	lib:libcrypto
@@ -61,7 +61,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-misc/openssh/openssh-6.6p1.recipe b/net-misc/openssh/openssh-6.6p1.recipe
index 240605a58..83cfca413 100644
--- a/net-misc/openssh/openssh-6.6p1.recipe
+++ b/net-misc/openssh/openssh-6.6p1.recipe
@@ -42,7 +42,7 @@ PROVIDES="
 	cmd:sshd = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:login
 	cmd:passwd
 	lib:libcrypto
@@ -59,7 +59,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-misc/openssh/openssh-6.7p1.recipe b/net-misc/openssh/openssh-6.7p1.recipe
index 700c1ee3b..31e27ecf1 100644
--- a/net-misc/openssh/openssh-6.7p1.recipe
+++ b/net-misc/openssh/openssh-6.7p1.recipe
@@ -43,7 +43,7 @@ PROVIDES="
 	cmd:sshd = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:login
 	cmd:passwd
 	lib:libcrypto
@@ -60,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
index 05077774b..ee9df7f70 100644
--- a/net-misc/rdesktop/rdesktop-1.8.0.recipe
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -25,12 +25,12 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libssl
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libcrypto
 	lib:libssl
 	"
diff --git a/net-misc/rsync/rsync-3.1.1.recipe b/net-misc/rsync/rsync-3.1.1.recipe
index e0c7dfd14..01ec0291f 100644
--- a/net-misc/rsync/rsync-3.1.1.recipe
+++ b/net-misc/rsync/rsync-3.1.1.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 
@@ -30,7 +30,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe
index 65e3224be..c7626f4c3 100644
--- a/net-misc/tor/tor-0.2.4.20.recipe
+++ b/net-misc/tor/tor-0.2.4.20.recipe
@@ -52,14 +52,14 @@ PROVIDES="
 	cmd:torify$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libevent$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libevent$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/net-misc/vncviewer/vncviewer-3.3.1r6.recipe b/net-misc/vncviewer/vncviewer-3.3.1r6.recipe
index ddbdeaea5..5d7667c30 100644
--- a/net-misc/vncviewer/vncviewer-3.3.1r6.recipe
+++ b/net-misc/vncviewer/vncviewer-3.3.1r6.recipe
@@ -26,7 +26,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	cmd:gcc
 	cmd:make
diff --git a/net-misc/wget/wget-1.16.1.recipe b/net-misc/wget/wget-1.16.1.recipe
index 3dd4d2231..f6c5b10a4 100644
--- a/net-misc/wget/wget-1.16.1.recipe
+++ b/net-misc/wget/wget-1.16.1.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -27,7 +27,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix >= 1.2.3
diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
index 0ae2bd54d..2ded6ff56 100644
--- a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
index ab2f3a393..d4c7d8b35 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:zip
diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
index f53022f16..a2eb648e1 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:zip
diff --git a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
index be59ab6bf..bd556fc90 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:zip
diff --git a/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe b/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe
index a93a193a0..f2648df62 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:zip
diff --git a/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe b/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe
index d81280293..afa330e8b 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:youtube_dl = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:python
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:python
 	"
 BUILD_PREREQUIRES="
diff --git a/net-nds/openldap/openldap-2.4.40.recipe b/net-nds/openldap/openldap-2.4.40.recipe
index 79d33b86f..1705e524d 100644
--- a/net-nds/openldap/openldap-2.4.40.recipe
+++ b/net-nds/openldap/openldap-2.4.40.recipe
@@ -51,13 +51,13 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 "
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
index b6e83958e..8afebbe2e 100644
--- a/net-p2p/transmission/transmission-2.82.recipe
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -57,7 +57,7 @@ PROVIDES="
     cmd:transmission_show$secondaryArchSuffix
     "
 REQUIRES="
-    haiku$secondaryArchSuffix >= $haikuVersion
+    haiku$secondaryArchSuffix
     lib:libssl$secondaryArchSuffix
     lib:libcrypto$secondaryArchSuffix
     lib:libcurl$secondaryArchSuffix
@@ -67,7 +67,7 @@ REQUIRES="
     lib:libz$secondaryArchSuffix
     "
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
     devel:libssl$secondaryArchSuffix
     devel:libcurl$secondaryArchSuffix
     devel:libz$secondaryArchSuffix
diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe
index d1f1f9953..47e7cbdaa 100644
--- a/net-p2p/transmission/transmission-2.84.recipe
+++ b/net-p2p/transmission/transmission-2.84.recipe
@@ -37,7 +37,7 @@ PROVIDES="
     cmd:transmission_show$secondaryArchSuffix
     "
 REQUIRES="
-    haiku$secondaryArchSuffix >= $haikuVersion
+    haiku$secondaryArchSuffix
     lib:libcrypto$secondaryArchSuffix
     lib:libcurl$secondaryArchSuffix
     lib:libevent$secondaryArchSuffix
@@ -48,7 +48,7 @@ REQUIRES="
     lib:libz$secondaryArchSuffix
     "
 BUILD_REQUIRES="
-    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    haiku${secondaryArchSuffix}_devel
     devel:libssl$secondaryArchSuffix
     devel:libcurl$secondaryArchSuffix
     devel:libz$secondaryArchSuffix
diff --git a/net-print/gutenprint/gutenprint-5.2.10.recipe b/net-print/gutenprint/gutenprint-5.2.10.recipe
index 2787cf07d..c05b8c3b0 100644
--- a/net-print/gutenprint/gutenprint-5.2.10.recipe
+++ b/net-print/gutenprint/gutenprint-5.2.10.recipe
@@ -31,10 +31,10 @@ PROVIDES="
 	lib:libgutenprint$secondaryArchSuffix = 2.3.0 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/net-print/gutenprint/gutenprint-5.2.9.recipe b/net-print/gutenprint/gutenprint-5.2.9.recipe
index 05359c2ff..ad1c1df51 100644
--- a/net-print/gutenprint/gutenprint-5.2.9.recipe
+++ b/net-print/gutenprint/gutenprint-5.2.9.recipe
@@ -31,10 +31,10 @@ PROVIDES="
 	lib:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe
index 9021345ae..180619276 100644
--- a/net-proxy/privoxy/privoxy-3.0.21.recipe
+++ b/net-proxy/privoxy/privoxy-3.0.21.recipe
@@ -16,11 +16,11 @@ ARCHITECTURES="x86_gcc2 x86 !ppc"
 CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8"
 
 REQUIRES="
-	haiku >= $haikuVersion 
+	haiku 
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 
 BUILD_PREREQUIRES="
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
index b9e421490..944b88d07 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
@@ -24,14 +24,14 @@ PROVIDES="
 	wpa_supplicant = $portVersion compat >= 0.7
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	openssl >= 1.0.0
 	"
 BUILD_REQUIRES="
 	openssl >= 1.0.0
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
index bab3e1cdf..4f9c868ff 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	cmd:wpa_supplicant = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libssl
 	"
 BUILD_REQUIRES="
 	devel:libssl >= 1.0.0
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sci-astronomy/celestia/celestia-1.6.1.recipe b/sci-astronomy/celestia/celestia-1.6.1.recipe
index f73e260c6..2451fcf61 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.recipe
+++ b/sci-astronomy/celestia/celestia-1.6.1.recipe
@@ -35,7 +35,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lua$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -46,7 +46,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	lua${secondaryArchSuffix}_devel
 	devel:libintl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/sci-electronics/verilator/verilator-3.864.recipe b/sci-electronics/verilator/verilator-3.864.recipe
index fb27aa5cc..817e4a019 100644
--- a/sci-electronics/verilator/verilator-3.864.recipe
+++ b/sci-electronics/verilator/verilator-3.864.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:perl
 	cmd:bison
diff --git a/sci-libs/fftw/fftw-3.2.2.recipe b/sci-libs/fftw/fftw-3.2.2.recipe
index 9212d62b2..cec241f85 100644
--- a/sci-libs/fftw/fftw-3.2.2.recipe
+++ b/sci-libs/fftw/fftw-3.2.2.recipe
@@ -32,11 +32,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-        haiku$secondaryArchSuffix >= $haikuVersion
+        haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-        haiku${secondaryArchSuffix}_devel >= $haikuVersion
+        haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/sci-libs/fftw/fftw-3.3.3.recipe b/sci-libs/fftw/fftw-3.3.3.recipe
index 3b267ebdf..fd50e065d 100644
--- a/sci-libs/fftw/fftw-3.3.3.recipe
+++ b/sci-libs/fftw/fftw-3.3.3.recipe
@@ -33,14 +33,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/sci-libs/fftw/fftw-3.3.4.recipe b/sci-libs/fftw/fftw-3.3.4.recipe
index dcefbe609..edaf89675 100644
--- a/sci-libs/fftw/fftw-3.3.4.recipe
+++ b/sci-libs/fftw/fftw-3.3.4.recipe
@@ -33,14 +33,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/sci-libs/gdal/gdal-1.11.0.recipe b/sci-libs/gdal/gdal-1.11.0.recipe
index 5559659aa..8eb349edf 100644
--- a/sci-libs/gdal/gdal-1.11.0.recipe
+++ b/sci-libs/gdal/gdal-1.11.0.recipe
@@ -74,7 +74,7 @@ PROVIDES="
 	cmd:testepsg
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	lib:libgeotiff$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix >= 7.0.0
@@ -87,7 +87,7 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
 	devel:libgeotiff$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix >= 7.0.0
diff --git a/sci-libs/geos/geos-3.4.2.recipe b/sci-libs/geos/geos-3.4.2.recipe
index f7c03790f..071cc14b9 100644
--- a/sci-libs/geos/geos-3.4.2.recipe
+++ b/sci-libs/geos/geos-3.4.2.recipe
@@ -29,11 +29,11 @@ PROVIDES="
 	lib:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
index 36afd34c6..ffd79d8b8 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
@@ -33,14 +33,14 @@ PROVIDES="
 	cmd:makegeo
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libproj$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
diff --git a/sci-libs/libsvm/libsvm-v320.recipe b/sci-libs/libsvm/libsvm-v320.recipe
index 8fa9e9b65..a0dc93b28 100644
--- a/sci-libs/libsvm/libsvm-v320.recipe
+++ b/sci-libs/libsvm/libsvm-v320.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libstdc++
 	"
 
 BUILD_PREREQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:make
 	cmd:gcc
 	cmd:g++
@@ -91,7 +91,7 @@ PROVIDES_tools="
 	"
 
 REQUIRES_tools="
-	haiku >= $haikuVersion
+	haiku
 	lib:libstdc++
 	cmd:python
 	"
diff --git a/sci-libs/proj/proj-4.8.0.recipe b/sci-libs/proj/proj-4.8.0.recipe
index 09203369b..df5114683 100644
--- a/sci-libs/proj/proj-4.8.0.recipe
+++ b/sci-libs/proj/proj-4.8.0.recipe
@@ -33,10 +33,10 @@ PROVIDES="
 	cmd:proj
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/sci-mathematics/pari/pari-2.7.0.recipe b/sci-mathematics/pari/pari-2.7.0.recipe
index abf2ceeb3..0bd08231e 100644
--- a/sci-mathematics/pari/pari-2.7.0.recipe
+++ b/sci-mathematics/pari/pari-2.7.0.recipe
@@ -34,13 +34,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	"
diff --git a/sci-visualization/gri/gri-2.12.23.recipe b/sci-visualization/gri/gri-2.12.23.recipe
index 6a6f41ee1..c289ca744 100644
--- a/sci-visualization/gri/gri-2.12.23.recipe
+++ b/sci-visualization/gri/gri-2.12.23.recipe
@@ -16,10 +16,10 @@ PROVIDES="
 	gri = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe
index feadf31d6..ed3431192 100644
--- a/sys-apps/coreutils/coreutils-8.22.recipe
+++ b/sys-apps/coreutils/coreutils-8.22.recipe
@@ -132,11 +132,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
diff --git a/sys-apps/dbus/dbus-1.8.6.recipe b/sys-apps/dbus/dbus-1.8.6.recipe
index f6dc1f836..e3be51801 100644
--- a/sys-apps/dbus/dbus-1.8.6.recipe
+++ b/sys-apps/dbus/dbus-1.8.6.recipe
@@ -45,7 +45,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	glib2$secondaryArchSuffix
 	lib:libexecinfo$secondaryArchSuffix
@@ -64,7 +64,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:find
@@ -80,7 +80,7 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	dbus$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/sys-apps/dialog/dialog-1.2.recipe b/sys-apps/dialog/dialog-1.2.recipe
index 2ba53b43e..53dbdc67d 100644
--- a/sys-apps/dialog/dialog-1.2.recipe
+++ b/sys-apps/dialog/dialog-1.2.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	cmd:dialog = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 "
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libncurses
 "
 BUILD_PREREQUIRES="
diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe
index 3bf416a26..1451faf38 100644
--- a/sys-apps/diffutils/diffutils-3.3.recipe
+++ b/sys-apps/diffutils/diffutils-3.3.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	cmd:awk
diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe
index e9de9980f..fc965ade7 100644
--- a/sys-apps/dmidecode/dmidecode-2.12.recipe
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -20,7 +20,7 @@ REQUIRES="
 	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe
index 86834097a..fbeb22145 100644
--- a/sys-apps/dtc/dtc-1.4.0.recipe
+++ b/sys-apps/dtc/dtc-1.4.0.recipe
@@ -30,11 +30,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:bison$secondaryArchSuffix >= 2.5
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe
index 9facb3434..7ab636909 100644
--- a/sys-apps/ed/ed-1.7.recipe
+++ b/sys-apps/ed/ed-1.7.recipe
@@ -16,10 +16,10 @@ PROVIDES="
 	cmd:red = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe
index 5445ad120..c77e6e2d9 100644
--- a/sys-apps/file/file-5.15.recipe
+++ b/sys-apps/file/file-5.15.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libz
 	"
 
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoreconf
 	cmd:aclocal
 	cmd:libtoolize
diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe
index 129b86948..b8c77f540 100644
--- a/sys-apps/findutils/findutils-4.4.2.recipe
+++ b/sys-apps/findutils/findutils-4.4.2.recipe
@@ -25,10 +25,10 @@ PROVIDES="
 	cmd:xargs = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/sys-apps/fxload/fxload-20120810.recipe b/sys-apps/fxload/fxload-20120810.recipe
index ebb5a60ce..449041d98 100644
--- a/sys-apps/fxload/fxload-20120810.recipe
+++ b/sys-apps/fxload/fxload-20120810.recipe
@@ -35,11 +35,11 @@ PROVIDES="
 	"
 REQUIRES="
 	lib:libusb_1.0$secondaryArchSuffix
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libusb_1.0${secondaryArchSuffix}
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index 1e2211fd4..0882f59d6 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -23,12 +23,12 @@ PROVIDES="
 	cmd:gawk = $portVersion compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/sys-apps/gawk/gawk-4.1.0.recipe b/sys-apps/gawk/gawk-4.1.0.recipe
index 5fe68e1fb..2f871b4a1 100644
--- a/sys-apps/gawk/gawk-4.1.0.recipe
+++ b/sys-apps/gawk/gawk-4.1.0.recipe
@@ -25,12 +25,12 @@ PROVIDES="
 	cmd:igawk = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe
index 8afb44bbe..595b4057a 100644
--- a/sys-apps/getconf/getconf-r260000.recipe
+++ b/sys-apps/getconf/getconf-r260000.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 	cmd:getconf = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 BUILD_PREREQUIRES="
 	makefile_engine
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
index c2b8b7cb5..3313de1e3 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe
@@ -21,7 +21,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 "
diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe
index d6dc8d915..9322b5dd3 100644
--- a/sys-apps/grep/grep-2.14.recipe
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	cmd:grep = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libintl
 	"
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 	devel:libintl
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-apps/grep/grep-2.20.recipe b/sys-apps/grep/grep-2.20.recipe
index ab6fd3593..030d84011 100644
--- a/sys-apps/grep/grep-2.20.recipe
+++ b/sys-apps/grep/grep-2.20.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	cmd:grep = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libintl
 	"
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 	devel:libintl
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-apps/grep/grep-2.21.recipe b/sys-apps/grep/grep-2.21.recipe
index 170d6b942..b288b1ee3 100644
--- a/sys-apps/grep/grep-2.21.recipe
+++ b/sys-apps/grep/grep-2.21.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	cmd:grep = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libiconv
 	lib:libintl
 	"
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 	devel:libintl
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe
index e56eace55..cff405646 100644
--- a/sys-apps/groff/groff-1.20.1.recipe
+++ b/sys-apps/groff/groff-1.20.1.recipe
@@ -56,12 +56,12 @@ PROVIDES="
 	cmd:troff = $portVersion compat >= 1.20
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
diff --git a/sys-apps/help2man/help2man-1.43.3.recipe b/sys-apps/help2man/help2man-1.43.3.recipe
index 99131ff3a..90deb5c49 100644
--- a/sys-apps/help2man/help2man-1.43.3.recipe
+++ b/sys-apps/help2man/help2man-1.43.3.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	cmd:help2man$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:perl
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/help2man/help2man-1.44.1.recipe b/sys-apps/help2man/help2man-1.44.1.recipe
index 2e0ffc432..5e2214891 100644
--- a/sys-apps/help2man/help2man-1.44.1.recipe
+++ b/sys-apps/help2man/help2man-1.44.1.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	cmd:help2man$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:perl
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/help2man/help2man-1.46.3.recipe b/sys-apps/help2man/help2man-1.46.3.recipe
index 81022f554..c54a6e8e7 100644
--- a/sys-apps/help2man/help2man-1.46.3.recipe
+++ b/sys-apps/help2man/help2man-1.46.3.recipe
@@ -25,11 +25,11 @@ PROVIDES="
 	cmd:help2man$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:perl
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
diff --git a/sys-apps/less/less-451.recipe b/sys-apps/less/less-451.recipe
index ca0233aa8..4007f440f 100644
--- a/sys-apps/less/less-451.recipe
+++ b/sys-apps/less/less-451.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 
diff --git a/sys-apps/less/less-458.recipe b/sys-apps/less/less-458.recipe
index 23b558fed..33d51cd23 100644
--- a/sys-apps/less/less-458.recipe
+++ b/sys-apps/less/less-458.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 
diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe
index e3553701c..f3e69e87f 100644
--- a/sys-apps/less/less-466.recipe
+++ b/sys-apps/less/less-466.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 
diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index a1da4b5ef..fd2dfeca9 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	cmd:bzip2
 	cmd:cat
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	cmd:zcat
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-apps/pciutils/pciutils-3.2.1.recipe b/sys-apps/pciutils/pciutils-3.2.1.recipe
index 596d423ce..db915dced 100644
--- a/sys-apps/pciutils/pciutils-3.2.1.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	cmd:setpci${secondaryArchSuffix} = $portVersion
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-apps/pciutils/pciutils-3.2.1_git.recipe b/sys-apps/pciutils/pciutils-3.2.1_git.recipe
index d0161f4b6..6ed0e315c 100644
--- a/sys-apps/pciutils/pciutils-3.2.1_git.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1_git.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 #	devel:pciutils${secondaryArchSuffix}
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libz${secondaryArchSuffix}
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index b8e8c58d7..698fcbf09 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -22,10 +22,10 @@ PROVIDES="
 	cmd:sed = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-apps/spiff/spiff-1.recipe b/sys-apps/spiff/spiff-1.recipe
index d92af0e89..7678ae5a4 100644
--- a/sys-apps/spiff/spiff-1.recipe
+++ b/sys-apps/spiff/spiff-1.recipe
@@ -19,13 +19,13 @@ PROVIDES="
 	cmd:spiff"
 
 REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	lib:libncurses
 	lib:libroot
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	makefile_engine
 	devel:libncurses
 	cmd:gcc
@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion 
+	haiku_devel 
 	devel:libncurses
 	"
 
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index bed916683..4b18d17b5 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -23,14 +23,14 @@ PROVIDES="
 	cmd:infokey = $portVersion compat >= 4.13
 	cmd:pdftexi2dvi = $portVersion compat >= 4.13"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libncurses
 	"
 BUILD_REQUIRES="
 	devel:libncurses
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
index 7800ea8b2..e65a4a26d 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:liblzma${secondaryArchSuffix}
 	lib:libpcre${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
index df3d08357..fed252254 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:liblzma${secondaryArchSuffix}
 	lib:libpcre${secondaryArchSuffix}
 	lib:libz${secondaryArchSuffix}
@@ -50,7 +50,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe
index ec6bf8492..3f22ca0ef 100644
--- a/sys-apps/which/which-2.20.recipe
+++ b/sys-apps/which/which-2.20.recipe
@@ -14,12 +14,12 @@ PROVIDES="
 	cmd:which = $portVersion
 "
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 BUILD_REQUIRES="
 "
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:sed
diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe
index 6e06f6227..d80444c37 100644
--- a/sys-block/parted/parted-3.1.53_git.recipe
+++ b/sys-block/parted/parted-3.1.53_git.recipe
@@ -17,14 +17,14 @@ PROVIDES="
 	cmd:parted$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:git
 	cmd:autoconf
 	cmd:libtool
diff --git a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
index 648500ca5..5dce04490 100644
--- a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
@@ -47,14 +47,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	cmd:find
 	cmd:xargs
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
index bee70d846..305889cf2 100644
--- a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
+++ b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:${targetU}_as$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
@@ -51,7 +51,7 @@ BUILD_REQUIRES="
 	devel:libmpc$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:bison
diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
index 6d61d526e..0150c1f1c 100644
--- a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
+++ b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:${targetU}_as$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	devel:libmpc$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:bison
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 218fbb37e..41a7f258c 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -26,7 +26,7 @@ PROVIDES="
 	cmd:ifnames = $portVersion compat >= 2.60
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -37,7 +37,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:automake >= 1.11
 	cmd:autoreconf >= 2.60
 	cmd:make
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index 3dc015cb1..ffa4015fa 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 	cmd:ifnames = $portVersion compat >= 2.60
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -40,7 +40,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:m4
 	cmd:make
diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe
index 1d2598027..6b33dac1c 100644
--- a/sys-devel/autoconf213/autoconf213-2.13.recipe
+++ b/sys-devel/autoconf213/autoconf213-2.13.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index e45e5928f..a3059fdbc 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:aclocal_1.11 = $portVersion compat >= 1.11
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -32,7 +32,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf >= 2.60
 	cmd:make
 	cmd:perl >= 5.8
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
index 862b64139..b540cdf6d 100644
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:aclocal_1.12 = $portVersion compat >= 1.12
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -32,7 +32,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf >= 2.60
 	cmd:gcc
 	cmd:ld
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index 9ee7a526d..773a46cc7 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -21,7 +21,7 @@ PROVIDES="
 	cmd:aclocal_1.13 = $portVersion compat >= 1.13
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:awk
 	coreutils
 	diffutils
@@ -32,7 +32,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:autoconf >= 2.60
 	cmd:find
 	cmd:gcc
diff --git a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
index d0c11395c..6eb4076f5 100644
--- a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
@@ -44,14 +44,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	cmd:find
 	cmd:xargs
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
index 351b97fdd..96075b1f4 100644
--- a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
+++ b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:avr_as$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
@@ -45,7 +45,7 @@ BUILD_REQUIRES="
 	cmd:avr_as$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:bison
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index f2a5fb1bb..5369c64a0 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libfl >= 2
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 "
 
 BUILD_PREREQUIRES="
diff --git a/sys-devel/bin86/bin86-0.16.21.recipe b/sys-devel/bin86/bin86-0.16.21.recipe
index a040f116b..b6ebdae7d 100644
--- a/sys-devel/bin86/bin86-0.16.21.recipe
+++ b/sys-devel/bin86/bin86-0.16.21.recipe
@@ -31,11 +31,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
index 301bf5b90..414c72517 100644
--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -34,12 +34,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:find
 	cmd:flex
diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
index 4ff223f07..fe6b398d3 100644
--- a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
+++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
@@ -41,12 +41,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
index 4bfbc0938..ccc1ad641 100644
--- a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
@@ -44,14 +44,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	cmd:find
 	cmd:xargs
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index cade05d19..e8df83f06 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -27,13 +27,13 @@ PROVIDES="
 	devel:liby = $portVersion compat >= 2.4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:m4
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:m4
diff --git a/sys-devel/bison/bison-2.6.5.recipe b/sys-devel/bison/bison-2.6.5.recipe
index 6de2a61f6..94d67871a 100644
--- a/sys-devel/bison/bison-2.6.5.recipe
+++ b/sys-devel/bison/bison-2.6.5.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:m4
 	"
 
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/sys-devel/bmake/bmake-20140214.recipe b/sys-devel/bmake/bmake-20140214.recipe
index 2cced260c..c6aebcd66 100644
--- a/sys-devel/bmake/bmake-20140214.recipe
+++ b/sys-devel/bmake/bmake-20140214.recipe
@@ -21,12 +21,12 @@ PROVIDES="
 	cmd:bmake = $portVersion compat >= 3.82
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe
index 0bd0233b5..a46465dc4 100644
--- a/sys-devel/clang/clang-3.2.recipe
+++ b/sys-devel/clang/clang-3.2.recipe
@@ -33,14 +33,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe
index ddeac702e..d5b084dd3 100644
--- a/sys-devel/clang/clang-3.4.recipe
+++ b/sys-devel/clang/clang-3.4.recipe
@@ -36,7 +36,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe
index fab104290..a93636a43 100644
--- a/sys-devel/distcc/distcc-3.1.recipe
+++ b/sys-devel/distcc/distcc-3.1.recipe
@@ -24,7 +24,7 @@ GLOBAL_WRITABLE_FILES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libpython2.7
 	"
 
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
 	devel:libpython2.7
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:libtoolize
 	cmd:which
 	cmd:aclocal
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 87048cbc6..a41803dac 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -20,13 +20,13 @@ PROVIDES="
 	devel:libfl_pic = $portVersion compat >= 2.5
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:m4
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe
index 8c9734004..73d03a084 100644
--- a/sys-devel/flex/flex-2.5.39.recipe
+++ b/sys-devel/flex/flex-2.5.39.recipe
@@ -23,13 +23,13 @@ PROVIDES="
 	devel:libfl_pic = 2.0.0 compat >= 2
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	cmd:m4
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
index 5086755e8..c8ec9dc47 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
@@ -34,13 +34,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	binutils$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	gcc$secondaryArchSuffix
 	cmd:find
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
index 0d873ad8e..6a8f39b94 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
@@ -35,13 +35,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	binutils$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	gcc$secondaryArchSuffix
 	cmd:find
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
index e31eabc3f..bea9b287d 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
@@ -37,13 +37,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
index e27d45852..99edf9aff 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
@@ -45,7 +45,7 @@ PROVIDES="
 	"
 	
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
 	"
 
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:find
@@ -315,7 +315,7 @@ PROVIDES_syslibs="
 	"
 
 REQUIRES_syslibs="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 # ----- syslibs_devel package -----------------------------------------------
diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe
index a85790b9a..8698c8f77 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.recipe
+++ b/sys-devel/gettext/gettext-0.18.1.1.recipe
@@ -62,7 +62,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	gettext${secondaryArchSuffix}_libintl == $portVersion base
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -72,7 +72,7 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -122,6 +122,6 @@ PROVIDES_libintl="
 	lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8
 	"
 REQUIRES_libintl="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libiconv${secondaryArchSuffix}
 	"
diff --git a/sys-devel/gettext/gettext-0.19.2.recipe b/sys-devel/gettext/gettext-0.19.2.recipe
index f8f29dcf5..af3e58bdd 100644
--- a/sys-devel/gettext/gettext-0.19.2.recipe
+++ b/sys-devel/gettext/gettext-0.19.2.recipe
@@ -62,7 +62,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	gettext${secondaryArchSuffix}_libintl == $portVersion base
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -73,7 +73,7 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:groff
@@ -118,6 +118,6 @@ PROVIDES_libintl="
 	lib:libintl${secondaryArchSuffix} = 8.1.2 compat >= 8
 	"
 REQUIRES_libintl="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	lib:libiconv${secondaryArchSuffix}
 	"
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 6dd2edf80..a4ffd9fe0 100644
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -27,12 +27,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:make
 	cmd:ld
diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe
index 859ede706..14e9d96b7 100644
--- a/sys-devel/libtool/libtool-2.4.2.recipe
+++ b/sys-devel/libtool/libtool-2.4.2.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	devel:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	libtool_libltdl$secondaryArchSuffix == $portVersion base
 	cmd:aclocal
 	cmd:automake
@@ -36,7 +36,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf >= 2.62
 	cmd:autoheader >= 2.62
@@ -97,5 +97,5 @@ PROVIDES_libltdl="
 	lib:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7
 	"
 REQUIRES_libltdl="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index 4d809f5c4..e1b49aae1 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	devel:libltdl = 7.3.0 compat >= 7
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	libtool_libltdl == $portVersion base
 	cmd:aclocal
 	cmd:automake
@@ -33,7 +33,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf >= 2.62
 	cmd:autoheader >= 2.62
@@ -92,5 +92,5 @@ PROVIDES_libltdl="
 	lib:libltdl = 7.3.0 compat >= 7
 	"
 REQUIRES_libltdl="
-	haiku >= $haikuVersion
+	haiku
 	"
diff --git a/sys-devel/libuuid/libuuid-1.0.3.recipe b/sys-devel/libuuid/libuuid-1.0.3.recipe
index 3aa2e5fd3..7fe017659 100644
--- a/sys-devel/libuuid/libuuid-1.0.3.recipe
+++ b/sys-devel/libuuid/libuuid-1.0.3.recipe
@@ -25,11 +25,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe
index e4c113ae4..f96adf539 100644
--- a/sys-devel/llvm/llvm-3.0.recipe
+++ b/sys-devel/llvm/llvm-3.0.recipe
@@ -18,12 +18,12 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 #	cmd:autoconf
 #	cmd:flex
 	cmd:groff
diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe
index 7e2004dad..3850c7f81 100644
--- a/sys-devel/llvm/llvm-3.2.recipe
+++ b/sys-devel/llvm/llvm-3.2.recipe
@@ -47,14 +47,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe
index 3c3146f10..886a1a044 100644
--- a/sys-devel/llvm/llvm-3.3.recipe
+++ b/sys-devel/llvm/llvm-3.3.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe
index e1ddd5a1c..fb8b440b8 100644
--- a/sys-devel/llvm/llvm-3.4.1.recipe
+++ b/sys-devel/llvm/llvm-3.4.1.recipe
@@ -148,7 +148,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -156,7 +156,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/llvm/llvm-3.4.2.recipe b/sys-devel/llvm/llvm-3.4.2.recipe
index 32ae92aa8..87fe84ff0 100644
--- a/sys-devel/llvm/llvm-3.4.2.recipe
+++ b/sys-devel/llvm/llvm-3.4.2.recipe
@@ -148,7 +148,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
@@ -157,7 +157,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/llvm/llvm-3.4.recipe b/sys-devel/llvm/llvm-3.4.recipe
index e2eb42455..bb80a0e96 100644
--- a/sys-devel/llvm/llvm-3.4.recipe
+++ b/sys-devel/llvm/llvm-3.4.recipe
@@ -47,7 +47,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
@@ -55,7 +55,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index fc3888bd4..cb76f179a 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -26,12 +26,12 @@ PROVIDES="
 	cmd:m4 = $portVersion compat >= 1.4
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:ld
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index d6a66d9a6..3cb28cad1 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -22,12 +22,12 @@ PROVIDES="
 	cmd:make = $portVersion compat >= 3.82
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
diff --git a/sys-devel/openwatcom/openwatcom-1.9.0.recipe b/sys-devel/openwatcom/openwatcom-1.9.0.recipe
index c9705af9e..784ab4f95 100644
--- a/sys-devel/openwatcom/openwatcom-1.9.0.recipe
+++ b/sys-devel/openwatcom/openwatcom-1.9.0.recipe
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:cc$secondaryArchSuffix
 	cmd:make
diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe
index eebe7efb6..76e653566 100644
--- a/sys-devel/patch/patch-2.7.1.recipe
+++ b/sys-devel/patch/patch-2.7.1.recipe
@@ -18,11 +18,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:make
 	cmd:gcc
diff --git a/sys-fs/ddrescue/ddrescue-1.19.recipe b/sys-fs/ddrescue/ddrescue-1.19.recipe
index 37b17e30d..91aab6e6f 100644
--- a/sys-fs/ddrescue/ddrescue-1.19.recipe
+++ b/sys-fs/ddrescue/ddrescue-1.19.recipe
@@ -36,13 +36,13 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/sys-fs/mtools/mtools-4.0.18.recipe b/sys-fs/mtools/mtools-4.0.18.recipe
index 754e0363e..7779dd085 100644
--- a/sys-fs/mtools/mtools-4.0.18.recipe
+++ b/sys-fs/mtools/mtools-4.0.18.recipe
@@ -53,11 +53,11 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:awk
 	cmd:gcc
 	cmd:make
diff --git a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
index f8258b92b..6aaf9203b 100644
--- a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
+++ b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe
@@ -32,7 +32,7 @@ REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
index ba683bc56..6ecb7340e 100644
--- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
+++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
@@ -57,7 +57,7 @@ PROVIDES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe
index 6465ef5cb..c6ea01cee 100644
--- a/sys-libs/glu/glu-9.0.0.recipe
+++ b/sys-libs/glu/glu-9.0.0.recipe
@@ -16,11 +16,11 @@ PROVIDES="
 	lib:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL${secondaryArchSuffix}
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-libs/libexecinfo/libexecinfo-1.1.recipe b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
index fbb1239d3..44e18a571 100644
--- a/sys-libs/libexecinfo/libexecinfo-1.1.recipe
+++ b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
@@ -19,12 +19,12 @@ PROVIDES="
 	lib:libexecinfo$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe
index fccdf54e8..752e6b24e 100644
--- a/sys-libs/mesa/mesa-10.0.1.recipe
+++ b/sys-libs/mesa/mesa-10.0.1.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	lib:libGL$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 PATCHES="mesa-10.0.1.patchset"
diff --git a/sys-libs/mesa/mesa-10.0.2.recipe b/sys-libs/mesa/mesa-10.0.2.recipe
index 8ab5a0d06..cca5b2aae 100644
--- a/sys-libs/mesa/mesa-10.0.2.recipe
+++ b/sys-libs/mesa/mesa-10.0.2.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	lib:libGL$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 PATCHES="mesa-10.0.2.patchset"
diff --git a/sys-libs/mesa/mesa-10.1.0.recipe b/sys-libs/mesa/mesa-10.1.0.recipe
index 18327f821..922dcb994 100644
--- a/sys-libs/mesa/mesa-10.1.0.recipe
+++ b/sys-libs/mesa/mesa-10.1.0.recipe
@@ -24,10 +24,10 @@ PROVIDES="
 	lib:libGL$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	libxml2_python
diff --git a/sys-libs/mesa/mesa-10.1.1.recipe b/sys-libs/mesa/mesa-10.1.1.recipe
index f53f5865d..8a2f7018c 100644
--- a/sys-libs/mesa/mesa-10.1.1.recipe
+++ b/sys-libs/mesa/mesa-10.1.1.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	lib:libGL$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	libxml2_python
diff --git a/sys-libs/mesa/mesa-10.2.9.recipe b/sys-libs/mesa/mesa-10.2.9.recipe
index 943384a4e..d9c049955 100644
--- a/sys-libs/mesa/mesa-10.2.9.recipe
+++ b/sys-libs/mesa/mesa-10.2.9.recipe
@@ -24,12 +24,12 @@ PROVIDES="
 	lib:libGL$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
 	lib:libgcc_s$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	libxml2_python
diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe
index eb6139a1f..1a24dfa61 100644
--- a/sys-libs/mesa/mesa-7.9.2.recipe
+++ b/sys-libs/mesa/mesa-7.9.2.recipe
@@ -30,10 +30,10 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 	
 BUILD_PREREQUIRES="
diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe
index 0b1cf8d1e..13b9259eb 100644
--- a/sys-libs/mesa/mesa-9.1.1.recipe
+++ b/sys-libs/mesa/mesa-9.1.1.recipe
@@ -35,12 +35,12 @@ PROVIDES="
 	mesa$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libxml2_python
 	cmd:bison
 	cmd:find
diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe
index faaeb02e4..86cda2e56 100644
--- a/sys-libs/ncurses/ncurses-5.9.recipe
+++ b/sys-libs/ncurses/ncurses-5.9.recipe
@@ -39,7 +39,7 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 if [ -n "$secondaryArchSuffix" ]; then
 	REQUIRES="$REQUIRES
@@ -50,7 +50,7 @@ fi
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index 5201d1697..5b5da5687 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-libs/readline/readline-6.3.recipe b/sys-libs/readline/readline-6.3.recipe
index 876829e16..4212c4e2c 100644
--- a/sys-libs/readline/readline-6.3.recipe
+++ b/sys-libs/readline/readline-6.3.recipe
@@ -27,11 +27,11 @@ PROVIDES="
 	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe
index ce893c72e..448d813fc 100644
--- a/sys-libs/zlib/zlib-1.2.8.recipe
+++ b/sys-libs/zlib/zlib-1.2.8.recipe
@@ -23,12 +23,12 @@ PROVIDES="
 	lib:libz$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
diff --git a/sys-process/dcron/dcron-4.5.recipe b/sys-process/dcron/dcron-4.5.recipe
index ddb83a586..dd14ff683 100644
--- a/sys-process/dcron/dcron-4.5.recipe
+++ b/sys-process/dcron/dcron-4.5.recipe
@@ -30,11 +30,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/www-client/bezilla/bezilla-git.recipe b/www-client/bezilla/bezilla-git.recipe
index 924ef3d18..3d8e1893a 100644
--- a/www-client/bezilla/bezilla-git.recipe
+++ b/www-client/bezilla/bezilla-git.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:m4
diff --git a/www-client/links/links-2.3pre2.recipe b/www-client/links/links-2.3pre2.recipe
index d73d9ff21..15ce8c848 100644
--- a/www-client/links/links-2.3pre2.recipe
+++ b/www-client/links/links-2.3pre2.recipe
@@ -18,7 +18,7 @@ PROVIDES="
 	cmd:links$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 #	lib:libtiff$secondaryArchSuffix
@@ -37,7 +37,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe
index cce2a6aae..21c73119a 100644
--- a/www-client/links/links-2.8.recipe
+++ b/www-client/links/links-2.8.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	cmd:links$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 #	lib:libtiff$secondaryArchSuffix
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
diff --git a/www-client/lynx/lynx-2.8.9dev.1.recipe b/www-client/lynx/lynx-2.8.9dev.1.recipe
index 8669b7136..172c9c418 100644
--- a/www-client/lynx/lynx-2.8.9dev.1.recipe
+++ b/www-client/lynx/lynx-2.8.9dev.1.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	cmd:lynx$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	#cmd:autoconf
 	cmd:ar
 	cmd:bison
diff --git a/www-client/netsurf/netsurf-3.1.recipe b/www-client/netsurf/netsurf-3.1.recipe
index 31cf4a0fd..915d41b20 100644
--- a/www-client/netsurf/netsurf-3.1.recipe
+++ b/www-client/netsurf/netsurf-3.1.recipe
@@ -23,7 +23,7 @@ PROVIDES="
 	app:NetSurf = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libcurl
 	lib:libexpat
 	lib:libiconv
@@ -33,7 +33,7 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libcurl
 	devel:libexpat
 	devel:libiconv
diff --git a/www-client/netsurf/netsurf-3.2.recipe b/www-client/netsurf/netsurf-3.2.recipe
index 43ed98c94..556ff1b51 100644
--- a/www-client/netsurf/netsurf-3.2.recipe
+++ b/www-client/netsurf/netsurf-3.2.recipe
@@ -16,7 +16,7 @@ SRC_URI="git://git.netsurf-browser.org/netsurf.git#9b62f1ec53b089e6697131a3653c7
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libcurl
 	lib:libexpat
 	lib:libiconv
@@ -28,7 +28,7 @@ REQUIRES="
 "
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	devel:libcurl
 	devel:libexpat
 	devel:libiconv
diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe
index dd80ab1e2..62b021fa1 100644
--- a/www-client/qupzilla/qupzilla-1.4.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.4.x.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 # TODO: update requirements to be more specific about which Qt 
 # libraries are required.	
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	qtcore${secondaryArchSuffix} >= 4.8.0
 	"
 
@@ -41,7 +41,7 @@ BUILD_PREREQUIRES="
 	"
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	openssl${secondaryArchSuffix}_devel
 	qtcore${secondaryArchSuffix} >= 4.8.0
 	qtcore${secondaryArchSuffix}_devel >= 4.8.0
diff --git a/www-client/qupzilla/qupzilla-1.7.x.recipe b/www-client/qupzilla/qupzilla-1.7.x.recipe
index 408f6bbfa..4d619f595 100644
--- a/www-client/qupzilla/qupzilla-1.7.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.7.x.recipe
@@ -29,7 +29,7 @@ PROVIDES="
 # TODO: update requirements to be more specific about which Qt 
 # libraries are required.	
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku${secondaryArchSuffix}
 	libqt4${secondaryArchSuffix} >= 4.8.0
 	lib:libexecinfo${secondaryArchSuffix}
 	"
@@ -42,7 +42,7 @@ BUILD_PREREQUIRES="
 	"
         
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel == $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
 	devel:libssl${secondaryArchSuffix}
 	devel:libcrypto${secondaryArchSuffix}
diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe
index a403eeda1..c4b9354bf 100644
--- a/www-client/w3m/w3m-0.5.3.recipe
+++ b/www-client/w3m/w3m-0.5.3.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libgc
 	lib:libssl
 	lib:libcrypto
@@ -41,7 +41,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe
index c498e4038..a9a4e71b5 100644
--- a/www-servers/haproxy/haproxy-1.4.22.recipe
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -20,11 +20,11 @@ PROVIDES="
 	cmd:haproxy = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:make
 	cmd:gcc
 	"
diff --git a/www-servers/lighttpd/lighttpd-1.4.35.recipe b/www-servers/lighttpd/lighttpd-1.4.35.recipe
index 11053f558..0b22c962c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.35.recipe
+++ b/www-servers/lighttpd/lighttpd-1.4.35.recipe
@@ -56,7 +56,7 @@ PROVIDES="
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	lib:libbz2
 	lib:libcrypto
 	lib:libpcre
@@ -72,7 +72,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autom4te
 	cmd:automake
diff --git a/www-servers/nginx/nginx-1.7.4_hg.recipe b/www-servers/nginx/nginx-1.7.4_hg.recipe
index fae8b9331..ccb6e281a 100644
--- a/www-servers/nginx/nginx-1.7.4_hg.recipe
+++ b/www-servers/nginx/nginx-1.7.4_hg.recipe
@@ -22,13 +22,13 @@ PROVIDES="
 	cmd:nginx$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libpcre$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe
index 980c729a8..348c74f1f 100644
--- a/x11-libs/agg/agg-2.5.recipe
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	lib:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2
 "
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 "
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libsdl_1.2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
@@ -99,7 +99,7 @@ PROVIDES_sdl="
 "
 REQUIRES_sdl="
 	agg$secondaryArchSuffix == $portVersion base
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libsdl_1.2$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 "
diff --git a/x11-libs/cairo/cairo-1.12.16.recipe b/x11-libs/cairo/cairo-1.12.16.recipe
index 6f1c87c93..23f608b9a 100644
--- a/x11-libs/cairo/cairo-1.12.16.recipe
+++ b/x11-libs/cairo/cairo-1.12.16.recipe
@@ -44,7 +44,7 @@ PROVIDES="
 	lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libpixman_1$secondaryArchSuffix
@@ -56,7 +56,7 @@ REQUIRES="
 	lib:libgcc_s$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libpixman_1$secondaryArchSuffix
diff --git a/x11-libs/cairo/cairo-1.12.18.recipe b/x11-libs/cairo/cairo-1.12.18.recipe
index 7a716da4e..e10730e49 100644
--- a/x11-libs/cairo/cairo-1.12.18.recipe
+++ b/x11-libs/cairo/cairo-1.12.18.recipe
@@ -44,7 +44,7 @@ PROVIDES="
 	lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libpixman_1$secondaryArchSuffix
@@ -56,7 +56,7 @@ REQUIRES="
 	lib:libgcc_s$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libpixman_1$secondaryArchSuffix
diff --git a/x11-libs/cd/cd-5.8.recipe b/x11-libs/cd/cd-5.8.recipe
index 0710ea8a0..d25bee772 100644
--- a/x11-libs/cd/cd-5.8.recipe
+++ b/x11-libs/cd/cd-5.8.recipe
@@ -30,7 +30,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -53,7 +53,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
diff --git a/x11-libs/iup/iup-3.8.recipe b/x11-libs/iup/iup-3.8.recipe
index 454bccf42..60ff7064e 100644
--- a/x11-libs/iup/iup-3.8.recipe
+++ b/x11-libs/iup/iup-3.8.recipe
@@ -37,7 +37,7 @@ PROVIDES="
 	lib:libiupweb$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:liblua$secondaryArchSuffix
 	lib:libcd$secondaryArchSuffix >= 5.6
 	lib:libim$secondaryArchSuffix >= 3.8
@@ -58,7 +58,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
 	cmd:make
diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe
index 401df5e10..9a955a037 100644
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
@@ -19,17 +19,17 @@ PROVIDES="
 	devel:libxau$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	xproto$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	devel:xproto$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-libs/libxau/libxau-1.0.8.recipe b/x11-libs/libxau/libxau-1.0.8.recipe
index 44976333c..aff1b8c9d 100644
--- a/x11-libs/libxau/libxau-1.0.8.recipe
+++ b/x11-libs/libxau/libxau-1.0.8.recipe
@@ -21,17 +21,17 @@ PROVIDES="
 	devel:libXau$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	xproto$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	devel:xproto$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe
index 260f14c9c..77caeb1e7 100644
--- a/x11-libs/libxcb/libxcb-1.6.recipe
+++ b/x11-libs/libxcb/libxcb-1.6.recipe
@@ -61,7 +61,7 @@ PROVIDES="
 	devel:libxcb_xvmc$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libxslt >= 1.1.26
 	lib:libxau$secondaryArchSuffix >= 1.0.5
 	"
@@ -74,7 +74,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:doxygen
diff --git a/x11-libs/pango/pango-1.36.8.recipe b/x11-libs/pango/pango-1.36.8.recipe
index 7a10f51fe..2f31fcc9a 100644
--- a/x11-libs/pango/pango-1.36.8.recipe
+++ b/x11-libs/pango/pango-1.36.8.recipe
@@ -41,7 +41,7 @@ PROVIDES="
 	lib:libpangoft2_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libcairo$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
@@ -62,7 +62,7 @@ REQUIRES="
 	lib:libbz2$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:libcairo$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe
index 59e7a731c..a3d79fbbd 100644
--- a/x11-libs/pixman/pixman-0.20.0.recipe
+++ b/x11-libs/pixman/pixman-0.20.0.recipe
@@ -29,7 +29,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 REQUIRES_devel="
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/x11-libs/pixman/pixman-0.32.4.recipe b/x11-libs/pixman/pixman-0.32.4.recipe
index 248a4096c..e868fab43 100644
--- a/x11-libs/pixman/pixman-0.32.4.recipe
+++ b/x11-libs/pixman/pixman-0.32.4.recipe
@@ -29,7 +29,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 REQUIRES_devel="
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/x11-libs/pixman/pixman-0.32.6.recipe b/x11-libs/pixman/pixman-0.32.6.recipe
index e60adb9ca..3be9c6a8e 100644
--- a/x11-libs/pixman/pixman-0.32.6.recipe
+++ b/x11-libs/pixman/pixman-0.32.6.recipe
@@ -29,7 +29,7 @@ PROVIDES_devel="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 REQUIRES_devel="
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe
index c2f5e6efa..1864a6f7c 100644
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -21,14 +21,14 @@ PROVIDES="
 	devel:xtrans$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe b/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe
index be26c3cfb..64887d5b8 100644
--- a/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe
+++ b/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe
@@ -20,7 +20,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	glib2$secondaryArchSuffix >= 2
 	lib:libxml2$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:xmllint
diff --git a/x11-misc/synergy/synergy-1.5.0.recipe b/x11-misc/synergy/synergy-1.5.0.recipe
index 793ad3127..79b203911 100644
--- a/x11-misc/synergy/synergy-1.5.0.recipe
+++ b/x11-misc/synergy/synergy-1.5.0.recipe
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:cmake
 	cmd:gcc
 	cmd:make
diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
index a79f453fe..2fdd88e87 100644
--- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe
+++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
@@ -19,14 +19,14 @@ PROVIDES="
 	devel:util_macros$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:aclocal
 	cmd:make
diff --git a/x11-misc/util_macros/util_macros-1.19.0.recipe b/x11-misc/util_macros/util_macros-1.19.0.recipe
index 1f056d70a..e4a56b711 100644
--- a/x11-misc/util_macros/util_macros-1.19.0.recipe
+++ b/x11-misc/util_macros/util_macros-1.19.0.recipe
@@ -19,11 +19,11 @@ PROVIDES="
 	devel:util_macros$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe
index 41aa9bf03..96af8a5c9 100644
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -20,14 +20,14 @@ PROVIDES="
 	devel:inputproto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe
index 4bae0ebbc..9ddce1933 100644
--- a/x11-proto/kbproto/kbproto-1.0.4.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -17,14 +17,14 @@ PROVIDES="
 	devel:kbproto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
index f9a8cf473..9364a56cc 100644
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -17,11 +17,11 @@ PROVIDES="
 	devel:xcb_proto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	"
 
diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe
index da6336db8..08c394397 100644
--- a/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	devel:xextproto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix >= 1.7.0
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe
index 8578e0d16..db95e08a6 100644
--- a/x11-proto/xproto/xproto-7.0.23_git.recipe
+++ b/x11-proto/xproto/xproto-7.0.23_git.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	devel:xproto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
diff --git a/x11-proto/xproto/xproto-7.0.26.recipe b/x11-proto/xproto/xproto-7.0.26.recipe
index 3491bd29a..1bb11178f 100644
--- a/x11-proto/xproto/xproto-7.0.26.recipe
+++ b/x11-proto/xproto/xproto-7.0.26.recipe
@@ -25,14 +25,14 @@ PROVIDES="
 	devel:xproto$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool