Changes 1.5.1:

* Bug fixes and improvements

3 files changed, 44 insertions, 78 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 1281088c797..a4d81437659 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2006/10/29 07:51:28 dsainty Exp $
+# $NetBSD: Makefile,v 1.55 2007/01/08 12:20:24 adam Exp $
 
-DISTNAME=	doxygen-1.4.7.src
-PKGNAME=	doxygen-1.4.7
+DISTNAME=	doxygen-1.5.1.src
+PKGNAME=	doxygen-1.5.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--install ${INSTALL}
 CONFIGURE_ARGS+=	--dot ${PREFIX}/bin/dot
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 CONFIGURE_ARGS+=	--docdir ${PREFIX}/share/doc
-MAKE_ENV+=		PKGSRC_CFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+=		PKGSRC_CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=		MAN1DIR=${PKGMANDIR}/man1
 
 .if exists(./descr)
@@ -48,10 +48,10 @@ CONFIGURE_ARGS+=	-platform freebsd-g++
 .endif
 
 post-patch:
-	${TOUCH} ${WRKSRC}/src/doxytag.l
+	touch ${WRKSRC}/src/doxytag.l
 
 post-install:
-	cd ${WRKSRC} && ${GMAKE} install_docs
+	cd ${WRKSRC} && gmake install_docs
 
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index a6087088ca2..f02f0b6516f 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/13 20:05:40 minskim Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/01/08 12:20:24 adam Exp $
 bin/doxygen
 bin/doxytag
 man/man1/doxygen.1
 man/man1/doxytag.1
 man/man1/doxywizard.1
 share/doc/doxygen/doxygen_manual.pdf
+share/doc/doxygen/examples/.gdb_history
 share/doc/doxygen/examples/Makefile
 share/doc/doxygen/examples/Makefile.in
 share/doc/doxygen/examples/Makefile.win.in
@@ -18,7 +19,6 @@ share/doc/doxygen/examples/afterdoc/html/doxygen.css
 share/doc/doxygen/examples/afterdoc/html/doxygen.png
 share/doc/doxygen/examples/afterdoc/html/files.html
 share/doc/doxygen/examples/afterdoc/html/functions.html
-share/doc/doxygen/examples/afterdoc/html/functions_enum.html
 share/doc/doxygen/examples/afterdoc/html/functions_eval.html
 share/doc/doxygen/examples/afterdoc/html/functions_func.html
 share/doc/doxygen/examples/afterdoc/html/functions_vars.html
@@ -50,15 +50,11 @@ share/doc/doxygen/examples/autolink/html/doxygen.css
 share/doc/doxygen/examples/autolink/html/doxygen.png
 share/doc/doxygen/examples/autolink/html/files.html
 share/doc/doxygen/examples/autolink/html/functions.html
-share/doc/doxygen/examples/autolink/html/functions_enum.html
 share/doc/doxygen/examples/autolink/html/functions_eval.html
 share/doc/doxygen/examples/autolink/html/functions_func.html
 share/doc/doxygen/examples/autolink/html/functions_vars.html
 share/doc/doxygen/examples/autolink/html/globals.html
-share/doc/doxygen/examples/autolink/html/globals_defs.html
-share/doc/doxygen/examples/autolink/html/globals_enum.html
 share/doc/doxygen/examples/autolink/html/globals_eval.html
-share/doc/doxygen/examples/autolink/html/globals_type.html
 share/doc/doxygen/examples/autolink/html/globals_vars.html
 share/doc/doxygen/examples/autolink/html/index.html
 share/doc/doxygen/examples/autolink/html/tab_b.gif
@@ -85,8 +81,6 @@ share/doc/doxygen/examples/define/html/define_8h.html
 share/doc/doxygen/examples/define/html/doxygen.css
 share/doc/doxygen/examples/define/html/doxygen.png
 share/doc/doxygen/examples/define/html/files.html
-share/doc/doxygen/examples/define/html/globals.html
-share/doc/doxygen/examples/define/html/globals_defs.html
 share/doc/doxygen/examples/define/html/index.html
 share/doc/doxygen/examples/define/html/tab_b.gif
 share/doc/doxygen/examples/define/html/tab_l.gif
@@ -96,75 +90,57 @@ 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.map
+share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.dot
 share/doc/doxygen/examples/diagrams/html/class_a__coll__graph.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.dot
 share/doc/doxygen/examples/diagrams/html/class_b__coll__graph.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.dot
 share/doc/doxygen/examples/diagrams/html/class_c__coll__graph.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.dot
 share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.md5
-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.dot
 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-members.html
 share/doc/doxygen/examples/diagrams/html/class_e.html
-share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.map
+share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.dot
 share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/diagrams__a_8h__dep__incl.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/diagrams__b_8h__dep__incl.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.dot
 share/doc/doxygen/examples/diagrams/html/diagrams__c_8h__dep__incl.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.dot
 share/doc/doxygen/examples/diagrams/html/diagrams__d_8h__dep__incl.md5
