Require the new graphviz and include the various graphics directly.

Bump revision.

2 files changed, 42 insertions, 20 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index a4d81437659..c9b91e03f33 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2007/01/08 12:20:24 adam Exp $
+# $NetBSD: Makefile,v 1.56 2007/01/20 14:26:58 joerg Exp $
 
 DISTNAME=	doxygen-1.5.1.src
 PKGNAME=	doxygen-1.5.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
@@ -53,6 +54,8 @@ post-patch:
 post-install:
 	cd ${WRKSRC} && gmake install_docs
 
+BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=2.12nb1
+
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index f02f0b6516f..458446c1de1 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/08 12:20:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/20 14:26:58 joerg Exp $
 bin/doxygen
 bin/doxytag
 man/man1/doxygen.1
@@ -90,57 +90,74 @@ share/doc/doxygen/examples/diagrams.cfg
 share/doc/doxygen/examples/diagrams/html/annotated.html
 share/doc/doxygen/examples/diagrams/html/class_a-members.html
 share/doc/doxygen/examples/diagrams/html/class_a.html
-share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.md5
-share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.png
+share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.md5
+share/doc/doxygen/examples/diagrams/html/class_a__inherit__graph.png
 share/doc/doxygen/examples/diagrams/html/class_b-members.html
 share/doc/doxygen/examples/diagrams/html/class_b.html
-share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.md5
-share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.png
+share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.md5
+share/doc/doxygen/examples/diagrams/html/class_b__inherit__graph.png
 share/doc/doxygen/examples/diagrams/html/class_c-members.html
 share/doc/doxygen/examples/diagrams/html/class_c.html
-share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.md5
-share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.png
+share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.md5
+share/doc/doxygen/examples/diagrams/html/class_c__inherit__graph.png
 share/doc/doxygen/examples/diagrams/html/class_d-members.html
 share/doc/doxygen/examples/diagrams/html/class_d.html
-share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.md5
-share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.png
+share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.md5
+share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.png
 share/doc/doxygen/examples/diagrams/html/class_e.html
-share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.md5
-share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.dot
+share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.png
+share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.md5
+share/doc/doxygen/examples/diagrams/html/class_e__inherit__graph.png
 share/doc/doxygen/examples/diagrams/html/diagrams__a_8h-source.html
 share/doc/doxygen/examples/diagrams/html/diagrams__a_8h.html
-share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.md5
+share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.png
 share/doc/doxygen/examples/diagrams/html/diagrams__b_8h-source.html
 share/doc/doxygen/examples/diagrams/html/diagrams__b_8h.html
-share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.md5
+share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.png
 share/doc/doxygen/examples/diagrams/html/diagrams__c_8h-source.html
 share/doc/doxygen/examples/diagrams/html/diagrams__c_8h.html
-share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.md5
-share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.png
+share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.md5
+share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__incl.png
 share/doc/doxygen/examples/diagrams/html/diagrams__d_8h-source.html
 share/doc/doxygen/examples/diagrams/html/diagrams__d_8h.html
-share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.md5
-share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.png
+share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.md5
+share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__incl.png
 share/doc/doxygen/examples/diagrams/html/diagrams__e_8h-source.html
 share/doc/doxygen/examples/diagrams/html/diagrams__e_8h.html
-share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.dot
+share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.map
 share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.md5
+share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.png
 share/doc/doxygen/examples/diagrams/html/doxygen.css
 share/doc/doxygen/examples/diagrams/html/doxygen.png
 share/doc/doxygen/examples/diagrams/html/files.html
@@ -148,10 +165,12 @@ share/doc/doxygen/examples/diagrams/html/functions.html
 share/doc/doxygen/examples/diagrams/html/functions_vars.html
 share/doc/doxygen/examples/diagrams/html/graph_legend.dot
 share/doc/doxygen/examples/diagrams/html/graph_legend.html
+share/doc/doxygen/examples/diagrams/html/graph_legend.png
 share/doc/doxygen/examples/diagrams/html/hierarchy.html
 share/doc/doxygen/examples/diagrams/html/index.html
-share/doc/doxygen/examples/diagrams/html/inherit__graph__0.dot
+share/doc/doxygen/examples/diagrams/html/inherit__graph__0.map
 share/doc/doxygen/examples/diagrams/html/inherit__graph__0.md5
+share/doc/doxygen/examples/diagrams/html/inherit__graph__0.png
 share/doc/doxygen/examples/diagrams/html/inherits.html
 share/doc/doxygen/examples/diagrams/html/tab_b.gif
 share/doc/doxygen/examples/diagrams/html/tab_l.gif