diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe
deleted file mode 100644
index 82d668dda..000000000
--- a/media-gfx/graphviz/graphviz-2.26.3.recipe
+++ /dev/null
@@ -1,140 +0,0 @@
-SUMMARY="Open source graph visualization software"
-DESCRIPTION="Graphviz is open source graph visualization software. Graph \
-visualization is a way of representing structural information as diagrams of \
-abstract graphs and networks. It has important applications in networking, \
-bioinformatics,  software engineering, database and web design, machine \
-learning, and in visual interfaces for other technical domains.
-The Graphviz layout programs take descriptions of graphs in a simple text \
-language, and make diagrams in useful formats, such as images and SVG for web \
-pages, PDF or Postscript for inclusion in other documents; or display in an \
-interactive graph browser. (Graphviz also supports GXL, an XML dialect.)
-Graphviz has many useful features for concrete diagrams, such as options for \
-colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \
-shapes."
-HOMEPAGE="http://www.graphviz.org/"
-COPYRIGHT="1994-2010 AT&T Corp."
-LICENSE="CPL v1.0"
-REVISION="4"
-SOURCE_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz"
-CHECKSUM_SHA256="f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1"
-PATCHES="graphviz-2.26.3.patch"
-
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	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
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libexpat$secondaryArchSuffix
-	lib:libfontconfig$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	"
-
-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
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libexpat$secondaryArchSuffix
-	devel:libfontconfig$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:autoconf
-	cmd:automake
-	cmd:freetype_config$secondaryArchSuffix
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize -fci
-	autoconf
-	runConfigure ./configure \
-		CPPFLAGS=`pkg-config --cflags freetype2` \
-		LDFLAGS=`pkg-config --libs freetype2` \
-		--enable-shared \
-		--disable-perl
-
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	packageEntries devel \
-		$developDir
-}
diff --git a/media-gfx/graphviz/graphviz-2.44.0.recipe b/media-gfx/graphviz/graphviz-2.49.1.recipe
similarity index 71%
rename from media-gfx/graphviz/graphviz-2.44.0.recipe
rename to media-gfx/graphviz/graphviz-2.49.1.recipe
index 2335e13b9..b61664c6d 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.recipe
+++ b/media-gfx/graphviz/graphviz-2.49.1.recipe
@@ -12,12 +12,11 @@ Graphviz has many useful features for concrete diagrams, such as options for \
 colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \
 shapes."
 HOMEPAGE="https://www.graphviz.org/"
-COPYRIGHT="1994-2020 AT&T Corp."
+COPYRIGHT="1994-2021 AT&T Corp."
 LICENSE="EPL v1.0"
-REVISION="3"
-SOURCE_URI="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$portVersion.tar.gz"
-CHECKSUM_SHA256="9aabd13a8018b708ab3c822de2326c19d0a52ed59f50a6b0f9318c07e2a6d93b"
-SOURCE_FILENAME="graphviz-$portVersion.tar.gz"
+REVISION="1"
+SOURCE_URI="https://gitlab.com/graphviz/graphviz/-/archive/$portVersion/graphviz-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c84e17cee66500aae992ffad05a218f6a9619c59d15198f2a9f26d39cebf2bfc"
 PATCHES="graphviz-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -43,6 +42,7 @@ portVersionCompat="$portVersion compat >= 2"
 for i in $graphvizLibs; do
 	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
 done
+
 PROVIDES="
 	graphviz$secondaryArchSuffix = $portVersionCompat
 	cmd:acyclic
@@ -99,6 +99,7 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libltdl$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
+	lib:libpython3.7m$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -125,6 +126,8 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libltdl$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
+	devel:libpython3.7m$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -139,6 +142,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:python3.7
 	"
 
 defineDebugInfoPackage graphviz$secondaryArchSuffix \
