diff --git a/dev-libs/check/check-0.10.0.recipe b/dev-libs/check/check-0.10.0.recipe
deleted file mode 100644
index fbe35af7d..000000000
--- a/dev-libs/check/check-0.10.0.recipe
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY="Unit Testing Framework for C"
-DESCRIPTION="Check is a unit testing framework for C. It features a simple \
-interface for defining unit tests, putting little in the way of the developer.
-Tests are run in a separate address space, so both assertion failures and code \
-errors that cause segmentation faults or other signals can be caught. Test \
-results are reportable in the following: Subunit, TAP, XML, and a generic \
-logging format."
-HOMEPAGE="https://libcheck.github.io/check/"
-COPYRIGHT="2001-2017 Arien Malec, Branden Archer, Chris Pickett, Fredrik \
-Hugosson, and Robert Lemmen."
-LICENSE="GNU LGPL v2.1"
-REVISION="5"
-SOURCE_URI="https://github.com/libcheck/check/releases/download/$portVersion/check-$portVersion.tar.gz"
-CHECKSUM_SHA256="f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052"
-PATCHES="check-$portVersion.patch"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	check$secondaryArchSuffix = $portVersion
-	cmd:checkmk$secondaryArchSuffix = $portVersion
-	lib:libcheck$secondaryArchSuffix = 0.0.0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:awk
-	"
-if [ -z "$secondaryArchSuffix" ]; then
-REPLACES="
-	check_common
-	"
-fi
-
-PROVIDES_devel="
-	check${secondaryArchSuffix}_devel = $portVersion
-	devel:libcheck$secondaryArchSuffix = 0.0.0
-	"
-REQUIRES_devel="
-	check$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:diff
-	cmd:find
-	cmd:gawk
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	MAKEINFO=true runConfigure ./configure --disable-static
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $dataDir/doc $documentationDir
-	fi
-
-	rm $libDir/libcheck.la
-	prepareInstalledDevelLib libcheck
-	fixPkgconfig
-
-	packageEntries devel \
-		$dataDir/aclocal \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/dev-libs/check/check-0.13.0.recipe b/dev-libs/check/check-0.15.2.recipe
similarity index 71%
rename from dev-libs/check/check-0.13.0.recipe
rename to dev-libs/check/check-0.15.2.recipe
index 0f70f6ec0..45df65235 100644
--- a/dev-libs/check/check-0.13.0.recipe
+++ b/dev-libs/check/check-0.15.2.recipe
@@ -9,17 +9,27 @@ HOMEPAGE="https://libcheck.github.io/check/"
 COPYRIGHT="2001-2017 Arien Malec, Branden Archer, Chris Pickett, Fredrik \
 Hugosson, and Robert Lemmen."
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/libcheck/check/releases/download/$portVersion/check-$portVersion.tar.gz"
-CHECKSUM_SHA256="c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909"
+CHECKSUM_SHA256="a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	check$secondaryArchSuffix = $portVersion
-	cmd:checkmk$secondaryArchSuffix = $portVersion
-	lib:libcheck$secondaryArchSuffix = 0.0.0
+	cmd:checkmk$commandSuffix = $portVersion
+	lib:libcheck$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,7 +43,7 @@ fi
 
 PROVIDES_devel="
 	check${secondaryArchSuffix}_devel = $portVersion
-	devel:libcheck$secondaryArchSuffix = 0.0.0
+	devel:libcheck$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	check$secondaryArchSuffix == $portVersion base
@@ -51,7 +61,10 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	MAKEINFO=true runConfigure ./configure --disable-static
+	MAKEINFO=true runConfigure --omit-dirs binDir \
+		./configure \
+		--bindir=$commandBinDir \
+		--disable-static
 	make $jobArgs
 }
 
diff --git a/dev-libs/check/check-0.9.13.recipe b/dev-libs/check/check-0.9.13.recipe
deleted file mode 100644
index 7f86889a7..000000000
--- a/dev-libs/check/check-0.9.13.recipe
+++ /dev/null
@@ -1,78 +0,0 @@
-SUMMARY="Unit Testing Framework for C"
-DESCRIPTION="Check is a unit testing framework for C. It features a simple \
-interface for defining unit tests, putting little in the way of the developer.
-Tests are run in a separate address space, so both assertion failures and code \
-errors that cause segmentation faults or other signals can be caught. Test \
-results are reportable in the following: Subunit, TAP, XML, and a generic \
-logging format."
-HOMEPAGE="http://check.sourceforge.net/"
-COPYRIGHT="2001-2014 Arien Malec, Branden Archer, Chris Pickett, Fredrik \
-Hugosson, and Robert Lemmen."
-LICENSE="GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="http://sourceforge.net/projects/check/files/check/$portVersion/check-$portVersion.tar.gz"
-CHECKSUM_SHA256="ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	check$secondaryArchSuffix = $portVersion
-	cmd:checkmk$secondaryArchSuffix = $portVersion
-	lib:libcheck$secondaryArchSuffix = 0.0.0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:awk
-	"
-if [ -z "$secondaryArchSuffix" ]; then
-REPLACES="
-	check_common
-	"
-fi
-
-PROVIDES_devel="
-	check${secondaryArchSuffix}_devel = $portVersion
-	devel:libcheck$secondaryArchSuffix = 0.0.0
-	"
-REQUIRES_devel="
-	check$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:diff
-	cmd:find
-	cmd:gawk
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	runConfigure ./configure --disable-static
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $dataDir/doc $documentationDir
-	fi
-
-	rm $libDir/libcheck.la
-	prepareInstalledDevelLib libcheck
-	fixPkgconfig
-
-	packageEntries devel \
-		$dataDir/aclocal \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/dev-libs/check/patches/check-0.10.0.patch b/dev-libs/check/patches/check-0.10.0.patch
deleted file mode 100644
index 9a0cb9c22..000000000
--- a/dev-libs/check/patches/check-0.10.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/check_msg.c	2015-08-02 19:31:23.000000000 +0000
-+++ b/src/check_msg.c	
-@@ -226,22 +226,22 @@ void teardown_messaging(void)
-  */
- FILE *open_tmp_file(char **name)
- {
-     FILE *file = NULL;
- 
--    *name = NULL;
--
- #if !HAVE_MKSTEMP
-     /* Windows does not like tmpfile(). This is likely because tmpfile()
-      * call unlink() on the file before returning it, to make sure the
-      * file is deleted when it is closed. The unlink() call also fails
-      * on Windows if the file is still open. */
-     /* also note that mkstemp is apparently a C90 replacement for tmpfile */
-     /* perhaps all we need to do on Windows is set TMPDIR to whatever is
-        stored in TEMP for tmpfile to work */
-     /* and finally, the "b" from "w+b" is ignored on OS X, not sure about WIN32 */
- 
-+    *name = NULL;
-+
-     file = tmpfile();
-     if(file == NULL)
-     {
-         char *tmp = getenv("TEMP");
-         char *tmp_file = tempnam(tmp, "check_");