diff --git a/media-gfx/graphviz/graphviz-2.40.1.recipe b/media-gfx/graphviz/graphviz-2.40.1.recipe
index 9fe6e2e8d..5d0c441ef 100644
--- a/media-gfx/graphviz/graphviz-2.40.1.recipe
+++ b/media-gfx/graphviz/graphviz-2.40.1.recipe
@@ -14,7 +14,7 @@ shapes."
 HOMEPAGE="https://www.graphviz.org/"
 COPYRIGHT="1994-2017 AT&T Corp."
 LICENSE="EPL v1.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz"
 CHECKSUM_SHA256="ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421"
 SOURCE_FILENAME="graphviz-$portVersion.tar.gz"
@@ -45,42 +45,42 @@ for i in $graphvizLibs; do
 done
 PROVIDES="
 	graphviz$secondaryArchSuffix = $portVersionCompat
-	cmd:acyclic$secondaryArchSuffix
-	cmd:bcomps$secondaryArchSuffix
-	cmd:ccomps$secondaryArchSuffix
-	cmd:circo$secondaryArchSuffix
-	cmd:cluster$secondaryArchSuffix
-	cmd:diffimg$secondaryArchSuffix
-	cmd:dijkstra$secondaryArchSuffix
-	cmd:dot$secondaryArchSuffix
-	cmd:dot2gxl$secondaryArchSuffix
-	cmd:dot_builtins$secondaryArchSuffix
-	cmd:edgepaint$secondaryArchSuffix
-	cmd:fdp$secondaryArchSuffix
-	cmd:gc$secondaryArchSuffix
-	cmd:gml2gv$secondaryArchSuffix
-	cmd:graphml2gv$secondaryArchSuffix
-	cmd:gv2gml$secondaryArchSuffix
-	cmd:gv2gxl$secondaryArchSuffix
-	cmd:gvcolor$secondaryArchSuffix
-	cmd:gvgen$secondaryArchSuffix
-	cmd:gvmap$secondaryArchSuffix
-	cmd:gvmap.sh$secondaryArchSuffix
-	cmd:gvpack$secondaryArchSuffix
-	cmd:gvpr$secondaryArchSuffix
-	cmd:gxl2dot$secondaryArchSuffix
-	cmd:gxl2gv$secondaryArchSuffix
-	cmd:mm2gv$secondaryArchSuffix
-	cmd:neato$secondaryArchSuffix
-	cmd:nop$secondaryArchSuffix
-	cmd:osage$secondaryArchSuffix
-	cmd:patchwork$secondaryArchSuffix
-	cmd:prune$secondaryArchSuffix
-	cmd:sccmap$secondaryArchSuffix
-	cmd:sfdp$secondaryArchSuffix
-	cmd:tred$secondaryArchSuffix
-	cmd:twopi$secondaryArchSuffix
-	cmd:unflatten$secondaryArchSuffix
+	cmd:acyclic
+	cmd:bcomps
+	cmd:ccomps
+	cmd:circo
+	cmd:cluster
+	cmd:diffimg
+	cmd:dijkstra
+	cmd:dot
+	cmd:dot2gxl
+	cmd:dot_builtins
+	cmd:edgepaint
+	cmd:fdp
+	cmd:gc
+	cmd:gml2gv
+	cmd:graphml2gv
+	cmd:gv2gml
+	cmd:gv2gxl
+	cmd:gvcolor
+	cmd:gvgen
+	cmd:gvmap
+	cmd:gvmap.sh
+	cmd:gvpack
+	cmd:gvpr
+	cmd:gxl2dot
+	cmd:gxl2gv
+	cmd:mm2gv
+	cmd:neato
+	cmd:nop
+	cmd:osage
+	cmd:patchwork
+	cmd:prune
+	cmd:sccmap
+	cmd:sfdp
+	cmd:tred
+	cmd:twopi
+	cmd:unflatten
 	lib:libcdt$secondaryArchSuffix = $libcdtVersionCompat
 	lib:libcgraph$secondaryArchSuffix = $libcgraphVersionCompat
 	lib:libgvc$secondaryArchSuffix = $libgvcVersionCompat
@@ -142,40 +142,40 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage graphviz$secondaryArchSuffix \
-	$binDir/acyclic \
-	$binDir/bcomps \
-	$binDir/ccomps \
-	$binDir/circo \
-	$binDir/cluster \
-	$binDir/dijkstra \
-	$binDir/dot_builtins \
-	$binDir/dot \
-	$binDir/dot2gxl \
-	$binDir/edgepaint \
-	$binDir/fdp \
-	$binDir/gc \
-	$binDir/gml2gv \
-	$binDir/graphml2gv \
-	$binDir/gv2gml \
-	$binDir/gv2gxl \
-	$binDir/gvcolor \
-	$binDir/gvgen \
-	$binDir/gvpack \
-	$binDir/gvpr \
-	$binDir/gvmap \
-	$binDir/gxl2dot \
-	$binDir/gxl2gv \
-	$binDir/mm2gv \
-	$binDir/neato \
-	$binDir/nop \
-	$binDir/osage \
-	$binDir/patchwork \
-	$binDir/prune \
-	$binDir/sccmap \
-	$binDir/sfdp \
-	$binDir/tred \
-	$binDir/twopi \
-	$binDir/unflatten \
+	$prefix/bin/acyclic \
+	$prefix/bin/bcomps \
+	$prefix/bin/ccomps \
+	$prefix/bin/circo \
+	$prefix/bin/cluster \
+	$prefix/bin/dijkstra \
+	$prefix/bin/dot_builtins \
+	$prefix/bin/dot \
+	$prefix/bin/dot2gxl \
+	$prefix/bin/edgepaint \
+	$prefix/bin/fdp \
+	$prefix/bin/gc \
+	$prefix/bin/gml2gv \
+	$prefix/bin/graphml2gv \
+	$prefix/bin/gv2gml \
+	$prefix/bin/gv2gxl \
+	$prefix/bin/gvcolor \
+	$prefix/bin/gvgen \
+	$prefix/bin/gvpack \
+	$prefix/bin/gvpr \
+	$prefix/bin/gvmap \
+	$prefix/bin/gxl2dot \
+	$prefix/bin/gxl2gv \
+	$prefix/bin/mm2gv \
+	$prefix/bin/neato \
+	$prefix/bin/nop \
+	$prefix/bin/osage \
+	$prefix/bin/patchwork \
+	$prefix/bin/prune \
+	$prefix/bin/sccmap \
+	$prefix/bin/sfdp \
+	$prefix/bin/tred \
+	$prefix/bin/twopi \
+	$prefix/bin/unflatten \
 	$libDir/libcdt.so.$libcdtVersion \
 	$libDir/libcgraph.so.$libcgraphVersion \
 	$libDir/libgvc.so.$libgvcVersion \
@@ -187,8 +187,8 @@ defineDebugInfoPackage graphviz$secondaryArchSuffix \
 BUILD()
 {
 	./autogen.sh
-	runConfigure --omit-dirs dataDir ./configure CPPFLAGS=-D_BSD_SOURCE \
-		--datadir=$developDocDir \
+	runConfigure --omit-dirs "dataDir binDir" ./configure CPPFLAGS=-D_BSD_SOURCE \
+		--datadir=$developDocDir --bindir=$prefix/bin \
 		--enable-shared \
 		--disable-perl