@@ -186,11 +190,14 @@ defineDebugInfoPackage graphviz$secondaryArchSuffix \
 
 BUILD()
 {
-	./autogen.sh
-	runConfigure --omit-dirs "dataDir binDir" ./configure CPPFLAGS=-D_BSD_SOURCE \
-		--datadir=$developDocDir --bindir=$prefix/bin \
+	./autogen.sh NOCONFIG
+	runConfigure --omit-dirs "dataDir binDir" \
+		./configure CPPFLAGS=-D_BSD_SOURCE \
+		--datadir=$developDocDir \
+		--bindir=$prefix/bin \
 		--enable-shared \
-		--disable-perl
+		--enable-python=yes \
+		--enable-perl=no
 
 	make $jobArgs
 }
@@ -206,6 +213,39 @@ INSTALL()
 	prepareInstalledDevelLibs $graphvizLibs
 	fixPkgconfig
 
+	# fix pkg-config paths
+	if [ -n "$secondaryArchSuffix" ]; then
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libcdt.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libcgraph.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libgvc.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libgvpr.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/liblab_gamut.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libpathplan.pc
+		sed -i 's,\/headers/x86,\/headers/x86/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libxdot.pc
+	else
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libcdt.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libcgraph.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libgvc.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libgvpr.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/liblab_gamut.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libpathplan.pc
+		sed -i 's,\/headers,\/headers/graphviz,g' \
+			$prefix/$relativeDevelopLibDir/pkgconfig/libxdot.pc
+	fi
+
 	packageEntries devel \
 		$developDir \
 		$manDir/man3
