Update to 1.5.7.1:

Doxygen Release 1.5.7.1
(release date 5-10-2008)
Changes

    * The dot tool is no longer part of the doxygen package for
    MacOSX. Please install GraphViz separately and set the dot path
    to /usr/local/bin

New features

    * Added option DOT_FONTSIZE which allows to set the size of
    the fonts used in dot generated graphs.

Bug fixes

    * id 554432: Re-added ALPHABETICAL_INDEX option.
    * id 554379: Fixed internal error for GENERATE_INDEXLOG when
    GENERATE_HTML was set to NO.
    * id 554546: Included fix for handling relative includes in
    the preprocessor.
    * Included several VHDL fixes related to syntax highlighting,
    finding class members, and mixing upper and lower case.
    * Included patch to allow setting DEST_DIR environment variable
    to determine where to install doxygen.

Doxygen Release 1.5.7
(release date 28-9-2008)
Changes

    * The default CSS style sheet has been cleaned up and simplified,
    thanks to the work done by Quinn Taylor.

New features

    * Added new config options GENERATE_QHP which enables generating
    .qch (Qt compiled help) file via the Qt's qthelpgenerator tool
    (part of Qt 4.4+). This type of files can be read with Qt's
    Assisant to browse the documentation in a similar way as is
    possible with Microsoft's compiled HTML help (.chm). To further
    customize the output and run the help generator from within
    doxygen, the following options are available: QCH_FILE,
    QHP_NAMESPACE, QHP_VIRTUAL_FOLDER, QHG_LOCATION. Thanks to
    Sebastian Pipping for the patch.
    * Add new option SYMBOL_CACHE_SIZE to allow a different trade
    off between doxygen's memory usage and the amount of disk
    accesses.
    * id 532695: Added 3 new commands: \extends, \implements, and
    \memberof that allow object oriented constructs to be documented
    as such for languages that do not support it natively (e.g. C)
    * Added better support for one line comments after VHDL types.
    * Added new option LAYOUT_FILE which can be used to specify a
    layout template file that tells doxygen in which order to
    generate the output and which titles to use for headings and
    how the navigation index will look; Read this for more info.
    As a result the following options are now obsolete since they
    can now only be controlled via the layout file: DETAILS_AT_TOP,
    ALPHABETICAL_INDEX. The following options can also be set via
    the layout file, but for convenience and backward compatibility
    reasons they are still also part of the configuration file:
    SHOW_INCLUDE_FILES, SHOW_USED_FILES, CLASS_GRAPH, COLLABORATION_GRAPH,
    GROUP_GRAPHS, INCLUDE_GRAPH, INCLUDED_BY_GRAPH. Run doxygen
    with the -l option to generate the default layout file.
    * Included update for the Macedonian, Catalan, Brazilian, and
    Serbian translation and also support for Serbian with Cyrilic
    characters.

