diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe
deleted file mode 100644
index d63d84f51..000000000
--- a/dev-util/cppunit/cppunit-1.12.1.recipe
+++ /dev/null
@@ -1,80 +0,0 @@
-SUMMARY="C++ unit testing framework"
-DESCRIPTION="
-CppUnit is a C++ unit testing framework. It started its life as a port of \
-JUnit to C++ by Michael Feathers."
-HOMEPAGE="http://cppunit.sourceforge.net/"
-COPYRIGHT="2000 Jerome Lacoste
-	2000 Michael Feathers
-	2000-2002 E. Sommerlade
-	2001-2013 Baptiste Lepilleur
-	2001 Bastiaan Bakker
-	2001-2002, 2007-2008 Steve Robbins
-	2012-2013 Harvey Brydon"
-LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz"
-CHECKSUM_SHA256="ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	cppunit$secondaryArchSuffix = $portVersion compat >= 1.12
-	cmd:cppunit_config$secondaryArchSuffix = $portVersion compat >= 1.12
-	cmd:DllPlugInTester$secondaryArchSuffix = $portVersion compat >= 1.12
-	lib:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.12
-	lib:libcppunit_1.12$secondaryArchSuffix = $portVersion compat >= 1.12
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	cppunit${secondaryArchSuffix}_devel = $portVersion
-	devel:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.12
-	"
-REQUIRES_devel="
-	cppunit$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:libtoolize
-	cmd:autoreconf
-	cmd:g++$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:sed
-	"
-
-PATCH()
-{
-	# change obsolete macro
-	sed -i -e 's#AM_CONFIG_HEADER(\(.*\))#AC_CONFIG_HEADERS([\1])#g' \
-		configure.in
-}
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	autoreconf -i
-
-	# there seems to be a problem with dirname
-	sed -i -e 's#\/\* automatically generated \*\/#$ac_prefix_conf_INP#g' \
-		configure
-
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLib libcppunit
-	fixPkgconfig
-
-	packageEntries devel $developDir
-}
diff --git a/dev-util/cppunit/cppunit-1.14.0.recipe b/dev-util/cppunit/cppunit-1.14.0.recipe
index 0c2227cfb..3eae033c0 100644
--- a/dev-util/cppunit/cppunit-1.14.0.recipe
+++ b/dev-util/cppunit/cppunit-1.14.0.recipe
@@ -1,8 +1,7 @@
 SUMMARY="C++ unit testing framework"
-DESCRIPTION="
-CppUnit is a C++ unit testing framework. It started its life as a port of \
-JUnit to C++ by Michael Feathers."
-HOMEPAGE="http://cppunit.sourceforge.net/"
+DESCRIPTION="CppUnit is a C++ unit testing framework. It started its life as \
+a port of JUnit to C++ by Michael Feathers."
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit/"
 COPYRIGHT="2000 Jerome Lacoste
 	2000 Michael Feathers
 	2000-2002 E. Sommerlade
@@ -11,19 +10,24 @@ COPYRIGHT="2000 Jerome Lacoste
 	2001-2002, 2007-2008 Steve Robbins
 	2012-2013 Harvey Brydon"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="http://dev-www.libreoffice.org/src/cppunit-$portVersion.tar.gz"
+REVISION="2"
+SOURCE_URI="https://dev-www.libreoffice.org/src/cppunit-$portVersion.tar.gz"
 CHECKSUM_SHA256="3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
+portVers="${portVersion%.*}"
+
 PROVIDES="
 	cppunit$secondaryArchSuffix = $portVersion
-	cmd:cppunit_config$secondaryArchSuffix = $portVersion compat >= 1.14
-	cmd:DllPlugInTester$secondaryArchSuffix = $portVersion compat >= 1.14
-	lib:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.14
-	lib:libcppunit_1.14$secondaryArchSuffix = $portVersion compat >= 1.14
+	cmd:cppunit_config$secondaryArchSuffix = $portVersionCompat
+	cmd:DllPlugInTester$secondaryArchSuffix = $portVersionCompat
+	lib:libcppunit$secondaryArchSuffix = $libVersionCompat
+	lib:libcppunit_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -31,7 +35,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	cppunit${secondaryArchSuffix}_devel = $portVersion
-	devel:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.14
+	devel:libcppunit$secondaryArchSuffix = $libVersionCompat
+	devel:libcppunit_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	cppunit$secondaryArchSuffix == $portVersion base
@@ -42,17 +47,19 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:libtoolize
 	cmd:autoreconf
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
+defineDebugInfoPackage cppunit$secondaryArchSuffix \
+	$libDir/libcppunit-$portVers.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy --install
 	autoreconf -i
 	runConfigure ./configure
 	make $jobArgs
@@ -64,7 +71,7 @@ INSTALL()
 
 	rm $libDir/libcppunit.la
 
-	prepareInstalledDevelLib libcppunit
+	prepareInstalledDevelLibs libcppunit-$portVers libcppunit
 	fixPkgconfig
 
 	packageEntries devel $developDir