BeShare: update to the latest commit

* update MUSCLE version to 6.11
* remove upstreamed MUSCLE patch

haiku-apps/beshare/beshare-2.31.recipe

@@ -20,11 +20,10 @@ LICENSE="
 	libsanta
 	"
 HOMEPAGE="https://github.com/HaikuArchives/BeShare" 
-SRC_URI="git+https://github.com/HaikuArchives/BeShare.git#29bf5a00162aba759ddae5016129a246414dbb8c"
-SRC_URI_2="https://public.msli.com/lcs/muscle/muscle6.05.zip"
+SRC_URI="git+https://github.com/HaikuArchives/BeShare.git#b721fcc"
+SRC_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip"
 REVISION="1"
-#CHECKSUM_SHA256=""
-CHECKSUM_SHA256_2="59605af9ba140ab2070f93e8efdd96646891b040eea5c970caea4c5aaf2845a6"
+CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340"
 
 
 ARCHITECTURES="x86 ?x86_64"
@@ -41,11 +40,13 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	#lib:libz
+	lib:libsanta$secondaryArchSuffix
+	lib:libz
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	#devel:libz$secondaryArchSuffix
+	devel:libsanta$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	#devel:muscle$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -57,20 +58,18 @@ BUILD_PREREQUIRES="
 	"
 
 PATCHES="beshare-4.patchset"
-PATCHES_2="muscle-6.05.patchset"
 
 BUILD()
 {
-	ln -s ../../sources-2/muscle muscle
+	ln -sf ../../sources-2/muscle muscle
 	cd source
-	make
+	make $jobArgs
 	#LOCAL_INCLUDE_PATHS=$includeDir/muscle
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir/BeShare
-	cp source/objects.*/BeShare $appsDir/BeShare
-	cp docs/*.txt $appsDir/BeShare
+	cp -r app/* $appsDir/BeShare
 	addAppDeskbarSymlink $appsDir/BeShare/BeShare
 }

haiku-apps/beshare/patches/muscle-6.05.patchset

@@ -1,26 +0,0 @@
-From fc58bebf338e22ea60450fbe9ad3c295fadc6406 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sat, 26 Jul 2014 19:02:33 +0200
-Subject: [PATCH] Just use int32 for atomics on Haiku now
-
-We dropped the volatile requirement.
----
- muscle/system/AtomicCounter.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/muscle/system/AtomicCounter.h b/muscle/system/AtomicCounter.h
-index 465bce2..bd720e7 100644
---- a/muscle/system/AtomicCounter.h
-+++ b/muscle/system/AtomicCounter.h
-@@ -183,7 +183,7 @@ private:
- #elif defined(__APPLE__)
-    volatile int32_t _count;
- #elif defined(__BEOS__) || defined(__HAIKU__)
--# if defined(B_BEOS_VERSION_5)
-+# if defined(B_BEOS_VERSION_5) && !defined(__HAIKU__)
-    vint32 _count;
- # else
-    int32 _count;
--- 
-1.8.3.4
-