From ab6510da22939564c7a890a977cd0a7efbfe75c4 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 2 Mar 2015 17:45:18 +0300
Subject: [PATCH] Samba: update to 3.6.25

---
 ...amba-3.6.24.recipe => samba-3.6.25.recipe} | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
 rename net-fs/samba/{samba-3.6.24.recipe => samba-3.6.25.recipe} (91%)

diff --git a/net-fs/samba/samba-3.6.24.recipe b/net-fs/samba/samba-3.6.25.recipe
similarity index 91%
rename from net-fs/samba/samba-3.6.24.recipe
rename to net-fs/samba/samba-3.6.25.recipe
index 1113473cb..12e96b103 100644
--- a/net-fs/samba/samba-3.6.24.recipe
+++ b/net-fs/samba/samba-3.6.25.recipe
@@ -10,12 +10,12 @@ is installed on the host server. When correctly configured, it allows that \
 host to interact with a Microsoft Windows client or server as if it is a \
 Windows file and print server."
 HOMEPAGE="http://www.samba.org/"
-COPYRIGHT="1992-2014 Anrew Tridgell and the Samba Team"
+COPYRIGHT="1992-2015 Anrew Tridgell and the Samba Team"
 LICENSE="GNU GPL v3"
 
-SRC_URI="http://ftp.samba.org/pub/samba/samba-3.6.24.tar.gz"
+SRC_URI="http://ftp.samba.org/pub/samba/samba-$portVersion.tar.gz"
 
-CHECKSUM_SHA256="11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7"
+CHECKSUM_SHA256="8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751"
 
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -86,14 +86,14 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
+	cmd:find	
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix	
 	cmd:libtoolize
+	cmd:make	
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
 	cmd:which
 	"
 
@@ -101,12 +101,11 @@ BUILD()
 {
 	cd source3
 	sed -i 's/| \*qnx\*/| \*qnx\* | haiku\*/g' configure
-	LDFLAGS=-lnetwork runConfigure ./configure --disable-swat \
+	LDFLAGS="-lnetwork -lbnetapi" runConfigure ./configure --disable-swat \
 							--with-configdir=$settingsDir/samba \
 							--with-privatedir=$settingsDir/samba \
 							--with-localedir=$dataRootDir/locale \
 							--with-logfilebase=sharedStateDir/log
-	sed -i 's/\modules\/CP850.o modules\/CP437.o//g' Makefile
 	sed -i 's/-lpthread//g' Makefile
 	sed -i 's/-lc//g' Makefile
 	make $jobArgs
@@ -120,7 +119,7 @@ INSTALL()
 
 	# move headers to the correct location
 	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir/
+	mv $prefix/include $includeDir
 
 	# copy sample config file
 	cp ../testdata/samba3/smb.conf $settingsDir/samba