update to Doxygen Release 1.3.7 - ok'd by groo@

Changes

* The \param command now has an optional input and/or output attribute. The
  syntax for an input & output parameter is for example: \param[in,out] name
  Description.

New features

* Added new option CREATE_SUBDIRS which when enabled makes doxygen
  distribute the generated output evenly over 100 subdirectories.
* Added support for Qt's properties (i.e. Q_PROPERTY) which can be documented
  by putting a documentation block in front of the macro or by using a comment
  block with the new \property command.
* Added new commands \manonly and \endmanonly to enter man page specific
  text and commands in the generated man pages (thanks to Carsten Stiborg).
* Included new python based translation report script, which now replaces
  the old perl based version (thanks to Petr Prikryl).
* Improved parser to also support parsing of Objective-C implementation files.
* Added new config option EXTRACT_LOCAL_METHODS which can be used for
  Objective-C code to extract methods definition in the implementation section
  that are not present in the interface.
* Added new config option STRIP_FROM_INC_PATH which allows to specify a list
  of paths that, if matched, will be striped from the #include statement in
  the generated documentation of a class.
* Added new command \includelineno with works as \include except it will add
  line numbers to the code (thanks to Giancarlo Niccolai for the patch).
* Added BeOS support, thanks to a patch by Mark Hellegers.
* Included update for the French translation, thanks to Jacques Bouchard.

And many bug fixes. For a complete list see:
http://www.stack.nl/~dimitri/doxygen/changelog.html

4 files changed, 148 insertions, 50 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 2a75469f92e..cfde259bade 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/04/15 12:52:37 martti Exp $
+# $NetBSD: Makefile,v 1.22 2004/05/10 00:15:49 recht Exp $
 
-DISTNAME=		doxygen-1.3.6.src
-PKGNAME=		doxygen-1.3.6
+DISTNAME=		doxygen-1.3.7.src
+PKGNAME=		doxygen-1.3.7
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.stack.nl/pub/users/dimitri/
 
@@ -13,16 +13,26 @@ DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_GNU_TOOLS+=		make
+USE_LANGUAGES=		c c++
 USE_PERL5=		yes
+USE_BUILDLINK3=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		--make ${GMAKE}
+CONFIGURE_ARGS+=	--perl ${PERL5}
 CONFIGURE_ARGS+=	--install ${INSTALL}
-CONFIGURE_ARGS+=	--prefix ${LOCALBASE}
-CONFIGURE_ARGS+=	--docdir ${LOCALBASE}/share/doc
-REPLACE_PERL=		doc/translater.pl
+CONFIGURE_ARGS+=	--dot ${PREFIX}/bin/dot
+CONFIGURE_ARGS+=	--prefix ${PREFIX}
+CONFIGURE_ARGS+=	--docdir ${PREFIX}/share/doc
+
+SUBST_CLASSES+=		pybin
+SUBST_STAGE.pybin=	pre-configure
+SUBST_FILES.pybin=	doc/Makefile.in
+SUBST_SED.pybin=	-e "s|@PYTHONBIN@|${PYTHONBIN}|g"
 
 post-install:
 	cd ${WRKSRC} && ${GMAKE} install_docs
 
+.include "../../graphics/graphviz/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index 207a83210a3..da47752fd97 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/10/05 12:03:50 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/05/10 00:15:49 recht Exp $
 bin/doxygen
 bin/doxytag
 share/doc/doxygen/doxygen_manual.pdf
@@ -70,6 +70,92 @@ 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/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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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
+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.md5
+share/doc/doxygen/examples/diagrams/html/inherit__graph__0.png
+share/doc/doxygen/examples/diagrams/html/inherits.html
 share/doc/doxygen/examples/diagrams_a.h
 share/doc/doxygen/examples/diagrams_b.h
 share/doc/doxygen/examples/diagrams_c.h
@@ -339,50 +425,52 @@ share/doc/doxygen/html/perlmod_tree.html
 share/doc/doxygen/html/preprocessing.html
 share/doc/doxygen/html/starting.html
 share/doc/doxygen/html/trouble.html
-@dirrm share/doc/doxygen/examples/class/html
-@dirrm share/doc/doxygen/examples/class
-@dirrm share/doc/doxygen/examples/define/html
-@dirrm share/doc/doxygen/examples/define
-@dirrm share/doc/doxygen/examples/enum/html
-@dirrm share/doc/doxygen/examples/enum
-@dirrm share/doc/doxygen/examples/file/html
-@dirrm share/doc/doxygen/examples/file
-@dirrm share/doc/doxygen/examples/func/html
-@dirrm share/doc/doxygen/examples/func
-@dirrm share/doc/doxygen/examples/page/html
-@dirrm share/doc/doxygen/examples/page
+@dirrm share/doc/doxygen/html
+@dirrm share/doc/doxygen/examples/template/html
+@dirrm share/doc/doxygen/examples/template
+@dirrm share/doc/doxygen/examples/tag/html
+@dirrm share/doc/doxygen/examples/tag
+@dirrm share/doc/doxygen/examples/structcmd/html
+@dirrm share/doc/doxygen/examples/structcmd
+@dirrm share/doc/doxygen/examples/restypedef/html
+@dirrm share/doc/doxygen/examples/restypedef
 @dirrm share/doc/doxygen/examples/relates/html
 @dirrm share/doc/doxygen/examples/relates
