From e69ef60fcae4f46f5a5d02482356d91854a61b29 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 9 Jul 2014 15:47:30 +0200
Subject: [PATCH] Fix fluidsynth recipe.

---
 .../fluidsynth/fluidsynth-1.1.6.recipe        | 15 ++++++--
 .../fluidsynth/patches/fluidsynth-1.1.6.patch | 35 -------------------
 2 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch

diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index 0cdc1a3c3..b568cb056 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -16,28 +16,37 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 PROVIDES="
 	fluidsynth$secondaryArchSuffix = $portVersion
 	lib:libfluidsynth$secondaryArchSuffix
+	cmd:fluidsynth
 	"
 
 REQUIRES="
 	haiku$secondayArchSuffix >= $haikuVersion
 	lib:libsndfile$secondaryArchSuffix
 	lib:libreadline
-#	lib:glib
+	lib:libglib_2.0
+	lib:libgthread_2.0
+	lib:libintl
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libglib_2.0
+	devel:libreadline
 	"
 
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCHES="fluidsynth-$portVersion.patchset"
 BUILD()
 {
-	cmake .
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DINCLUDE_INSTALL_DIR=$relativeIncludeDir \
+		-DMAN_INSTALL_DIR=$relativeManDir
 	make $jobArgs
 }
 
diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch
deleted file mode 100644
index d37506392..000000000
--- a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN fluidsynth-1.1.6/CMakeLists.txt fluidsynth-1.1.6-haiku/CMakeLists.txt
---- fluidsynth-1.1.6/CMakeLists.txt
-+++ fluidsynth-1.1.6/haiku/CMakeLists.txt
-@@ -168,9 +168,16 @@
-   endif  ( MINGW )
- else ( WIN32 )
- # Check PThreads, but not in Windows
--  find_package ( Pthreads REQUIRED )
--  set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
--  set ( LIBFLUID_LIBS "m" )
-+if (UNIX AND NOT HAIKU)
-+# Check PThreads, but not in Windows 
-+   find_package ( Pthreads REQUIRED )
-+   set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
-+   set ( LIBFLUID_LIBS "m" )
-+endif (UNIX AND NOT HAIKU)
-+
-+if (HAIKU)
-+set ( LIBFLUID_LIBS "network")
-+endif (HAIKU)
- endif ( WIN32 )
- 
- # IBM OS/2
-diff -Naur fluidsynth-1.1.6/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h
---- fluidsynth-1.1.6/src/utils/fluid_sys.h
-+++ fluidsynth-1.1.6-haiku/src/utils/fluid_sys.h
-@@ -335,7 +335,7 @@
-     sample data.
-  */
- 
--#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
-+#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
- #define fluid_mlock(_p,_n)      mlock(_p, _n)
- #define fluid_munlock(_p,_n)    munlock(_p,_n)
- #else