diff --git a/media-gfx/graphviz/licenses/CPL v1.0 b/media-gfx/graphviz/licenses/CPL v1.0
deleted file mode 100644
index c9990a7ea..000000000
--- a/media-gfx/graphviz/licenses/CPL v1.0	
+++ /dev/null
@@ -1,213 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-    b) in the case of each subsequent Contributor:
-
-    i) changes to the Program, and
-
-    ii) additions to the Program;
-
-    where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-    i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-    ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-    iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
-    iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
diff --git a/media-gfx/graphviz/patches/graphviz-2.26.3.patch b/media-gfx/graphviz/patches/graphviz-2.26.3.patch
deleted file mode 100644
index 3fcfede3b..000000000
--- a/media-gfx/graphviz/patches/graphviz-2.26.3.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in
---- graphviz-2.26.3/config.h.in.orig	2010-01-26 09:01:14.030408704 -0700
-+++ graphviz-2.26.3/config.h.in	2010-03-18 18:06:58.060555264 -0600
-@@ -427,6 +427,9 @@
- /* Define to 1 if you have struct dioattr */
- #undef HAVE_STRUCT_DIOATTR
-
-+/* Define to 1 if you have the <sysexits.h> header file. */
-+#undef HAVE_SYSEXITS_H
-+
- /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-    */
- #undef HAVE_SYS_DIR_H
-@@ -578,6 +581,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
-
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
-
-diff -up graphviz-2.26.3/configure.ac.orig graphviz-2.26.3/configure.ac
---- graphviz-2.26.3/configure.ac.orig	2010-01-26 09:00:29.029622272 -0700
-+++ graphviz-2.26.3/configure.ac	2010-03-18 18:03:33.265289728 -0600
-@@ -111,6 +111,7 @@ UWIN=no
- CYGWIN=no
- MINGW32=no
- DARWIN9=no
-+HAIKU=no
- case "${host_os}" in
-   *uwin* )
- 	UWIN=yes
-@@ -160,6 +161,16 @@ case "${host_os}" in
- 	BROWSER="open"
- 	AC_DEFINE_UNQUOTED(DARWIN_DYLIB,"$DARWIN_DYLIB",[Define for Darwin-style shared library names.])
- 	;;
-+  *haiku* )
-+	HAIKU=yes
-+	HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY`
-+	HAIKU_COMMON_FONTPATH=`finddir B_COMMON_FONTS_DIRECTORY`
-+	HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY`
-+	DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts:$HAIKU_COMMON_FONTPATH:$HAIKU_COMMON_FONTPATH/ttfonts:$HAIKU_COMMON_FONTPATH/psfonts:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts"
-+	PATHSEPARATOR=":"
-+        NO_POSTSCRIPT_ALIAS=1
-+	BROWSER="open"
-+	;;
-   * ) # This sucks!  Whatever happened to standards for file system layout?
- 	DEFAULT_FONTPATH="/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
- 	PATHSEPARATOR=":"
-@@ -370,7 +381,7 @@ AC_CHECK_HEADERS(stdarg.h stddef.h stdde
- 	errno.h time.h unistd.h fenv.h string.h strings.h inttypes.h setjmp.h \
- 	sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \
- 	sys/fpu.h sys/socket.h sys/stat.h sys/mman.h \
--	sys/ioctl.h sys/inotify.h langinfo.h libintl.h crt_externs.h)
-+	sys/ioctl.h sys/inotify.h langinfo.h libintl.h crt_externs.h sysexits.h)
- AC_HEADER_TIME
- AC_HEADER_DIRENT
- AC_HEADER_STDBOOL
-diff -up graphviz-2.26.3/contrib/diffimg/diffimg.c.orig graphviz-2.26.3/contrib/diffimg/diffimg.c
---- graphviz-2.26.3/contrib/diffimg/diffimg.c.orig	2009-06-02 19:10:49.038797312 -0600
-+++ graphviz-2.26.3/contrib/diffimg/diffimg.c	2010-03-18 18:03:33.270270464 -0600
-@@ -47,7 +47,14 @@
- #define bool int
- #define false 0
- #else
-+#if defined HAVE_SYSEXITS_H
- #include <sysexits.h>
-+#else
-+#define EX_USAGE 64
-+#define EX_DATAERR 65
-+#define EX_NOINPUT 66
-+#define EX_UNAVAILABLE 69
-+#endif
- #endif
- #include <gd.h>
- #if defined HAVE_STDBOOL_H && ! defined __cplusplus
-diff -up graphviz-2.26.3/lib/gd/gd_png.c.orig graphviz-2.26.3/lib/gd/gd_png.c
---- graphviz-2.26.3/lib/gd/gd_png.c.orig	2010-03-18 18:15:35.528482304 -0600
-+++ graphviz-2.26.3/lib/gd/gd_png.c	2010-03-18 18:16:36.045350912 -0600
-@@ -150,7 +150,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro
- 	return NULL;
-   }
-
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp(sig, 0, 8)) { /* bad signature */
-     	return NULL;		/* bad signature */
- 	}
-
-diff -up graphviz-2.26.3/lib/gvc/gvcext.h.orig graphviz-2.26.3/lib/gvc/gvcext.h
---- graphviz-2.26.3/lib/gvc/gvcext.h.orig       2009-07-08 17:14:20.054525952 +0200
-+++ graphviz-2.26.3/lib/gvc/gvcext.h    2011-04-13 19:38:04.150470656 +0200
-@@ -65,6 +65,9 @@ extern "C" {
-
-     typedef struct gvplugin_available_s gvplugin_available_t;
-
-+#undef lt_preloaded_symbols
-+#define lt_preloaded_symbols lt_GRAPHVIZ_LTX_preloaded_symbols
-+
- /*visual studio*/
- #ifdef WIN32_DLL
- #ifndef GVC_EXPORTS
-diff -up graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig graphviz-2.26.3/lib/vmalloc/vmhdr.h
---- graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig	2009-06-03 03:10:55.040894464 +0200
-+++ graphviz-2.26.3/lib/vmalloc/vmhdr.h	2011-04-04 18:51:05.289931264 +0200
-@@ -54,6 +54,10 @@ extern "C" {
- #include	<ast_common.h>
- #include	"FEATURE/vmalloc"
-
-+#ifdef __HAIKU__
-+	#undef _hdr_malloc
-+#endif
-+
- #endif /*_PACKAGE_ast*/
-
- #undef free
-diff -up graphviz-2.26.3/lib/common/const.h.orig graphviz-2.26.3/lib/common/const.h
---- graphviz-2.26.3/lib/common/const.h.orig	2009-08-28 21:46:42.059506688 +0200
-+++ graphviz-2.26.3/lib/common/const.h	2011-02-18 18:48:44.856162304 +0100
-@@ -67,7 +67,11 @@
- #define		DEFAULT_FONTSIZE	14.0
- #define		DEFAULT_LABEL_FONTSIZE	11.0	/* for head/taillabel */
- #define		MIN_FONTSIZE		1.0
--#define		DEFAULT_FONTNAME	"Times-Roman"
-+#ifdef __HAIKU__
-+	#define		DEFAULT_FONTNAME	"DejaVuSans"
-+#else
-+	#define		DEFAULT_FONTNAME	"Times-Roman"
-+#endif
- #define		DEFAULT_FILL		"lightgrey"
- #define         LINESPACING             1.20
-
diff --git a/media-gfx/graphviz/patches/graphviz-2.44.0.patchset b/media-gfx/graphviz/patches/graphviz-2.44.0.patchset
deleted file mode 100644
index 2576717aa..000000000
--- a/media-gfx/graphviz/patches/graphviz-2.44.0.patchset
+++ /dev/null
@@ -1,210 +0,0 @@
-From b500e9bc3d631202d5defcbe2967dfa4cdfc1861 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 25 Feb 2018 15:09:25 +0100
-Subject: set Haiku font directories
-
-
-diff --git a/configure.ac b/configure.ac
-index 5e098aa..36b95d5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -144,6 +144,7 @@ UWIN=no
- CYGWIN=no
- MINGW32=no
- DARWIN9=no
-+HAIKU=no
- case "${host_os}" in
-   *uwin* )
- 	UWIN=yes
-@@ -185,6 +186,16 @@ case "${host_os}" in
- 		;;
-         esac
- 	;;
-+	*haiku* )
-+	HAIKU=yes
-+	HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY`
-+	HAIKU_COMMON_FONTPATH=`finddir B_COMMON_FONTS_DIRECTORY`
-+	HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY`
-+	DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts:$HAIKU_COMMON_FONTPATH:$HAIKU_COMMON_FONTPATH/ttfonts:$HAIKU_COMMON_FONTPATH/psfonts:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts"
-+	PATHSEPARATOR=":"
-+        NO_POSTSCRIPT_ALIAS=1
-+	BROWSER="open"
-+	;;
-   * ) # This sucks!  Whatever happened to standards for file system layout?   (Good job its no longer used unless fontconfig is unavailable.)
- 	DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
- 	PATHSEPARATOR=":"
-@@ -449,7 +460,7 @@ AC_CHECK_HEADERS(malloc.h \
- 	unistd.h strings.h stat.h vfork.h \
- 	sys/time.h sys/types.h sys/select.h \
- 	sys/stat.h sys/mman.h sys/vfork.h \
--	sys/ioctl.h sys/inotify.h crt_externs.h)
-+	sys/ioctl.h sys/inotify.h crt_externs.h sysexits.h)
- 
- # Internationalization macros
- # AM_GNU_GETTEXT
--- 
-2.26.0
-
-
-From 3608318546bb22e1f11afba25afd1fd6353295d5 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 25 Feb 2018 15:14:43 +0100
-Subject: undef _hdr_malloc for Haiku
-
-
-diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
-index 441d9da..d898a09 100644
---- a/lib/vmalloc/vmhdr.h
-+++ b/lib/vmalloc/vmhdr.h
-@@ -38,6 +38,10 @@ extern "C" {
- #   include <sys/types.h>
- #endif // HAVE_SYS_TYPES_H
- 
-+#ifdef __HAIKU__
-+	#undef _hdr_malloc
-+#endif
-+
- #undef free
- #undef malloc
- #undef realloc
--- 
-2.26.0
-
-
-From 9edb7b9b0502a1991dd691dac4f5bf0f06e055c7 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 25 Feb 2018 15:17:14 +0100
-Subject: set default font for Haiku
-
-
-diff --git a/lib/common/const.h b/lib/common/const.h
-index 2c745c2..76f2902 100644
---- a/lib/common/const.h
-+++ b/lib/common/const.h
-@@ -66,6 +66,8 @@
- #define		MIN_FONTSIZE		1.0
- #if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
- #define		DEFAULT_FONTNAME	"TimesNewRomanPSMT"
-+#elif defined (__HAIKU__)
-+	#define		DEFAULT_FONTNAME	"NotoSans"
- #else
- #define		DEFAULT_FONTNAME	"Times-Roman"
- #endif
--- 
-2.26.0
-
-
-From b1b9f11f972f5b831aeae058c6725a83c1c601cb Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 13 Jun 2020 13:02:14 +1000
-Subject: Use system declaration for sbrk and getpagesize
-
-
-diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
-index d898a09..6a3435f 100644
---- a/lib/vmalloc/vmhdr.h
-+++ b/lib/vmalloc/vmhdr.h
-@@ -418,9 +418,9 @@ extern "C" {
- #define _Vmpfclose	(_Vmextern.vm_pfclose)
- 
-      extern Vmextern_t _Vmextern;
--
-+#ifndef __HAIKU__
-     extern size_t getpagesize(void);
--
-+#endif
- #ifndef _WIN32
-     extern void abort(void);
-     extern ssize_t write(int, const void *, size_t);
-@@ -448,7 +448,7 @@ extern "C" {
-     extern void _cleanup(void);
- 
- /* for vmdcsbrk.c */
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__HAIKU__)
-     extern Vmuchar_t *sbrk(ssize_t);
- #endif
- 
--- 
-2.26.0
-
-
-From 8d7aa19a303ec7422da96ca6cd4f4e68701fb934 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 13 Jun 2020 13:03:04 +1000
-Subject: Remove mstats
-
-
-diff --git a/configure.ac b/configure.ac
-index 36b95d5..8914236 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,7 +482,7 @@ LIBS=$save_LIBS
- 
- # Checks for library functions
- AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \
--	cbrt vsnprintf _NSGetEnviron mallopt mallinfo mstats getpagesize \
-+	cbrt vsnprintf _NSGetEnviron mallopt mallinfo getpagesize \
-   ftruncate lseek64 stat64 vfork unlink waitpid select])
- 
- AC_REPLACE_FUNCS([strcasecmp strncasecmp strcasestr])
--- 
-2.26.0
-
-
-From bc4ff6bec1b874f9af6e76add6734fe6422e436d Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 13 Jun 2020 20:34:04 +1000
-Subject: Use system declaration for waitpid
-
-
-diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
-index d3b3329..e5c790e 100644
---- a/lib/sfio/sfhdr.h
-+++ b/lib/sfio/sfhdr.h
-@@ -812,7 +812,9 @@ extern "C" {
- #endif /* _WIN32 */
- 
-     extern time_t time(time_t *);
-+#ifndef __HAIKU__
-     extern int waitpid(int, int *, int);
-+#endif
- #ifndef _WIN32
-     extern void _exit(int);
- #endif
--- 
-2.26.0
-
-
-From bc37134a4b3825379ba34b1dcfca0c0b532fe116 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 13 Jun 2020 21:37:39 +1000
-Subject: Use sustem declaration for getpid
-
-
-diff --git a/lib/vmalloc/vmhdr.h b/lib/vmalloc/vmhdr.h
-index 6a3435f..c210abc 100644
---- a/lib/vmalloc/vmhdr.h
-+++ b/lib/vmalloc/vmhdr.h
-@@ -33,6 +33,7 @@ extern "C" {
- 
- #include <inttypes.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_SYS_TYPES_H
- #   include <sys/types.h>
-@@ -438,8 +439,9 @@ extern "C" {
-     extern int creat(const char *, int);
-     extern int close(int);
- #endif
-+#ifndef __HAIKU__
-     extern int getpid(void);
--
-+#endif
- /* for vmexit.c */
- #ifndef _WIN32
-     extern int onexit(void(*)(void));
--- 
-2.26.0
-
diff --git a/media-gfx/graphviz/patches/graphviz-2.49.1.patchset b/media-gfx/graphviz/patches/graphviz-2.49.1.patchset
new file mode 100644
index 000000000..65d259485
--- /dev/null
+++ b/media-gfx/graphviz/patches/graphviz-2.49.1.patchset
@@ -0,0 +1,98 @@
+From c412ef082197a591bcbce15241e1d3998fbe199a Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 29 Sep 2021 17:57:33 +0000
+Subject: Set default font for Haiku
+
+
+diff --git a/lib/common/const.h b/lib/common/const.h
+index 91fb980..54df290 100644
+--- a/lib/common/const.h
++++ b/lib/common/const.h
+@@ -62,6 +62,8 @@
+ #define		MIN_FONTSIZE		1.0
+ #if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+ #define		DEFAULT_FONTNAME	"TimesNewRomanPSMT"
++elif defined (__HAIKU__)
++#define 	DEFAULT_FONTNAME	"NotoSans"
+ #else
+ #define		DEFAULT_FONTNAME	"Times-Roman"
+ #endif
+-- 
+2.30.2
+
+
+From 69005818b814d28e3dfa26b967559d1c9de3da43 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 29 Sep 2021 17:59:31 +0000
+Subject: Add check for libnetwork
+
+
+diff --git a/configure.ac b/configure.ac
+index fe3f2be..8135833 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1474,6 +1474,9 @@ AC_ARG_WITH(extralibdir,
+ dnl -----------------------------------
+ dnl ...borrow test for -lsocket -lnsl from tk8.3.3/unix/configure.in
+ 
++dnl Check for Haiku libnetwork
++AC_CHECK_LIB([network], [socket])
++
+ save_LIBS=$LIBS
+ LIBS=
+ tk_checkBoth=0
+-- 
+2.30.2
+
+
+From f32f872da01af05f843bcbddc39e92a5760b8df1 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 29 Sep 2021 18:02:07 +0000
+Subject: Set Haiku font directories
+
+
+diff --git a/configure.ac b/configure.ac
+index 8135833..81e810f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,6 +144,7 @@ UWIN=no
+ CYGWIN=no
+ MINGW32=no
+ DARWIN9=no
++HAIKU=no
+ case "${host_os}" in
+   *uwin* )
+ 	UWIN=yes
+@@ -185,6 +186,20 @@ case "${host_os}" in
+ 		;;
+         esac
+ 	;;
++	*haiku* )
++	HAIKU=yes
++	HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY`
++	HAIKU_SYSTEM_NONPACKAGED_FONTPATH=`finddir B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY`
++	HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY`
++	HAIKU_USER_NONPACKAGED_FONTPATH=`finddir B_USER_NONPACKAGED_FONTS_DIRECTORY`
++	DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts"
++	DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH/ttfonts:$HAIKU_SYSTEM_NONPACKAGED_FONTPATH/psfonts"
++	DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts"
++	DEFAULT_FONTPATH="$DEFAULT_FONTPATH:$HAIKU_USER_NONPACKAGED_FONTPATH:$HAIKU_USER_NONPACKAGED_FONTPATH/ttfonts:$HAIKU_USER_NONPACKAGED_FONTPATH/psfonts"
++	PATHSEPARATOR=":"
++        NO_POSTSCRIPT_ALIAS=1
++	BROWSER="open"
++	;;
+   * ) # This sucks!  Whatever happened to standards for file system layout?   (Good job its no longer used unless fontconfig is unavailable.)
+ 	DEFAULT_FONTPATH="/usr/share/fonts/sun/TrueType:/usr/share/fonts/TrueType:/usr/X11/lib/X11/fonts/TrueType:/usr/share/fonts/sun/Type1:/usr/openwin/lib/X11/fonts/Type1:/usr/share/fonts/X11/Type1:/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ 	PATHSEPARATOR=":"
+@@ -439,7 +454,7 @@ AC_CHECK_HEADERS( \
+ 	unistd.h strings.h stat.h \
+ 	sys/time.h sys/types.h sys/select.h sys/socket.h \
+ 	sys/stat.h sys/mman.h \
+-	sys/ioctl.h sys/inotify.h)
++	sys/ioctl.h sys/inotify.h sysexits.h)
+ 
+ # Internationalization macros
+ # AM_GNU_GETTEXT
+-- 
+2.30.2
+