-@dirrm share/doc/doxygen/examples/author/html
-@dirrm share/doc/doxygen/examples/author
+@dirrm share/doc/doxygen/examples/qtstyle/html
+@dirrm share/doc/doxygen/examples/qtstyle
 @dirrm share/doc/doxygen/examples/par/html
 @dirrm share/doc/doxygen/examples/par
+@dirrm share/doc/doxygen/examples/page/html
+@dirrm share/doc/doxygen/examples/page
 @dirrm share/doc/doxygen/examples/overload/html
 @dirrm share/doc/doxygen/examples/overload
-@dirrm share/doc/doxygen/examples/example/html
-@dirrm share/doc/doxygen/examples/example
-@dirrm share/doc/doxygen/examples/include/html
-@dirrm share/doc/doxygen/examples/include
-@dirrm share/doc/doxygen/examples/qtstyle/html
-@dirrm share/doc/doxygen/examples/qtstyle
+@dirrm share/doc/doxygen/examples/memgrp/html
+@dirrm share/doc/doxygen/examples/memgrp
 @dirrm share/doc/doxygen/examples/jdstyle/html
 @dirrm share/doc/doxygen/examples/jdstyle
-@dirrm share/doc/doxygen/examples/structcmd/html
-@dirrm share/doc/doxygen/examples/structcmd
+@dirrm share/doc/doxygen/examples/include/html
+@dirrm share/doc/doxygen/examples/include
+@dirrm share/doc/doxygen/examples/group/html
+@dirrm share/doc/doxygen/examples/group
+@dirrm share/doc/doxygen/examples/func/html
+@dirrm share/doc/doxygen/examples/func
+@dirrm share/doc/doxygen/examples/file/html
+@dirrm share/doc/doxygen/examples/file
+@dirrm share/doc/doxygen/examples/example/html
+@dirrm share/doc/doxygen/examples/example
+@dirrm share/doc/doxygen/examples/enum/html
+@dirrm share/doc/doxygen/examples/enum
+@dirrm share/doc/doxygen/examples/diagrams/html
+@dirrm share/doc/doxygen/examples/diagrams
+@dirrm share/doc/doxygen/examples/define/html
+@dirrm share/doc/doxygen/examples/define
+@dirrm share/doc/doxygen/examples/class/html
+@dirrm share/doc/doxygen/examples/class
 @dirrm share/doc/doxygen/examples/autolink/html
 @dirrm share/doc/doxygen/examples/autolink
-@dirrm share/doc/doxygen/examples/restypedef/html
-@dirrm share/doc/doxygen/examples/restypedef
+@dirrm share/doc/doxygen/examples/author/html
+@dirrm share/doc/doxygen/examples/author
 @dirrm share/doc/doxygen/examples/afterdoc/html
 @dirrm share/doc/doxygen/examples/afterdoc
-@dirrm share/doc/doxygen/examples/template/html
-@dirrm share/doc/doxygen/examples/template
-@dirrm share/doc/doxygen/examples/tag/html
-@dirrm share/doc/doxygen/examples/tag
-@dirrm share/doc/doxygen/examples/group/html
-@dirrm share/doc/doxygen/examples/group
-@dirrm share/doc/doxygen/examples/memgrp/html
-@dirrm share/doc/doxygen/examples/memgrp
 @dirrm share/doc/doxygen/examples
-@dirrm share/doc/doxygen/html
 @dirrm share/doc/doxygen
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 9e6f1c85435..32c19c09660 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2004/04/15 12:52:37 martti Exp $
+$NetBSD: distinfo,v 1.12 2004/05/10 00:15:49 recht Exp $
 
-SHA1 (doxygen-1.3.6.src.tar.gz) = 69de324e57d5bf229508d1a11616fc4a4a338eb5
-Size (doxygen-1.3.6.src.tar.gz) = 2391375 bytes
+SHA1 (doxygen-1.3.7.src.tar.gz) = 81558c14661e80830e28d31f6694f67ae5ed5af8
+Size (doxygen-1.3.7.src.tar.gz) = 2391954 bytes
 SHA1 (patch-aa) = c5f0e9d025b4d4672a1ad1467bebd76506ca601d
 SHA1 (patch-ab) = 58cb9bf5d97835dc0fdda547795e92df7038d8ff
-SHA1 (patch-af) = 7e9cac0f6a10389b9f20cdc5b7e4988588216734
+SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
diff --git a/devel/doxygen/patches/patch-af b/devel/doxygen/patches/patch-af
index 1fa9d449076..b044b8668fa 100644
--- a/devel/doxygen/patches/patch-af
+++ b/devel/doxygen/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.1 2002/08/18 17:45:57 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2004/05/10 00:15:49 recht Exp $
 
---- doc/Makefile.in.orig	Tue Jul 17 06:29:48 2001
-+++ doc/Makefile.in
+--- 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 @@
  language: language.doc 
  
- language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.pl
--	$(ENV) VERSION=$(VERSION) DOXYGEN_DOCDIR=. $(PERL) translator.pl
-+	$(ENV) VERSION=$(VERSION) DOXYGEN_DOCDIR=. $(PERL) ./translator.pl
+ language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
+-	python translator.py
++	@PYTHONBIN@ translator.py
  
  FORCE: