diff --git a/sci-libs/proj/proj-9.0.0.recipe b/sci-libs/proj/proj-9.0.0.recipe
index 894695402..9a2765b19 100644
--- a/sci-libs/proj/proj-9.0.0.recipe
+++ b/sci-libs/proj/proj-9.0.0.recipe
@@ -4,7 +4,7 @@ cartographic projections."
 HOMEPAGE="https://proj4.org/index.html"
 COPYRIGHT="2000-2018 Frank Warmerdam"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://download.osgeo.org/proj/proj-$portVersion.tar.gz"
 CHECKSUM_SHA256="0620aa01b812de00b54d6c23e7c5cc843ae2cd129b24fabe411800302172b989"
 
@@ -24,15 +24,6 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	proj$secondaryArchSuffix = $portVersion
-	cmd:cct$commandSuffix = $portVersion
-	cmd:cs2cs$commandSuffix = $portVersion
-	cmd:geod$commandSuffix = $portVersion
-	cmd:gie$commandSuffix = $portVersion
-	cmd:invgeod$commandSuffix = $portVersion
-	cmd:invproj$commandSuffix = $portVersion
-	cmd:proj$commandSuffix = $portVersion
-	cmd:projinfo$commandSuffix = $portVersion
-	cmd:projsync$commandSuffix = $portVersion
 	lib:libproj$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -48,6 +39,29 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	proj$secondaryArchSuffix == $portVersion base
+	devel:libcurl$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	"
+
+PROVIDES_tools="
+	proj${secondaryArchSuffix}_tools
+	cmd:cct$commandSuffix = $portVersion
+	cmd:cs2cs$commandSuffix = $portVersion
+	cmd:geod$commandSuffix = $portVersion
+	cmd:gie$commandSuffix = $portVersion
+	cmd:invgeod$commandSuffix = $portVersion
+	cmd:invproj$commandSuffix = $portVersion
+	cmd:proj$commandSuffix = $portVersion
+	cmd:projinfo$commandSuffix = $portVersion
+	cmd:projsync$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	proj$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -65,13 +79,13 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage proj$secondaryArchSuffix \
-	"$commandBinDir"/cct \
-	"$commandBinDir"/cs2cs \
-	"$commandBinDir"/geod \
-	"$commandBinDir"/gie \
-	"$commandBinDir"/proj \
-	"$commandBinDir"/projinfo \
-	"$commandBinDir"/projsync \
+	"$(getPackagePrefix tools)"/bin/cct \
+	"$(getPackagePrefix tools)"/bin/cs2cs \
+	"$(getPackagePrefix tools)"/bin/geod \
+	"$(getPackagePrefix tools)"/bin/gie \
+	"$(getPackagePrefix tools)"/bin/proj \
+	"$(getPackagePrefix tools)"/bin/projinfo \
+	"$(getPackagePrefix tools)"/bin/projsync \
 	"$libDir"/libproj.so.$libVersion
 
 BUILD()
@@ -79,8 +93,7 @@ BUILD()
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DBINDIR=$commandBinDir \
-		-DDOCDIR=$docDir \
-		-DMANDIR=$manDir -L
+		-DDOCDIR=$docDir
 	make -C build $jobArgs
 }
 
@@ -100,9 +113,14 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		"$developDir"
+
+	# tools package
+	packageEntries tools \
+		$commandBinDir \
+		$manDir
 }
 
 TEST()
 {
-	make -C build check
+	ctest --test-dir build
 }