Update to 1.8.3.

Changes

    Expanding the tree in an index page of the HTML output, will
    now expand only one level instead of the whole sub-tree (thanks
    to Pez Cuckow for the patch).
    A blockquote in Markdown does no longer require a whitespace
    after the last '>' if the '>' is followed by a newline.
    id 682718: Included patch to add version info to all generated
    template files (headers, footers, stylesheets, layout files,
    etc).

New features

    Added support for using external tools to index and search
    through the HTML documentation. An example index tool is provided
    (doxyindexer) and an example search engine (doxysearch.cgi).
    To configure the external search engine the following new
    options are added to the configuration file: EXTERNAL_SEARCH
    (to enable the feature), SEARCHENGINE_URL (to specify the URL
    of the search engine), SEARCHDATA_FILE (to specify the name of
    the raw search data to index), EXTRA_SEARCH_MAPPINGS (for search
    through multiple projects). See the manual for details.
    Added USE_MDFILE_AS_MAINPAGE config option to select a markdown
    page to be used as the main page.
    id 630645: This patch (contributed by Albert) adds support for
    simple logic expressions for \cond, \if, and friends, i.e. you
    can do \if (SOME_SECTION_NAME && (!THIS_ALTERNATIVE ||
    THAT_ALTERNATIVE))
    id 684152: Patch (contributed by Albert) adds a new configuration
    option MATHJAX_FORMAT to select the MathJax output format.
    Options are HTML-CSS, NativeMML, or SVG.

4 files changed, 22 insertions, 17 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index b1e1cfb2037..2f09eadd9d2 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2012/10/31 11:16:54 asau Exp $
+# $NetBSD: Makefile,v 1.95 2013/01/06 01:00:58 wiz Exp $
 
-DISTNAME=	doxygen-1.8.2.src
+DISTNAME=	doxygen-1.8.3.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index 9678ded45b3..3c7f6bdd31b 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2012/08/30 07:57:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2013/01/06 01:00:58 wiz Exp $
 bin/doxygen
 man/man1/doxygen.1
 ${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf
@@ -1427,6 +1427,7 @@ ${PLIST.latex}share/doc/doxygen/html/custcmd.html
 ${PLIST.latex}share/doc/doxygen/html/customize.html
 ${PLIST.latex}share/doc/doxygen/html/diagrams.html
 ${PLIST.latex}share/doc/doxygen/html/docblocks.html
+${PLIST.latex}share/doc/doxygen/html/dot_inline_dotgraph_1.png
 ${PLIST.latex}share/doc/doxygen/html/doxygen.png
 ${PLIST.latex}share/doc/doxygen/html/doxygen_logo.gif
 ${PLIST.latex}share/doc/doxygen/html/doxygen_logo_low.gif
@@ -1442,10 +1443,14 @@ ${PLIST.latex}share/doc/doxygen/html/doxywizard_page4.png
 ${PLIST.latex}share/doc/doxygen/html/doxywizard_usage.html
 ${PLIST.latex}share/doc/doxygen/html/dynsections.js
 ${PLIST.latex}share/doc/doxygen/html/external.html
+${PLIST.latex}share/doc/doxygen/html/extsearch.html
 ${PLIST.latex}share/doc/doxygen/html/faq.html
 ${PLIST.latex}share/doc/doxygen/html/features.html
 ${PLIST.latex}share/doc/doxygen/html/form_0.png
 ${PLIST.latex}share/doc/doxygen/html/form_1.png
+${PLIST.latex}share/doc/doxygen/html/form_10.png
+${PLIST.latex}share/doc/doxygen/html/form_11.png
+${PLIST.latex}share/doc/doxygen/html/form_12.png
 ${PLIST.latex}share/doc/doxygen/html/form_2.png
 ${PLIST.latex}share/doc/doxygen/html/form_3.png
 ${PLIST.latex}share/doc/doxygen/html/form_4.png
@@ -1453,6 +1458,7 @@ ${PLIST.latex}share/doc/doxygen/html/form_5.png
 ${PLIST.latex}share/doc/doxygen/html/form_6.png
 ${PLIST.latex}share/doc/doxygen/html/form_7.png
 ${PLIST.latex}share/doc/doxygen/html/form_8.png
+${PLIST.latex}share/doc/doxygen/html/form_9.png
 ${PLIST.latex}share/doc/doxygen/html/formula.repository
 ${PLIST.latex}share/doc/doxygen/html/formulas.html
 ${PLIST.latex}share/doc/doxygen/html/ftv2blank.png
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 0450ef65e69..d204672ec8e 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.46 2012/08/30 07:57:51 drochner Exp $
+$NetBSD: distinfo,v 1.47 2013/01/06 01:00:58 wiz Exp $
 
-SHA1 (doxygen-1.8.2.src.tar.gz) = 7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a
-RMD160 (doxygen-1.8.2.src.tar.gz) = d3a04dbfb1cc08461e03d02f3ee5544c8b7b5fc7
-Size (doxygen-1.8.2.src.tar.gz) = 6063256 bytes
+SHA1 (doxygen-1.8.3.src.tar.gz) = e74240f445e08b782fa7a3de5f0b333901307587
+RMD160 (doxygen-1.8.3.src.tar.gz) = fa1fa1c38dc1d26104b5c4e9cbb9e118f830378d
+Size (doxygen-1.8.3.src.tar.gz) = 6106980 bytes
 SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
-SHA1 (patch-ab) = 52b932d05f049b454d06fa08c9a219f55829161a
+SHA1 (patch-ab) = 1bd196c38786bb6b0b1817bb9575924ca234aee3
 SHA1 (patch-ac) = 87c68a2ce598c10d90d775764f4c05739eb51435
 SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
 SHA1 (patch-ah) = db6f117bf1faa3a1ed0b2ca9af81fc4f8d0913f9
diff --git a/devel/doxygen/patches/patch-ab b/devel/doxygen/patches/patch-ab
index 4dab7751e31..9322b7e9a53 100644
--- a/devel/doxygen/patches/patch-ab
+++ b/devel/doxygen/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.12 2012/07/03 11:31:35 mef Exp $
+$NetBSD: patch-ab,v 1.13 2013/01/06 01:00:59 wiz Exp $
 
 Convert $(INSTTOOL) to pkgsrc style Variables
 
---- Makefile.in.orig	2012-02-21 06:00:49.000000000 +0900
-+++ Makefile.in	2012-06-23 11:59:42.000000000 +0900
-@@ -47,19 +47,19 @@
+--- Makefile.in.orig	2012-12-25 12:17:27.000000000 +0000
++++ Makefile.in
+@@ -56,19 +56,19 @@ DATE=$(shell date "+%B %Y")
  MAN1DIR = man/man1
  
- install: doxywizard_install 
+ install: doxywizard_install doxysearch_install
 -	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
--	$(INSTTOOL) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
+-	$(INSTTOOL) -m 755 bin/doxygen        $(DESTDIR)/$(INSTALL)/bin
 -	$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
 +	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)/$(INSTALL)/bin
-+	$(BSD_INSTALL_PROGRAM) -m 755 bin/doxygen    $(DESTDIR)/$(INSTALL)/bin
++	$(BSD_INSTALL_PROGRAM) bin/doxygen        $(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 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
@@ -26,7 +26,7 @@ Convert $(INSTTOOL) to pkgsrc style Variables
  	$(MAKE) -C doc 
  	$(MAKE) -C latex 
 -	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
++	$(BSD_INSTALL_DATA) latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
  	cp -r examples $(DESTDIR)/$(DOCDIR)
  	cp -r html $(DESTDIR)/$(DOCDIR)