4 files changed, 25 insertions, 27 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index db222cbac689..dd64ae690357 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.7.6.1
+PORTVERSION=	1.8.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
@@ -41,8 +41,7 @@ EXTRACT_AFTER_ARGS=|${TAR} -xpf - \
 PLIST=		${WRKDIR}/plist
 TMPDOCDEST=	${WRKDIR}/tmpdocdest
 
-PLIST_FILES=	bin/doxygen \
-		bin/doxytag
+PLIST_FILES=	bin/doxygen
 
 OPTIONS=	DOXYWIZARD "Enable doxywizard" on \
 		LATEX "Enable LaTeX support" on
@@ -125,7 +124,6 @@ pre-install:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxytag ${PREFIX}/bin/
 .if !defined(WITHOUT_DOXYWIZARD)
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${PREFIX}/bin/
 .endif # !defined(WITHOUT_DOXYWIZARD)
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index ed87c1126688..50b1924fd8fc 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.7.6.1.src.tar.gz) = 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd
-SIZE (doxygen-1.7.6.1.src.tar.gz) = 4791654
+SHA256 (doxygen-1.8.0.src.tar.gz) = 70fa9034bbe964654e95bdeffcefeb28cd4bf2f73dea8b951143f3cbd19cd533
+SIZE (doxygen-1.8.0.src.tar.gz) = 5636443
diff --git a/devel/doxygen/files/patch-ah b/devel/doxygen/files/patch-ah
index 9edd9d2bd1a5..806a0c312983 100644
--- a/devel/doxygen/files/patch-ah
+++ b/devel/doxygen/files/patch-ah
@@ -1,21 +1,21 @@
---- doc/doxygen_manual.tex.orig	2011-11-17 15:18:03.000000000 -0500
-+++ doc/doxygen_manual.tex	2011-12-11 12:23:06.000000000 -0500
-@@ -12,7 +12,7 @@
- % Documents produced by Doxygen are derivative works derived from the
+--- doc/doxygen_manual.tex.orig	2012-02-11 18:34:00.000000000 -0500
++++ doc/doxygen_manual.tex	2012-03-04 13:56:33.000000000 -0500
+@@ -13,7 +13,7 @@
  % input used in their production; they are not affected by this license.
  
--\documentclass[a4paper]{report}
-+\documentclass{report}
+ \documentclass{book}
+-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
++\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
  \usepackage{makeidx}
- \usepackage{fancyhdr}
- \usepackage{float}
-@@ -24,8 +24,7 @@
- \usepackage{times}
+ \usepackage{natbib}
+ \usepackage{graphicx}
+@@ -28,8 +28,7 @@
  \usepackage{alltt}
- \usepackage{tocloft}
+ \usepackage{ifpdf}
+ \ifpdf
 -\usepackage[pdftex,
 -            pagebackref=true,
 +\usepackage[pagebackref=true,
              colorlinks=true,
-             linkcolor=blue
-            ]{hyperref}
+             linkcolor=blue,
+             unicode
diff --git a/devel/doxygen/files/patch-configure b/devel/doxygen/files/patch-configure
index 64b0ce01d482..d4402989d321 100644
--- a/devel/doxygen/files/patch-configure
+++ b/devel/doxygen/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2010-06-15 04:00:19.000000000 -0400
-+++ configure	2010-06-15 07:48:37.000000000 -0400
+--- configure.orig	2012-02-24 11:46:04.000000000 -0500
++++ configure	2012-03-04 13:58:53.000000000 -0500
 @@ -269,7 +269,7 @@
      echo "  QTDIR environment variable not set!"
      echo -n "  Checking for Qt..."
@@ -43,13 +43,13 @@
 -       echo "	\$(MAKE) -C libmd5" >> $DST
         echo "	\$(MAKE) -C src" >> $DST
         if test $f_wizard = YES; then
-          echo "	\$(MAKE) -C addon/doxywizard" >> $DST
-@@ -626,7 +625,7 @@
-      echo "  Created $DST from $SRC..."
- done
+          echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST
+@@ -629,7 +628,7 @@
+ cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxycfg.t
+ cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxygen.t
  
--f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" 
-+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in" 
+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" 
++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in" 
  
  for i in $f_inprofiles ; do
       SRC=$i