From 3a0f3a3d742807ad43845310cf01d3dae976447d Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 26 Apr 2014 05:51:59 +0200
Subject: [PATCH] Fix tiff-4.0.2 recipe

---
 media-libs/tiff/tiff-4.0.2.recipe | 83 +++++++++++++++++--------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe
index 0c8433cf5..699820927 100644
--- a/media-libs/tiff/tiff-4.0.2.recipe
+++ b/media-libs/tiff/tiff-4.0.2.recipe
@@ -4,7 +4,7 @@ TIFF the Tag Image File Format, is a widely used format for storing image \
 data. Included in this software is a library, libtiff, for reading and writing \
 TIFF.
 "
-HOMEPAGE="http://www.libtiff.org" 
+HOMEPAGE="http://www.libtiff.org"
 SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz"
 CHECKSUM_SHA256="aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da"
 REVISION="1"
@@ -12,21 +12,28 @@ LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."
 
-REVISION="1"
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	tiff$secondaryArchSuffix = $portVersion compat >= 4
-	lib:libtiff$secondaryArchSuffix = $portVersion compat >= 4
+	tiff$secondaryArchSuffix = $portVersion
+	lib:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
+	lib:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libGL
-	lib:libjpeg
-	lib:libz
+	lib:libGL$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	devel:libGL$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -46,7 +53,7 @@ BUILD()
 	automake --add-missing
 	autoconf
 	autoheader
-	runConfigure ./configure
+	runConfigure ./configure --with-docdir=$documentationDir/$portName
 #		--enable-shared
 	make $jobArgs
 }
@@ -55,7 +62,8 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libtiff
+	prepareInstalledDevelLibs libtiff libtiffxx
+	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
@@ -78,8 +86,9 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4
-	devel:libtiff$secondaryArchSuffix = $portVersion compat >= 4
+	tiff${secondaryArchSuffix}_devel = $portVersion
+	devel:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
+	devel:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
 REQUIRES_devel="
 	tiff$secondaryArchSuffix == $portVersion base
@@ -90,30 +99,30 @@ REQUIRES_devel="
 if [ -z "$secondaryArchSuffix" ]; then
 	SUMMARY_tools="The TIFF tools"
 	PROVIDES_tools="
-		tiff_tools = $portVersion compat >= 4
-		cmd:bmp2tiff = $portVersion compat >= 4
-		cmd:fax2ps = $portVersion compat >= 4
-		cmd:fax2tiff = $portVersion compat >= 4
-		cmd:gif2tiff = $portVersion compat >= 4
-		cmd:pal2rgb = $portVersion compat >= 4
-		cmd:ppm2tiff = $portVersion compat >= 4
-		cmd:ras2tiff = $portVersion compat >= 4
-		cmd:raw2tiff = $portVersion compat >= 4
-		cmd:rgb2ycbcr = $portVersion compat >= 4
-		cmd:thumbnail = $portVersion compat >= 4
-		cmd:tiff2bw = $portVersion compat >= 4
-		cmd:tiff2pdf = $portVersion compat >= 4
-		cmd:tiff2ps = $portVersion compat >= 4
-		cmd:tiff2rgba = $portVersion compat >= 4
-		cmd:tiffcmp = $portVersion compat >= 4
-		cmd:tiffcp = $portVersion compat >= 4
-		cmd:tiffcrop = $portVersion compat >= 4
-		cmd:tiffdither = $portVersion compat >= 4
-		cmd:tiffdump = $portVersion compat >= 4
-		cmd:tiffinfo = $portVersion compat >= 4
-		cmd:tiffmedian = $portVersion compat >= 4
-		cmd:tiffset = $portVersion compat >= 4
-		cmd:tiffsplit = $portVersion compat >= 4     
+		tiff_tools = $portVersion
+		cmd:bmp2tiff
+		cmd:fax2ps
+		cmd:fax2tiff
+		cmd:gif2tiff
+		cmd:pal2rgb
+		cmd:ppm2tiff
+		cmd:ras2tiff
+		cmd:raw2tiff
+		cmd:rgb2ycbcr
+		cmd:thumbnail
+		cmd:tiff2bw
+		cmd:tiff2pdf
+		cmd:tiff2ps
+		cmd:tiff2rgba
+		cmd:tiffcmp
+		cmd:tiffcp
+		cmd:tiffcrop
+		cmd:tiffdither
+		cmd:tiffdump
+		cmd:tiffinfo
+		cmd:tiffmedian
+		cmd:tiffset
+		cmd:tiffsplit
 		"
 	REQUIRES_tools="
 		haiku >= $haikuVersion