Bug fixes (ids refer to the bugzilla database)

    * id 140264, 332187, 541924: Sections inside a \subpage where
    not shown as subsection in the LaTeX/RTF output.
    * id 155098,156188: Added support for UTF-8 special characters
    in identifiers (which is allowed by e.g. C#).
    * id 304598: operator-- caused invalid HTML output.
    * id 324047: parameter type [in or out] were not generated in
    RTF document
    * id 363499: @todo and friends did not work in a comment marked
    with @dir.
    * id 445485: HTML commands in a comment block with attribute
    values without quotes were not handled properly.
    * id 533855: Processes were always documented as anonymous in
    VHDL code.
    * id 535379: Added support for %{...%} blocks in XPCOM's IDL.
    * id 536298: Last port in a VHDL port list was not correctly
    put in a member group.
    * id 536385: Fixed problem matching function prototype and
    implementation under certain conditions.
    * id 536629: Fixed compilation issue on NetBSD.
    * id 537393: Properties in Python were not properly handled.
    * id 538065: Added support for @optional and @required in
    Objective C 2.0 protocols.
    * id 538239: Some unlabeled VHDL processes were not corrected
    detected.
    * id 538515: Deriving a Objective-C interface from a protocol
    caused parsing problems if the interface also has a body.
    * id 539057: Part of an Objective-C expression could be missing
    in the source browser under certain conditions.
    * id 539590: Generic C# classes with the same name but different
    template arguments were no longer treated as different classes.
    * id 539712: Fixed code parser issue for parameter indices of
    procedures and functions.
    * id 540058: Creator code was wrong in the MacOSX application
    bundle.
    * id 540372: Fixed problem parsing large table by increasing
    YY_READ_BUF_SIZE in the generated parser files.
    * id 540247: Fixed potential memory corruption issue parsing
    VHDL.
    * id 541113: Fixed locale for ctype, to avoid stripping of 0xA0
    from multi-byte UTF-8 characters.
    * id 544479: SORT_MEMBER_DOCS did not work for class members.
    * id 546621: Fixed makefile so that .svn stuff is removed from
    the tarball when doing "make archive".
    * id 546812: Using a table with row span greater than 1 did
    not produce correct LaTeX output.
    * id 545098: Fixed problem parsing where clauses in combination
    with C# generics.
    * id 545503: Nameless parameters of type "struct A" could end
    up wrongly in the XML output.
    * id 545970: Refering to the main page did not work as advertised.
    * id 546158: The variable defined inside a foreach statement
    in C# code was not considered for source linking, cause
    potentially incomplete call graphs.
    * id 547361: Linking to specialized template functions did not
    work.
    * id 548175: Fixed problem parsing class members within a class
    X, inside a namespace that is also named X.
    * id 548443: Documenting a nested namespace/classes with
    @namespace X.Y did not work for C# (only X::Y worked).
    * id 548489: C++/CLI classes of type sealed abstract were not
    processed correctly.
    * id 549318: Some headings in the user manual where wrongly
    formatted.
    * id 549581: Fixed potential buffer overflow in preprocessor.
    * id 550058: Obj-C: properties for private fields did not appear
    in the output unless EXTRACT_PRIVATE was enabled.
    * id 550156: Corrected typo in the documentation for
    GENERATE_TREEVIEW.
    * id 550247: Fixed problem parsing octal character literals in
    the preprocessing phase.
    * id 551739: Related function with explicit namespace scope
    was not properly placed if the function also existed in the
    global namespace.
    * id 552115: Anonymous structs and unions could produce invalid
    links in the html help index.
    * id 552361: Fixed problem with operators in the LaTeX output.
    * id 552600: \copybrief ended a brief description instead of
    appending to it.
    * id 553469: Removed bogus warning about internal inconsistency
    when importing items via a tagfiles that are inside an undocumented
    scope.
    * id 553616: One can now remove the automatic line breaks in
    the type part of a declaration by using a custom stylesheet
    with BR.typebreak { display: none; }
    * id 553663: Aliases did not work in Fortan comments.
    * id 549022: Reimplemented in links could be wrong in case of
    overloaded members.
    * id 553225: Parser was confused by arrays inside an Obj-C
    message.
    * Finnish translation was disabled.
    * A collaboration graph with multiple edge labels with not
    written to the XML output correctly.
    * sub pages of a \mainpage were not shown in the Latex/RTF
    output.
    * Included some fixed for the VHDL parser.

8 files changed, 108 insertions, 71 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 44d47d1bee8..c8bcc2603f2 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2008/08/19 16:35:25 tron Exp $
+# $NetBSD: Makefile,v 1.64 2008/11/11 00:44:12 wiz Exp $
 
-DISTNAME=	doxygen-1.5.6.src
-PKGNAME=	doxygen-1.5.6
+DISTNAME=	doxygen-1.5.7.1.src
+PKGNAME=	${DISTNAME:S/.src//}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--perl ${PERL5}
 CONFIGURE_ARGS+=	--install ${INSTALL}
 CONFIGURE_ARGS+=	--dot ${PREFIX}/bin/dot
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
-CONFIGURE_ARGS+=	--docdir ${PREFIX}/share/doc
+CONFIGURE_ARGS+=	--docdir ${PREFIX}/share/doc/doxygen
 MAKE_ENV+=		PKGSRC_CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=		MAN1DIR=${PKGMANDIR}/man1
 
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index c7e6e69d2e0..8146a3f94be 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/08/19 16:35:25 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/11/11 00:44:12 wiz Exp $
 bin/doxygen
 bin/doxytag
 man/man1/doxygen.1
@@ -13,6 +13,7 @@ share/doc/doxygen/examples/afterdoc/html/afterdoc_8h-source.html
 share/doc/doxygen/examples/afterdoc/html/annotated.html
 share/doc/doxygen/examples/afterdoc/html/class_test-members.html
 share/doc/doxygen/examples/afterdoc/html/class_test.html
+share/doc/doxygen/examples/afterdoc/html/classes.html
 share/doc/doxygen/examples/afterdoc/html/doxygen.css
 share/doc/doxygen/examples/afterdoc/html/doxygen.png
 share/doc/doxygen/examples/afterdoc/html/files.html
@@ -31,6 +32,7 @@ share/doc/doxygen/examples/author.cpp
 share/doc/doxygen/examples/author/html/annotated.html
 share/doc/doxygen/examples/author/html/bug.html
 share/doc/doxygen/examples/author/html/class_windows_n_t.html
+share/doc/doxygen/examples/author/html/classes.html
 share/doc/doxygen/examples/author/html/doxygen.css
 share/doc/doxygen/examples/author/html/doxygen.png
 share/doc/doxygen/examples/author/html/index.html
@@ -45,6 +47,7 @@ share/doc/doxygen/examples/autolink/html/annotated.html
 share/doc/doxygen/examples/autolink/html/autolink_8cpp.html
 share/doc/doxygen/examples/autolink/html/class_test-members.html
 share/doc/doxygen/examples/autolink/html/class_test.html
+share/doc/doxygen/examples/autolink/html/classes.html
 share/doc/doxygen/examples/autolink/html/doxygen.css
 share/doc/doxygen/examples/autolink/html/doxygen.png
 share/doc/doxygen/examples/autolink/html/files.html
@@ -69,6 +72,7 @@ share/doc/doxygen/examples/class.h
 share/doc/doxygen/examples/class/html/annotated.html
 share/doc/doxygen/examples/class/html/class_8h-source.html
 share/doc/doxygen/examples/class/html/class_test.html
+share/doc/doxygen/examples/class/html/classes.html
 share/doc/doxygen/examples/class/html/doxygen.css
 share/doc/doxygen/examples/class/html/doxygen.png
 share/doc/doxygen/examples/class/html/files.html
@@ -133,6 +137,7 @@ 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/classes.html
 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
@@ -191,9 +196,10 @@ share/doc/doxygen/examples/docstring.cfg
 share/doc/doxygen/examples/docstring.py
 share/doc/doxygen/examples/docstring/html/annotated.html
 ${PLIST.cs}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass-members.html
-${PLIST.ci}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class-members.html
 ${PLIST.cs}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass.html
+${PLIST.ci}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class-members.html
 ${PLIST.ci}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class.html
+share/doc/doxygen/examples/docstring/html/classes.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
@@ -214,6 +220,7 @@ share/doc/doxygen/examples/enum.h
 share/doc/doxygen/examples/enum/html/annotated.html
 share/doc/doxygen/examples/enum/html/class_test-members.html
 share/doc/doxygen/examples/enum/html/class_test.html
+share/doc/doxygen/examples/enum/html/classes.html
 share/doc/doxygen/examples/enum/html/doxygen.css
 share/doc/doxygen/examples/enum/html/doxygen.png
 share/doc/doxygen/examples/enum/html/enum_8h-source.html
@@ -232,6 +239,7 @@ share/doc/doxygen/examples/example.tag
 share/doc/doxygen/examples/example/html/annotated.html
 share/doc/doxygen/examples/example/html/class_test-members.html
 share/doc/doxygen/examples/example/html/class_test.html
+share/doc/doxygen/examples/example/html/classes.html
 share/doc/doxygen/examples/example/html/doxygen.css
 share/doc/doxygen/examples/example/html/doxygen.png
 share/doc/doxygen/examples/example/html/example__test_8cpp-example.html
@@ -263,6 +271,7 @@ share/doc/doxygen/examples/func.h
 share/doc/doxygen/examples/func/html/annotated.html
 share/doc/doxygen/examples/func/html/class_test-members.html
 share/doc/doxygen/examples/func/html/class_test.html
+share/doc/doxygen/examples/func/html/classes.html
 share/doc/doxygen/examples/func/html/doxygen.css
 share/doc/doxygen/examples/func/html/doxygen.png
 share/doc/doxygen/examples/func/html/files.html
@@ -282,6 +291,7 @@ share/doc/doxygen/examples/group/html/class_c2.html
 share/doc/doxygen/examples/group/html/class_c3.html
 share/doc/doxygen/examples/group/html/class_c4.html
 share/doc/doxygen/examples/group/html/class_c5.html
+share/doc/doxygen/examples/group/html/classes.html
 share/doc/doxygen/examples/group/html/doxygen.css
 share/doc/doxygen/examples/group/html/doxygen.png
 share/doc/doxygen/examples/group/html/files.html
@@ -306,6 +316,7 @@ share/doc/doxygen/examples/include.cpp
 share/doc/doxygen/examples/include/html/annotated.html
 share/doc/doxygen/examples/include/html/class_test-members.html
 share/doc/doxygen/examples/include/html/class_test.html
+share/doc/doxygen/examples/include/html/classes.html
 share/doc/doxygen/examples/include/html/doxygen.css
 share/doc/doxygen/examples/include/html/doxygen.png
 share/doc/doxygen/examples/include/html/example.html
@@ -322,6 +333,7 @@ share/doc/doxygen/examples/jdstyle.cpp
 share/doc/doxygen/examples/jdstyle/html/annotated.html
 share/doc/doxygen/examples/jdstyle/html/class_test-members.html
 share/doc/doxygen/examples/jdstyle/html/class_test.html
+share/doc/doxygen/examples/jdstyle/html/classes.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
@@ -334,11 +346,44 @@ share/doc/doxygen/examples/jdstyle/html/tab_b.gif
 share/doc/doxygen/examples/jdstyle/html/tab_l.gif
 share/doc/doxygen/examples/jdstyle/html/tab_r.gif
 share/doc/doxygen/examples/jdstyle/html/tabs.css
+share/doc/doxygen/examples/manual.c
+share/doc/doxygen/examples/manual.cfg
+share/doc/doxygen/examples/manual/html/annotated.html
+share/doc/doxygen/examples/manual/html/classes.html
+share/doc/doxygen/examples/manual/html/doxygen.css
+share/doc/doxygen/examples/manual/html/doxygen.png
+share/doc/doxygen/examples/manual/html/files.html
+share/doc/doxygen/examples/manual/html/functions.html
+share/doc/doxygen/examples/manual/html/functions_func.html
+share/doc/doxygen/examples/manual/html/functions_vars.html
+share/doc/doxygen/examples/manual/html/globals.html
+share/doc/doxygen/examples/manual/html/globals_func.html
+share/doc/doxygen/examples/manual/html/globals_type.html
+share/doc/doxygen/examples/manual/html/hierarchy.html
+share/doc/doxygen/examples/manual/html/index.html
+share/doc/doxygen/examples/manual/html/manual_8c.html
+share/doc/doxygen/examples/manual/html/struct_car-members.html
+share/doc/doxygen/examples/manual/html/struct_car.html
+share/doc/doxygen/examples/manual/html/struct_car.png
+share/doc/doxygen/examples/manual/html/struct_object-members.html
+share/doc/doxygen/examples/manual/html/struct_object.html
+share/doc/doxygen/examples/manual/html/struct_object.png
+share/doc/doxygen/examples/manual/html/struct_truck-members.html
+share/doc/doxygen/examples/manual/html/struct_truck.html
+share/doc/doxygen/examples/manual/html/struct_truck.png
+share/doc/doxygen/examples/manual/html/struct_vehicle-members.html
+share/doc/doxygen/examples/manual/html/struct_vehicle.html
+share/doc/doxygen/examples/manual/html/struct_vehicle.png
+share/doc/doxygen/examples/manual/html/tab_b.gif
+share/doc/doxygen/examples/manual/html/tab_l.gif
+share/doc/doxygen/examples/manual/html/tab_r.gif
+share/doc/doxygen/examples/manual/html/tabs.css
 share/doc/doxygen/examples/memgrp.cfg
 share/doc/doxygen/examples/memgrp.cpp
 share/doc/doxygen/examples/memgrp/html/annotated.html
 share/doc/doxygen/examples/memgrp/html/class_test-members.html
 share/doc/doxygen/examples/memgrp/html/class_test.html
+share/doc/doxygen/examples/memgrp/html/classes.html
 share/doc/doxygen/examples/memgrp/html/doxygen.css
 share/doc/doxygen/examples/memgrp/html/doxygen.png
 share/doc/doxygen/examples/memgrp/html/files.html
@@ -356,6 +401,7 @@ share/doc/doxygen/examples/memgrp/html/tabs.css
 share/doc/doxygen/examples/mux.cfg
 share/doc/doxygen/examples/mux.vhdl
 share/doc/doxygen/examples/mux/html/annotated.html
+share/doc/doxygen/examples/mux/html/classes.html
 share/doc/doxygen/examples/mux/html/classmux__using__with-members.html
 share/doc/doxygen/examples/mux/html/classmux__using__with.html
 share/doc/doxygen/examples/mux/html/classmux__using__with.png
@@ -378,6 +424,7 @@ share/doc/doxygen/examples/overload.cpp
 share/doc/doxygen/examples/overload/html/annotated.html
 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/classes.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
@@ -403,6 +450,7 @@ share/doc/doxygen/examples/par.cfg
 share/doc/doxygen/examples/par.cpp
 share/doc/doxygen/examples/par/html/annotated.html
 share/doc/doxygen/examples/par/html/class_test.html
+share/doc/doxygen/examples/par/html/classes.html
 share/doc/doxygen/examples/par/html/doxygen.css
 share/doc/doxygen/examples/par/html/doxygen.png
 share/doc/doxygen/examples/par/html/index.html
@@ -413,9 +461,10 @@ 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
+share/doc/doxygen/examples/pyexample/html/classes.html
 ${PLIST.cs}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass-members.html
-${PLIST.ci}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class-members.html
 ${PLIST.cs}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass.html
+${PLIST.ci}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class-members.html
 ${PLIST.ci}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class.html
 share/doc/doxygen/examples/pyexample/html/doxygen.css
 share/doc/doxygen/examples/pyexample/html/doxygen.png
@@ -436,6 +485,7 @@ share/doc/doxygen/examples/qtstyle.cpp
 share/doc/doxygen/examples/qtstyle/html/annotated.html
 share/doc/doxygen/examples/qtstyle/html/class_test-members.html
 share/doc/doxygen/examples/qtstyle/html/class_test.html
+share/doc/doxygen/examples/qtstyle/html/classes.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
@@ -453,6 +503,7 @@ share/doc/doxygen/examples/relates.cpp
 share/doc/doxygen/examples/relates/html/annotated.html
 share/doc/doxygen/examples/relates/html/class_string-members.html
 share/doc/doxygen/examples/relates/html/class_string.html
+share/doc/doxygen/examples/relates/html/classes.html
 share/doc/doxygen/examples/relates/html/doxygen.css
 share/doc/doxygen/examples/relates/html/doxygen.png
 share/doc/doxygen/examples/relates/html/functions.html
@@ -466,6 +517,7 @@ share/doc/doxygen/examples/relates/html/tabs.css
 share/doc/doxygen/examples/restypedef.cfg
 share/doc/doxygen/examples/restypedef.cpp
 share/doc/doxygen/examples/restypedef/html/annotated.html
+share/doc/doxygen/examples/restypedef/html/classes.html
 share/doc/doxygen/examples/restypedef/html/doxygen.css
 share/doc/doxygen/examples/restypedef/html/doxygen.png
 share/doc/doxygen/examples/restypedef/html/files.html
@@ -505,6 +557,7 @@ share/doc/doxygen/examples/tag/html/annotated.html
 share/doc/doxygen/examples/tag/html/class_tag-members.html
 share/doc/doxygen/examples/tag/html/class_tag.html
 share/doc/doxygen/examples/tag/html/class_tag.png
+share/doc/doxygen/examples/tag/html/classes.html
 share/doc/doxygen/examples/tag/html/doxygen.css
 share/doc/doxygen/examples/tag/html/doxygen.png
 share/doc/doxygen/examples/tag/html/functions.html
@@ -527,6 +580,7 @@ share/doc/doxygen/examples/template/html/class_test_3_01_t_01_5_01_4.png
 share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4-members.html
 share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.html
 share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.png
+share/doc/doxygen/examples/template/html/classes.html
 share/doc/doxygen/examples/template/html/doxygen.css
 share/doc/doxygen/examples/template/html/doxygen.png
 share/doc/doxygen/examples/template/html/functions.html
@@ -543,6 +597,7 @@ share/doc/doxygen/html/autolink.html
 share/doc/doxygen/html/commands.html
 share/doc/doxygen/html/config.html
 share/doc/doxygen/html/custcmd.html
+share/doc/doxygen/html/customize.html
 share/doc/doxygen/html/diagrams.html
 share/doc/doxygen/html/docblocks.html
 share/doc/doxygen/html/doxygen.css
@@ -568,6 +623,8 @@ share/doc/doxygen/html/form_2.png
 share/doc/doxygen/html/form_3.png
 share/doc/doxygen/html/form_4.png
 share/doc/doxygen/html/form_5.png
+share/doc/doxygen/html/form_6.png
+share/doc/doxygen/html/form_7.png
 share/doc/doxygen/html/formula.repository
 share/doc/doxygen/html/formulas.html
 share/doc/doxygen/html/grouping.html
@@ -619,6 +676,8 @@ share/doc/doxygen/html/xmlcmds.html
 @dirrm share/doc/doxygen/examples/mux
 @dirrm share/doc/doxygen/examples/memgrp/html
 @dirrm share/doc/doxygen/examples/memgrp
+@dirrm share/doc/doxygen/examples/manual/html
+@dirrm share/doc/doxygen/examples/manual
 @dirrm share/doc/doxygen/examples/jdstyle/html
 @dirrm share/doc/doxygen/examples/jdstyle
 @dirrm share/doc/doxygen/examples/include/html
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 827e4fb086d..036b5235eea 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.32 2008/06/05 07:55:09 dsainty Exp $
+$NetBSD: distinfo,v 1.33 2008/11/11 00:44:12 wiz Exp $
 
-SHA1 (doxygen-1.5.6.src.tar.gz) = a478176b9183aef299418e655d6e38b8f8f4e4a5
-RMD160 (doxygen-1.5.6.src.tar.gz) = 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b
-Size (doxygen-1.5.6.src.tar.gz) = 4011956 bytes
-SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
-SHA1 (patch-ab) = f85f15c38877e7d646b3cc981564de8436c2a5af
+SHA1 (doxygen-1.5.7.1.src.tar.gz) = aecb0c453f76e900eb2aa8132ad063215005fca3
+RMD160 (doxygen-1.5.7.1.src.tar.gz) = f9614bb076d6531334a212a95dfbb862a7502c69
+Size (doxygen-1.5.7.1.src.tar.gz) = 4096168 bytes
+SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
+SHA1 (patch-ab) = 951ad787ec32cf5dd3915d91df1fb45bc199ec79
 SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974
-SHA1 (patch-ad) = e06da37357b5d49e89c78d3eb31c2428ebed395b
-SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
+SHA1 (patch-af) = 5911fcc07b4165bb78b1618545e15c6da8d379f7
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
-SHA1 (patch-ah) = aa5a701f0586aa99fdb140f8d7fa63ca14d9f460
+SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b
diff --git a/devel/doxygen/patches/patch-aa b/devel/doxygen/patches/patch-aa
index 9c15996cdd9..3ef956e7572 100644
--- a/devel/doxygen/patches/patch-aa
+++ b/devel/doxygen/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/11/09 14:31:51 adam Exp $
+$NetBSD: patch-aa,v 1.3 2008/11/11 00:44:12 wiz Exp $
 
---- tmake/lib/netbsd-g++/tmake.conf.orig	Tue Sep  4 16:00:50 2001
-+++ tmake/lib/netbsd-g++/tmake.conf	Tue Sep  4 16:00:56 2001
-@@ -11,7 +11,7 @@
+--- tmake/lib/netbsd-g++/tmake.conf.orig	2006-07-21 19:54:13.000000000 +0000
++++ tmake/lib/netbsd-g++/tmake.conf
+@@ -11,7 +11,7 @@ TMAKE_CC		= gcc
  TMAKE_CFLAGS		=
  TMAKE_CFLAGS_WARN_ON	= -Wall -W
  TMAKE_CFLAGS_WARN_OFF	=
diff --git a/devel/doxygen/patches/patch-ab b/devel/doxygen/patches/patch-ab
index 65ff71ee1e5..6d5b44b3a08 100644
--- a/devel/doxygen/patches/patch-ab
+++ b/devel/doxygen/patches/patch-ab
@@ -1,40 +1,36 @@
-$NetBSD: patch-ab,v 1.10 2008/06/04 15:05:39 dsainty Exp $
+$NetBSD: patch-ab,v 1.11 2008/11/11 00:44:12 wiz Exp $
 
---- Makefile.in.orig	2008-06-04 15:03:17.373765859 +1200
-+++ Makefile.in	2008-06-04 15:22:33.471205326 +1200
-@@ -53,25 +53,25 @@
+--- Makefile.in.orig	2008-10-04 13:49:57.000000000 +0000
++++ Makefile.in
+@@ -55,23 +55,23 @@ DATE=$(shell date "+%B %Y")
  MAN1DIR = man/man1
  
  install: doxywizard_install 
--	$(INSTTOOL) -d $(INSTALL)/bin
--	$(INSTTOOL) -m 755 bin/doxygen    $(INSTALL)/bin
--	$(INSTTOOL) -m 755 bin/doxytag    $(INSTALL)/bin
--	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-+	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL)/bin
-+	$(BSD_INSTALL_PROGRAM) bin/doxygen ${DESTDIR}$(INSTALL)/bin
-+	$(BSD_INSTALL_PROGRAM) bin/doxytag ${DESTDIR}$(INSTALL)/bin
-+	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(INSTALL)/$(MAN1DIR)
+-	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
+-	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
+-	$(INSTTOOL) -m 755 bin/doxytag    $(DESTDIR)/$(INSTALL)/bin
+-	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(INSTALL)/bin
++	$(BSD_INSTALL_PROGRAM) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
++	$(BSD_INSTALL_PROGRAM) -m 755 bin/doxytag    $(DESTDIR)/$(INSTALL)/bin
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
  	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1 
--	$(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1
-+	$(BSD_INSTALL_MAN) doxygen.1 ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxygen.1
+-	$(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
++	$(BSD_INSTALL_MAN) doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
  	rm doxygen.1
  	cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
--	$(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1
-+	$(BSD_INSTALL_MAN) doxytag.1 ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxytag.1
+-	$(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
++	$(BSD_INSTALL_MAN) doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
  	rm doxytag.1
  
  install_docs: 
--	$(INSTTOOL) -d $(DOCDIR)
-+	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)
+-	$(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(DOCDIR)
  	$(MAKE) -C examples
  	$(MAKE) -C doc 
  	$(MAKE) -C latex 
--	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)
--	cp -r examples $(DOCDIR)
--	cp -r html $(DOCDIR)
-+	$(BSD_INSTALL_DATA) latex/doxygen_manual.pdf ${DESTDIR}$(DOCDIR)
-+	cp -r examples ${DESTDIR}$(DOCDIR)
-+	cp -r html ${DESTDIR}$(DOCDIR)
+-	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
+ 	cp -r examples $(DESTDIR)/$(DOCDIR)
+ 	cp -r html $(DESTDIR)/$(DOCDIR)
  
- docs: FORCE
- 	cd examples ; $(MAKE)
diff --git a/devel/doxygen/patches/patch-ad b/devel/doxygen/patches/patch-ad
deleted file mode 100644
index 307b504f095..00000000000
--- a/devel/doxygen/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2008/06/05 07:55:09 dsainty Exp $
-
-The cast breaks compilation on NetBSD, as iconv() expects const char**.
-
-Submitted as: https://bugzilla.gnome.org/show_bug.cgi?id=536629
-
---- src/portable.cpp.orig	2008-01-01 23:41:08.000000000 +1300
-+++ src/portable.cpp	2008-06-05 02:06:00.000000000 +1200
-@@ -382,7 +382,7 @@
- // avoid a compile error, that is were the CASTNEEDED is for.
- #if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \
-       !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&& (_LIBICONV_VERSION==0x010B))) \
--    || defined(_OS_SOLARIS_))
-+    || defined(_OS_SOLARIS_) || defined(_OS_NETBSD_))
- #define CASTNEEDED(x) (x)
- #else
- #define CASTNEEDED(x) (char **)(x)
diff --git a/devel/doxygen/patches/patch-af b/devel/doxygen/patches/patch-af
index b044b8668fa..4fcc869b4b1 100644
--- a/devel/doxygen/patches/patch-af
+++ b/devel/doxygen/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2004/05/10 00:15:49 recht Exp $
+$NetBSD: patch-af,v 1.3 2008/11/11 00:44:12 wiz Exp $
 
