beshare: Update recipe and fix the build

It now runs, but it still wants to put logs and downloads
in its app folder...

haiku-apps/beshare/beshare-4.recipe

@@ -1,20 +1,80 @@
-DESCRIPTION="Beshare" 
-HOMEPAGE="http://dev.osdrawer.net/projects/beshare/" 
-SRC_URI="svn+http://svn.osdrawer.net/beshare"
+SUMMARY="Beshare" 
+DESCRIPTION="BeShare is a BeOS/Haiku-native file sharing program. \
+	It operates similarly to other such programs (Napster, Hotline, etc) \
+	but with a few advantages:
+
+    - BeShare allows you to upload or download any type \
+    of file, not just mp3.
+    - When browsing files, you can see their attributes \
+    (similar to Be's Tracker view)
+    - Your query is always \"live\", so if new files that \
+    match your query become available, you will see them \
+    added to the results list right away (you won't have to \
+    click "refresh" or anything first)
+    - BeShare includes a rudimentary chat mechanism for you social types.
+    - BeShare supports any number of simultaneous uploads and downloads \
+    in parallel, but will serialize simultaneous file requests to any \
+    given host for efficiency.
+"
+COPYRIGHT="1999-2012 Jeremy Friesner"
+LICENSE="
+	Public Domain
+	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"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="muscle >= 4.63"
-#CHECKSUM_MD5=""
+#CHECKSUM_SHA256=""
+CHECKSUM_SHA256_2="59605af9ba140ab2070f93e8efdd96646891b040eea5c970caea4c5aaf2845a6"
+
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	beshare$secondaryArchSuffix = $portVersion
+	app:beshare$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	#lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	#devel:libz$secondaryArchSuffix
+	#devel:muscle$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	makefile_engine
+	"
+
+PATCHES_2="muscle-6.05.patchset"
+	
 BUILD()
 {
-	cd beshare-4/source
+	ln -s ../../sources-2/muscle muscle
+	cd source
 	make
+	#LOCAL_INCLUDE_PATHS=$includeDir/muscle
 }
 
 INSTALL()
 {
-	cd beshare-4
+	mkdir -p $appsDir/BeShare
+	cp source/objects.*/BeShare $appsDir/BeShare
+	cp docs/*.txt $appsDir/BeShare
+	addAppDeskbarSymlink $appsDir/BeShare/BeShare
 }
-
-#LICENSE=""
-#COPYRIGHT=""

haiku-apps/beshare/licenses/libsanta

@@ -0,0 +1,12 @@
+License
+
+The source code, object code, libraries, and the other components of Santa's Gift Bag are being made publicly available and free to use in freeware and shareware products with a price under $25 (I believe that shareware should be cheap). For overpriced shareware (hehehe) or commercial products, please contact me to negotiate a fee for use. After all, I did work hard on these classes and invested a lot of time into it. That being said, DON'T WORRY I don't want much. It totally depends on the sort of project you're working on and how much you expect to make off it. If someone makes money using my work, I'd like to get at least a little something for my contribution to that profit.
+
+If any of the components of Santa's Gift Bag are is used in a shareware or commercial product, I get a free copy.  The source is made available so that you can improve and extend it as you need. In general it is best to customize these classes through inheritance, leaving the original Santa's Gift Bag source code unmodified, so that you can take advantage of enhancements and bug fixes as they become available. 
+
+Feel free to distribute any components of this archive, but you are required to keep the documentation and license with it.  If you wish to distribute modified source, also feel free to do so, but do so in such a manner that it is very clear what was modified, why, how, that it is not an official Santa's Gift Bag release, and you are also required to keep the documentation and license with any modified versions.
+
+I can be contacted at:
+briant@timelinevista.com
+
+Thank you for using Santa's Gift Bag, and enjoy!

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

@@ -0,0 +1,26 @@
+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
+