6 files changed, 48 insertions, 9 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index da68d82fbe2f..aa83f29d9e0a 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTVERSION=	1.2.11
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
@@ -30,9 +29,17 @@ CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
 ALL_TARGET=	all docs
 .ifdef HAVE_LATEX
 ALL_TARGET+=	ps
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX \
+		dvipdfm:${PORTSDIR}/print/dvipdfm
 PLIST_SUB+=	HAVE_LATEX=""
 .else
 PLIST_SUB+=	HAVE_LATEX="@comment "
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want DVI, Postscript, and PDF documentation"
+	@${ECHO_MSG} "in addition to the HTML documentation,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make HAVE_LATEX=yes\""
+	@${ECHO_MSG}
 .endif
 .endif
 
@@ -57,8 +64,10 @@ do-install:
 		${TAR} -C ${PREFIX}/share/doc/doxygen --unlink -xf -
 .ifdef HAVE_LATEX
 	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.dvi \
-			${PREFIX}/share/doc/doxygen
-	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.ps \
+			${WRKSRC}/latex/doxygen_manual.pdf \
+			${WRKSRC}/latex/doxygen_manual.ps \
+			${WRKSRC}/latex/archoverview.eps \
+			${WRKSRC}/latex/doxygen_logo.eps \
 			${PREFIX}/share/doc/doxygen
 .endif
 .endif
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index dc766ffd9aff..fc681ab7104a 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1 +1 @@
-MD5 (doxygen-1.2.10.src.tar.gz) = 16b6d5a2ceb9629f46695cb01069f115
+MD5 (doxygen-1.2.11.src.tar.gz) = a913f6bd9771eb89682e968933369776
diff --git a/devel/doxygen/files/patch-ag b/devel/doxygen/files/patch-ag
new file mode 100644
index 000000000000..43006e01a3be
--- /dev/null
+++ b/devel/doxygen/files/patch-ag
@@ -0,0 +1,16 @@
+--- doc/Makefile.latex.orig	Mon Mar 19 14:27:39 2001
++++ doc/Makefile.latex	Sun Sep 30 17:25:54 2001
+@@ -12,10 +12,10 @@
+ # Documents produced by Doxygen are derivative works derived from the
+ # input used in their production; they are not affected by this license.
+ 
+-all: doxygen_manual.pdf
++all: doxygen_manual.ps doxygen_manual.pdf
+ 
+-doxygen_manual.pdf: doxygen_manual.ps
+-	ps2pdf doxygen_manual.ps doxygen_manual.pdf
++doxygen_manual.pdf: doxygen_manual.dvi
++	dvipdfm -o doxygen_manual.pdf doxygen_manual.dvi
+ 
+ doxygen_manual.ps: doxygen_manual.dvi
+ 	dvips -o doxygen_manual.ps doxygen_manual.dvi
diff --git a/devel/doxygen/files/patch-ah b/devel/doxygen/files/patch-ah
new file mode 100644
index 000000000000..30e4a3d5da38
--- /dev/null
+++ b/devel/doxygen/files/patch-ah
@@ -0,0 +1,12 @@
+--- doc/doxygen_manual.tex.orig	Tue Sep 11 12:56:42 2001
++++ doc/doxygen_manual.tex	Sun Sep 30 17:32:23 2001
+@@ -12,8 +12,7 @@
+ % Documents produced by Doxygen are derivative works derived from the
+ % input used in their production; they are not affected by this license.
+ 
+-\documentclass[a4paper,ps2pdf]{article}
+-\usepackage{a4wide}
++\documentclass{article}
+ \usepackage{makeidx}
+ \usepackage{fancyhdr}
+ \usepackage{float}
diff --git a/devel/doxygen/pkg-descr b/devel/doxygen/pkg-descr
index 7d08bf693b5e..bd4cb851ff26 100644
--- a/devel/doxygen/pkg-descr
+++ b/devel/doxygen/pkg-descr
@@ -3,7 +3,4 @@ class browser (in HTML) and/or an off-line reference manual (in LaTeX) from a
 set of documented source files. The documentation is extracted directly from
 the sources.
 
-WWW: http://www.stack.nl/~dimitri/doxygen/
-
-Joep Grooten
-joep@di.nl
+WWW: http://www.doxygen.org/
diff --git a/devel/doxygen/pkg-plist b/devel/doxygen/pkg-plist
index caad4fdf6dc1..90e934f4dad4 100644
--- a/devel/doxygen/pkg-plist
+++ b/devel/doxygen/pkg-plist
@@ -2,7 +2,10 @@ bin/doxygen
 bin/doxytag
 bin/doxysearch
 bin/doxywizard
+%%PORTDOCS%%%%HAVE_LATEX%%share/doc/doxygen/archoverview.eps
+%%PORTDOCS%%%%HAVE_LATEX%%share/doc/doxygen/doxygen_logo.eps
 %%PORTDOCS%%%%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.dvi
+%%PORTDOCS%%%%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.pdf
 %%PORTDOCS%%%%HAVE_LATEX%%share/doc/doxygen/doxygen_manual.ps
 %%PORTDOCS%%share/doc/doxygen/examples/afterdoc.cfg
 %%PORTDOCS%%share/doc/doxygen/examples/afterdoc.h
@@ -298,6 +301,8 @@ bin/doxywizard
 %%PORTDOCS%%share/doc/doxygen/examples/template/html/functions.html
 %%PORTDOCS%%share/doc/doxygen/examples/template/html/hierarchy.html
 %%PORTDOCS%%share/doc/doxygen/examples/template/html/index.html
+%%PORTDOCS%%share/doc/doxygen/html/arch.html
+%%PORTDOCS%%share/doc/doxygen/html/archoverview.gif
 %%PORTDOCS%%share/doc/doxygen/html/autolink.html
 %%PORTDOCS%%share/doc/doxygen/html/commands.html
 %%PORTDOCS%%share/doc/doxygen/html/config.html