From d021a68f777585b8c31e1217d90c179e7db31b09 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 4 Apr 2023 12:23:16 +0200
Subject: [PATCH] rtmpdump, cleanup, move cmd's to tools package (#8271)

---
 .../rtmpdump/rtmpdump-2.4_20161210.recipe     | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe b/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
index 59cad86a0..821c83ebb 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
+++ b/media-video/rtmpdump/rtmpdump-2.4_20161210.recipe
@@ -5,32 +5,23 @@ HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
 COPYRIGHT="2009 Andrej Stepanchuk
 	2009-2011 Howard Chu
 	2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
-	2011 33ae1ce77301f4b4494faaa5f609f3c48b9dcf82
-	"
+	2011 33ae1ce77301f4b4494faaa5f609f3c48b9dcf82"
 LICENSE="GNU LGPL v2.1
-	GNU GPL v2
-	"
-REVISION="6"
+	GNU GPL v2"
+REVISION="7"
 SOURCE_URI="https://sources.voidlinux.org/rtmpdump-2.4.20161210/rtmpdump-2.4_p20161210.tar.gz"
 CHECKSUM_SHA256="d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f"
 SOURCE_DIR=""
-PATCHES="
-	rtmpdump-2.4_git.patch
-	rtmpdump-openssl-1.1-v2.patch
-	"
+PATCHES="rtmpdump-2.4_git.patch
+	rtmpdump-openssl-1.1-v2.patch"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	rtmpdump$secondaryArchSuffix = $portVersion compat >= 2.4
-	cmd:rtmpdump = $portVersion compat >= 2.4
-	cmd:rtmpgw = $portVersion compat >= 2.4
-	cmd:rtmpsrv = $portVersion compat >= 2.4
-	cmd:rtmpsuck = $portVersion compat >= 2.4
 	lib:librtmp.1$secondaryArchSuffix = 1 compat >= 1
 	"
-# commands are provided in /bin regardless
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -43,7 +34,22 @@ PROVIDES_devel="
 	devel:librtmp.1$secondaryArchSuffix = 1 compat >= 1
 	"
 REQUIRES_devel="
-	rtmpdump$secondaryArchSuffix == $portVersion
+	rtmpdump$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	rtmpdump${secondaryArchSuffix}_tools = $portVersion compat >= 2.4
+	cmd:rtmpdump = $portVersion compat >= 2.4
+	cmd:rtmpgw = $portVersion compat >= 2.4
+	cmd:rtmpsrv = $portVersion compat >= 2.4
+	cmd:rtmpsuck = $portVersion compat >= 2.4
+	"
+REQUIRES_tools="
+	rtmpdump$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -63,8 +69,8 @@ BUILD()
 {
 	make $jobArgs SYS=haiku \
 		prefix=$prefix \
-		bindir=$binDir \
-		sbindir=$binDir \
+		bindir=$prefix/bin \
+		sbindir=$prefix/bin \
 		incdir=$includeDir \
 		libdir=$libDir \
 		mandir=$manDir
@@ -72,12 +78,12 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $libDir $binDir $manDir $includeDir
+	mkdir -p $libDir $prefix/bin $manDir $includeDir
 
 	make $jobArgs SYS=haiku \
 		prefix=$prefix \
-		bindir=$binDir \
-		sbindir=$binDir \
+		bindir=$prefix/bin \
+		sbindir=$prefix/bin \
 		incdir=$includeDir \
 		libdir=$libDir \
 		mandir=$manDir \
@@ -87,12 +93,11 @@ INSTALL()
 		librtmp.1
 	rm $libDir/librtmp.so
 	mv $libDir/librtmp.a $developLibDir
+	fixPkgconfig
 
 	mkdir $includeDir/librtmp
 	mv $includeDir/*.h $includeDir/librtmp
 
-	fixPkgconfig
-
 	sed -i "s|libdir=.*|libdir=$developLibDir|" $developLibDir/pkgconfig/librtmp.pc
 	sed -i "s|incdir=.*|incdir=$includeDir|" $developLibDir/pkgconfig/librtmp.pc
 
@@ -100,4 +105,8 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 
+	# tools package
+	packageEntries tools \
+		$prefix/bin \
+		$manDir
 }