From fdcfc804586101cf2e23768f24dcd15e32004753 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 25 Dec 2013 12:48:36 -0800
Subject: [PATCH] Updated taglib recipe, but will still need a bit more work
 for secondaryArchSuffix

---
 media-libs/taglib/taglib-1.7.2.recipe | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index 878fcf5e8..28059eae7 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -1,5 +1,5 @@
 SUMMARY="TabLib Audio Meta-Data Library" 
-DESCRIPTION="TagLib Audio Meta-Data Library" 
+DESCRIPTION="TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files." 
 HOMEPAGE="http://github.com/taglib" 
 SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" 
 CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720"
@@ -13,43 +13,44 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	taglib$secondaryArchSuffix = $portVersion
-	cmd:taglib_config
 	lib:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7
 	lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 	
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libz
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libz
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
-	cmd:cmake$secondaryArchSuffix
+	cmd:cmake
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
+#SOURCE_DIR="$portVersionedName"
 
 BUILD() 
 {
 	cmake . -DCMAKE_INSTALL_PREFIX:PATH=$prefix \
 			-DBIN_INSTALL_DIR=$binDir \
-			-DLIB_INSTALL_DIR=$developLibDir
-	make
+			-DLIB_INSTALL_DIR=$developLibDir \
+			-DLIB_SUFFIX="/${secondaryArchSuffx/_/}"
+	make $jobArgs
 }
-#-DINCLUDE_INSTALL_DIR=$developDir/headers \
+
 INSTALL()
 {
 	make install
 	
 	mkdir -p $developDir/headers
 	mv $prefix/include/taglib $developDir/headers
+	rm -rf $prefix/include
 	
 	prepareInstalledDevelLibs \
 			libtag \
@@ -67,6 +68,7 @@ PROVIDES_devel="
 	taglib${secondaryArchSuffix}_devel = $portVersion compat >= 1.7
 	devel:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7
 	devel:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0
+	cmd:taglib_config$secondaryArchSuffix
 	"
 
 REQUIRES_devel="