-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.dot
 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.map
+share/doc/doxygen/examples/diagrams/html/diagrams__e_8h__incl.dot
 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
@@ -172,12 +148,10 @@ 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.map
+share/doc/doxygen/examples/diagrams/html/inherit__graph__0.dot
 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
@@ -195,11 +169,19 @@ ${CASESENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyCl
 ${CASEINSENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class-members.html
 ${CASESENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass.html
 ${CASEINSENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class.html
+share/doc/doxygen/examples/docstring/html/docstring_8py.html
 share/doc/doxygen/examples/docstring/html/doxygen.css
 share/doc/doxygen/examples/docstring/html/doxygen.png
+share/doc/doxygen/examples/docstring/html/files.html
 share/doc/doxygen/examples/docstring/html/functions.html
 share/doc/doxygen/examples/docstring/html/functions_func.html
+share/doc/doxygen/examples/docstring/html/globals.html
+share/doc/doxygen/examples/docstring/html/globals_func.html
 share/doc/doxygen/examples/docstring/html/index.html
+share/doc/doxygen/examples/docstring/html/namespacedocstring.html
+share/doc/doxygen/examples/docstring/html/namespacemembers.html
+share/doc/doxygen/examples/docstring/html/namespacemembers_func.html
+share/doc/doxygen/examples/docstring/html/namespaces.html
 share/doc/doxygen/examples/docstring/html/tab_b.gif
 share/doc/doxygen/examples/docstring/html/tab_l.gif
 share/doc/doxygen/examples/docstring/html/tab_r.gif
@@ -214,7 +196,6 @@ share/doc/doxygen/examples/enum/html/doxygen.png
 share/doc/doxygen/examples/enum/html/enum_8h-source.html
 share/doc/doxygen/examples/enum/html/files.html
 share/doc/doxygen/examples/enum/html/functions.html
-share/doc/doxygen/examples/enum/html/functions_enum.html
 share/doc/doxygen/examples/enum/html/functions_eval.html
 share/doc/doxygen/examples/enum/html/index.html
 share/doc/doxygen/examples/enum/html/tab_b.gif
@@ -262,8 +243,6 @@ share/doc/doxygen/examples/func/html/doxygen.css
 share/doc/doxygen/examples/func/html/doxygen.png
 share/doc/doxygen/examples/func/html/files.html
 share/doc/doxygen/examples/func/html/func_8h-source.html
-share/doc/doxygen/examples/func/html/functions.html
-share/doc/doxygen/examples/func/html/functions_func.html
 share/doc/doxygen/examples/func/html/index.html
 share/doc/doxygen/examples/func/html/tab_b.gif
 share/doc/doxygen/examples/func/html/tab_l.gif
@@ -320,7 +299,6 @@ share/doc/doxygen/examples/jdstyle/html/class_test.html
 share/doc/doxygen/examples/jdstyle/html/doxygen.css
 share/doc/doxygen/examples/jdstyle/html/doxygen.png
 share/doc/doxygen/examples/jdstyle/html/functions.html
-share/doc/doxygen/examples/jdstyle/html/functions_enum.html
 share/doc/doxygen/examples/jdstyle/html/functions_eval.html
 share/doc/doxygen/examples/jdstyle/html/functions_func.html
 share/doc/doxygen/examples/jdstyle/html/functions_vars.html
@@ -339,9 +317,6 @@ share/doc/doxygen/examples/memgrp/html/doxygen.png
 share/doc/doxygen/examples/memgrp/html/files.html
 share/doc/doxygen/examples/memgrp/html/functions.html
 share/doc/doxygen/examples/memgrp/html/functions_func.html
-share/doc/doxygen/examples/memgrp/html/globals.html
-share/doc/doxygen/examples/memgrp/html/globals_defs.html
-share/doc/doxygen/examples/memgrp/html/globals_func.html
 share/doc/doxygen/examples/memgrp/html/index.html
 share/doc/doxygen/examples/memgrp/html/memgrp_8cpp.html
 share/doc/doxygen/examples/memgrp/html/tab_b.gif
@@ -355,8 +330,6 @@ share/doc/doxygen/examples/overload/html/class_test-members.html
 share/doc/doxygen/examples/overload/html/class_test.html
 share/doc/doxygen/examples/overload/html/doxygen.css
 share/doc/doxygen/examples/overload/html/doxygen.png
-share/doc/doxygen/examples/overload/html/functions.html
-share/doc/doxygen/examples/overload/html/functions_func.html
 share/doc/doxygen/examples/overload/html/index.html
 share/doc/doxygen/examples/overload/html/tab_b.gif
 share/doc/doxygen/examples/overload/html/tab_l.gif
@@ -388,16 +361,18 @@ share/doc/doxygen/examples/par/html/tabs.css
 share/doc/doxygen/examples/pyexample.cfg
 share/doc/doxygen/examples/pyexample.py
 share/doc/doxygen/examples/pyexample/html/annotated.html
-${CASESENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass-members.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class-members.html
-${CASESENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class.html
+share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass-members.html
+share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass.html
 share/doc/doxygen/examples/pyexample/html/doxygen.css
 share/doc/doxygen/examples/pyexample/html/doxygen.png
 share/doc/doxygen/examples/pyexample/html/functions.html
 share/doc/doxygen/examples/pyexample/html/functions_func.html
 share/doc/doxygen/examples/pyexample/html/functions_vars.html
 share/doc/doxygen/examples/pyexample/html/index.html
+share/doc/doxygen/examples/pyexample/html/namespacemembers.html
+share/doc/doxygen/examples/pyexample/html/namespacemembers_func.html
+share/doc/doxygen/examples/pyexample/html/namespacepyexample.html
+share/doc/doxygen/examples/pyexample/html/namespaces.html
 share/doc/doxygen/examples/pyexample/html/tab_b.gif
 share/doc/doxygen/examples/pyexample/html/tab_l.gif
 share/doc/doxygen/examples/pyexample/html/tab_r.gif
@@ -410,7 +385,6 @@ share/doc/doxygen/examples/qtstyle/html/class_test.html
 share/doc/doxygen/examples/qtstyle/html/doxygen.css
 share/doc/doxygen/examples/qtstyle/html/doxygen.png
 share/doc/doxygen/examples/qtstyle/html/functions.html
-share/doc/doxygen/examples/qtstyle/html/functions_enum.html
 share/doc/doxygen/examples/qtstyle/html/functions_eval.html
 share/doc/doxygen/examples/qtstyle/html/functions_func.html
 share/doc/doxygen/examples/qtstyle/html/functions_vars.html
@@ -428,7 +402,6 @@ share/doc/doxygen/examples/relates/html/doxygen.css
 share/doc/doxygen/examples/relates/html/doxygen.png
 share/doc/doxygen/examples/relates/html/functions.html
 share/doc/doxygen/examples/relates/html/functions_func.html
-share/doc/doxygen/examples/relates/html/functions_rela.html
 share/doc/doxygen/examples/relates/html/index.html
 share/doc/doxygen/examples/relates/html/tab_b.gif
 share/doc/doxygen/examples/relates/html/tab_l.gif
@@ -458,11 +431,6 @@ share/doc/doxygen/examples/structcmd.h
 share/doc/doxygen/examples/structcmd/html/doxygen.css
 share/doc/doxygen/examples/structcmd/html/doxygen.png
 share/doc/doxygen/examples/structcmd/html/files.html
-share/doc/doxygen/examples/structcmd/html/globals.html
-share/doc/doxygen/examples/structcmd/html/globals_defs.html
-share/doc/doxygen/examples/structcmd/html/globals_func.html
-share/doc/doxygen/examples/structcmd/html/globals_type.html
-share/doc/doxygen/examples/structcmd/html/globals_vars.html
 share/doc/doxygen/examples/structcmd/html/index.html
 share/doc/doxygen/examples/structcmd/html/structcmd_8h-source.html
 share/doc/doxygen/examples/structcmd/html/structcmd_8h.html
@@ -500,8 +468,6 @@ share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.
 share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.png
 share/doc/doxygen/examples/template/html/doxygen.css
 share/doc/doxygen/examples/template/html/doxygen.png
-share/doc/doxygen/examples/template/html/functions.html
-share/doc/doxygen/examples/template/html/functions_func.html
 share/doc/doxygen/examples/template/html/hierarchy.html
 share/doc/doxygen/examples/template/html/index.html
 share/doc/doxygen/examples/template/html/tab_b.gif
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 48be130ed28..fc64a6a78b0 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2006/10/31 20:06:57 dsainty Exp $
+$NetBSD: distinfo,v 1.28 2007/01/08 12:20:24 adam Exp $
 
-SHA1 (doxygen-1.4.7.src.tar.gz) = 42a33d676fbd471165d02f531bfe98f433ecb432
-RMD160 (doxygen-1.4.7.src.tar.gz) = 4de02b866cef53a7fd6f54e0ba90111814a9d77a
-Size (doxygen-1.4.7.src.tar.gz) = 2928354 bytes
+SHA1 (doxygen-1.5.1.src.tar.gz) = eac525c670ef3f1f81c3038588b42e111a9ec6a6
+RMD160 (doxygen-1.5.1.src.tar.gz) = bacd34a5a69833e42e116d997c99df03dd837062
+Size (doxygen-1.5.1.src.tar.gz) = 2888159 bytes
 SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
 SHA1 (patch-ab) = 70ce109f41f0952eaa1fa08cb02c48d7f38a32af
 SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974