rehex, revbump, build fixes (#10399)

app-editors/rehex/rehex-0.61.1.recipe

@@ -19,9 +19,8 @@ HOMEPAGE="https://solemnwarning.net/rehex/"
 COPYRIGHT="2019-2024 Daniel Collins"
 LICENSE="GNU GPL v2"
 SOURCE_URI="https://github.com/solemnwarning/rehex/archive/refs/tags/0.61.1.tar.gz"
-SOURCE_DIR="$portVersionedName"
 CHECKSUM_SHA256="1526b18b2dcf357fd49d41d3c37306e2fec1fccfee07a41e6a017b60e6416bed"
-REVISION="1"
+REVISION="2"
 PATCHES="rehex-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -29,7 +28,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rehex$secondaryArchSuffix = $portVersion
-	cmd:rehex$secondaryArchSuffix = $portVersion
+	cmd:rehex = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -58,7 +57,6 @@ REQUIRES="
 	lib:libwx_gtk3u_propgrid_3.2$secondaryArchSuffix
 	"
 
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:wx_config$secondaryArchSuffix
@@ -78,7 +76,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make $jobArgs BOTAN_CFLAGS=-I/system/develop/headers/botan-2/ BUILD_HELP=0 prefix=$prefix datarootdir=$dataRootDir
+	make $jobArgs BOTAN_CFLAGS=-I"`finddir B_SYSTEM_HEADERS_DIRECTORY`${secondaryArchSubDir}/botan-2/" \
+		BUILD_HELP=0 prefix=$prefix datarootdir=$dataRootDir
 }
 
 INSTALL()
@@ -88,5 +87,5 @@ INSTALL()
 	# Remove .desktop and png icons
 	rm -rf $dataRootDir
 
-	addAppDeskbarSymlink $binDir/rehex Rehex
+	addAppDeskbarSymlink $prefix/bin/rehex Rehex
 }