---- doc/Makefile.in.orig	2004-04-25 20:45:22.000000000 +0200
-+++ doc/Makefile.in	2004-05-10 00:33:58.000000000 +0200
-@@ -31,6 +31,6 @@
+--- doc/Makefile.in.orig	2008-01-01 10:39:53.000000000 +0000
++++ doc/Makefile.in
+@@ -31,6 +31,6 @@ clean: 
  language: language.doc 
  
  language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
diff --git a/devel/doxygen/patches/patch-ah b/devel/doxygen/patches/patch-ah
index 02a3df4e8d4..a96faa730d2 100644
--- a/devel/doxygen/patches/patch-ah
+++ b/devel/doxygen/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2006/06/14 10:24:53 adam Exp $
+$NetBSD: patch-ah,v 1.3 2008/11/11 00:44:12 wiz Exp $
 
---- src/dirdef.cpp.orig	2006-05-07 20:02:30.000000000 +0200
+--- src/dirdef.cpp.orig	2008-08-17 15:11:27.000000000 +0000
 +++ src/dirdef.cpp
-@@ -103,8 +103,8 @@ static QCString encodeDirName(const QCSt
+@@ -104,8 +104,8 @@ static QCString encodeDirName(const QCSt
  
  QCString DirDef::getOutputFileBase() const
  {
@@ -12,4 +12,4 @@ $NetBSD: patch-ah,v 1.2 2006/06/14 10:24:53 adam Exp $
 +  return QCString().sprintf("dir_%06d",m_dirCount);
  }
  
- void DirDef::writeDetailedDocumentation(OutputList &ol)
+ void DirDef::writeDetailedDescription(OutputList &ol,const QCString &title)