graphviz: fixes from munchausen.

media-gfx/graphviz/graphviz-2.26.3.recipe

@@ -17,50 +17,126 @@ LICENSE="CPL v1.0"
 COPYRIGHT="1994-2010 AT&T Corp."
 SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz"
 CHECKSUM_SHA256="f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1"
-REVISION="2"
-ARCHITECTURES="!x86_gcc2"
+REVISION="3"
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="graphviz-2.26.3.patch"
 
 PROVIDES="
-	graphviz = $portVersion compat >= 2
+	graphviz$secondaryArchSuffix = $portVersion compat >= 2
+	cmd:acyclic$secondaryArchSuffix
+	cmd:bcomps$secondaryArchSuffix
+	cmd:ccomps$secondaryArchSuffix
+	cmd:circo$secondaryArchSuffix
+	cmd:diffimg$secondaryArchSuffix
+	cmd:dijkstra$secondaryArchSuffix
+	cmd:dot$secondaryArchSuffix
+	cmd:dot2gxl$secondaryArchSuffix
+	cmd:dotty$secondaryArchSuffix
+	cmd:fdp$secondaryArchSuffix
+	cmd:gc$secondaryArchSuffix
+	cmd:gml2gv$secondaryArchSuffix
+	cmd:gv2gxl$secondaryArchSuffix
+	cmd:gvcolor$secondaryArchSuffix
+	cmd:gvgen$secondaryArchSuffix
+	cmd:gvpack$secondaryArchSuffix
+	cmd:gvpr$secondaryArchSuffix
+	cmd:gxl2dot$secondaryArchSuffix
+	cmd:gxl2gv$secondaryArchSuffix
+	cmd:lneato$secondaryArchSuffix
+	cmd:mm2gv$secondaryArchSuffix
+	cmd:neato$secondaryArchSuffix
+	cmd:nop$secondaryArchSuffix
+	cmd:osage$secondaryArchSuffix
+	cmd:prune$secondaryArchSuffix
+	cmd:sccmap$secondaryArchSuffix
+	cmd:sfdp$secondaryArchSuffix
+	cmd:tred$secondaryArchSuffix
+	cmd:twopi$secondaryArchSuffix
+	cmd:unflatten$secondaryArchSuffix
+	lib:libcdt$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libcdt$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libcdt$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libcgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libcgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libcgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgraph$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvc$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvc$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvc$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvpr$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvpr$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libgvpr$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libpathplan$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libpathplan$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libpathplan$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libxdot$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libxdot$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libxdot$secondaryArchSuffix = $portVersion compat >= 2
 	"
 
-# TODO: There are several of optional features (e.g. png and jpeg), some of
-# which should be enabled.
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libfreetype
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libexpat$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libfontconfig$secondaryArchSuffix
 	"
+
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:freetype_config$secondaryArchSuffix
 	"
 
-
 BUILD()
 {
 	libtoolize -fci
 	autoconf
-	# The CPPFLAGS, LDFLAGS paths hack is currently required to get the freetype
-	# headers and library to be found. freetype is part of the system package
-	# and not in the proper paths.
 	runConfigure ./configure \
-		CPPFLAGS="-I/boot/system/develop/headers/3rdparty/freetype2" \
-		LDFLAGS="-L/boot/system/lib" \
 		--enable-shared \
 		--disable-perl 
+
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	packageEntries devel \
+		$developDir
 }
+
+PROVIDES_devel="
+	graphviz${secondaryArchSuffix}_devel = $portVersion
+	devel:libcdt$secondaryArchSuffix = $portVersion
+	devel:libcgraph$secondaryArchSuffix = $portVersion
+	devel:libgraph$secondaryArchSuffix = $portVersion
+	devel:libgvc$secondaryArchSuffix = $portVersion
+	devel:libgvpr$secondaryArchSuffix = $portVersion
+	devel:libpathplan$secondaryArchSuffix = $portVersion
+	devel:libxdot$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	graphviz$secondaryArchSuffix == $portVersion base
+	"