3 files changed, 43 insertions, 54 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 705d2b9b2b5d..15867e9a82ea 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	1.7.5.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
@@ -16,12 +15,12 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	A documentation system for C, C++ and other languages
 
-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
+
 USE_BISON=	build
 USE_ICONV=	yes
 ALL_TARGET=	all
@@ -32,6 +31,7 @@ QT_NONSTANDARD=	yes	# non-standard configure arguments
 CONFIGURE_ARGS=	--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
 		--install "${INSTALL}"
 MAKE_JOBS_UNSAFE=	yes
+REINPLACE_ARGS=	-i ''
 
 EXTRACT_AFTER_ARGS=|${TAR} -xpf - \
 		--exclude '*/libmd5'	\
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 87a20d15f055..4b3bb443403d 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.7.3.src.tar.gz) = c7857d246f75ea287328023a6af71dec8f45a765932a86fcfcc951920a647766
-SIZE (doxygen-1.7.3.src.tar.gz) = 4507887
+SHA256 (doxygen-1.7.5.1.src.tar.gz) = fdaec929502e3c4490bfcc87b48a916dab29310d3c7ef88d06f2806436e9ccd0
+SIZE (doxygen-1.7.5.1.src.tar.gz) = 4689511
diff --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5
index 46ceaa8b5e40..5474f0f4d0e2 100644
--- a/devel/doxygen/files/patch-md5
+++ b/devel/doxygen/files/patch-md5
@@ -1,17 +1,11 @@
-Every other package these days seems to come with its own MD5
-implementation. Try to trim this insanity, where we can...
-
-	-mi
-
-diff -ruN src/definition.cpp src/definition.cpp
---- src/definition.cpp.orig	2010-09-11 08:17:27.000000000 -0400
-+++ src/definition.cpp	2010-10-10 22:53:55.000000000 -0400
+--- src/definition.cpp.orig	2011-08-19 15:34:17.000000000 +0800
++++ src/definition.cpp	2011-10-31 17:32:47.870380518 +0800
 @@ -18,6 +18,7 @@
  #include "qtbc.h"
  #include <ctype.h>
  #include <qregexp.h>
 +#include <sys/types.h>
- #include <md5.h>
+ #include "md5.h"
  #include <stdio.h>
  #include <stdlib.h>
 @@ -361,13 +362,11 @@
@@ -29,12 +23,11 @@ diff -ruN src/definition.cpp src/definition.cpp
    if (m_impl->docSignatures.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
    {
      m_impl->docSignatures+=":"+sigStr;
-diff -ruN src/dirdef.cpp src/dirdef.cpp
---- src/dirdef.cpp.orig	2010-07-27 14:26:29.000000000 -0400
-+++ src/dirdef.cpp	2010-10-10 22:56:08.000000000 -0400
+--- src/dirdef.cpp.orig	2011-07-26 19:54:31.000000000 +0800
++++ src/dirdef.cpp	2011-10-31 17:32:47.872380214 +0800
 @@ -1,3 +1,4 @@
 +#include <sys/types.h>
- #include <md5.h>
+ #include "md5.h"
  
  #include "dirdef.h"
 @@ -75,10 +76,8 @@
@@ -49,18 +42,17 @@ diff -ruN src/dirdef.cpp src/dirdef.cpp
    return sigStr;
  
    // old algorithm
-diff -ruN src/dot.cpp src/dot.cpp
---- src/dot.cpp.orig	2010-08-10 14:30:49.000000000 -0400
-+++ src/dot.cpp	2010-10-10 22:59:36.000000000 -0400
+--- src/dot.cpp.orig	2011-08-09 02:06:19.000000000 +0800
++++ src/dot.cpp	2011-10-31 17:32:47.877389789 +0800
 @@ -39,6 +39,7 @@
  #include <qdir.h>
  #include <qfile.h>
  #include "ftextstream.h"
 +#include <sys/types.h>
- #include <md5.h>
+ #include "md5.h"
  #include <qqueue.h>
  
-@@ -1610,10 +1611,8 @@
+@@ -2063,10 +2064,8 @@
      }
      writeGraphFooter(md5stream);
      resetReNumbering();
@@ -72,7 +64,7 @@ diff -ruN src/dot.cpp src/dot.cpp
      bool regenerate=FALSE;
      if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
          !checkDeliverables(absImgName,absMapName))
-@@ -2271,10 +2270,8 @@
+@@ -2758,10 +2757,8 @@
      }
    }
    writeGraphFooter(md5stream);
@@ -84,7 +76,7 @@ diff -ruN src/dot.cpp src/dot.cpp
    if (reNumber)
    {
      resetReNumbering();
-@@ -3065,10 +3062,8 @@
+@@ -3609,10 +3606,8 @@
    QGString theGraph;
    FTextStream md5stream(&theGraph);
    m_dir->writeDepGraph(md5stream);
@@ -96,8 +88,8 @@ diff -ruN src/dot.cpp src/dot.cpp
    bool regenerate=FALSE;
    if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
        !checkDeliverables(format==BITMAP ? absImgName :
-@@ -3178,10 +3173,8 @@
-   md5stream << "  Node18 -> Node9 [dir=back,color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
+@@ -3739,10 +3734,8 @@
+   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
    md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
    writeGraphFooter(md5stream);
 -  uchar md5_sig[16];
@@ -108,7 +100,7 @@ diff -ruN src/dot.cpp src/dot.cpp
    QCString absBaseName = (QCString)path+"/graph_legend";
    QCString absDotName  = absBaseName+".dot";
    QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
-@@ -3545,10 +3538,8 @@
+@@ -4139,10 +4132,8 @@
  
    writeGraphFooter(md5stream);
    resetReNumbering();
@@ -120,9 +112,8 @@ diff -ruN src/dot.cpp src/dot.cpp
    QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
    QCString baseName    = m_diskName;
    QCString imgName     = baseName+"."+imgExt;
-diff -ruN src/doxygen.pro.in src/doxygen.pro.in
---- src/doxygen.pro.in.orig	2010-05-08 04:57:08.000000000 -0400
-+++ src/doxygen.pro.in	2010-06-15 07:58:47.000000000 -0400
+--- src/doxygen.pro.in.orig	2011-01-04 04:14:46.000000000 +0800
++++ src/doxygen.pro.in	2011-10-31 17:32:47.879381383 +0800
 @@ -18,7 +18,7 @@
  CONFIG       =	console warn_on $extraopts
  HEADERS      =	doxygen.h 
@@ -141,33 +132,32 @@ diff -ruN src/doxygen.pro.in src/doxygen.pro.in
  DESTDIR                    =  ../bin
  TARGET                     =  doxygen
  unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-diff -ruN src/memberdef.cpp src/memberdef.cpp
---- src/memberdef.cpp.orig	2010-09-10 17:27:09.000000000 -0400
-+++ src/memberdef.cpp	2010-10-10 23:02:53.000000000 -0400
-@@ -18,6 +18,7 @@
- #include <stdio.h>
+--- src/memberdef.cpp.orig	2011-08-18 22:46:40.000000000 +0800
++++ src/memberdef.cpp	2011-10-31 17:35:14.027187598 +0800
+@@ -19,6 +19,7 @@
+ #include <qglobal.h>
  #include <qregexp.h>
  #include <assert.h>
 +#include <sys/types.h>
- #include <md5.h>
+ #include "md5.h"
  #include "memberdef.h"
  #include "membername.h"
-@@ -2556,10 +2557,8 @@
-   memAnchor.prepend(definition());
+@@ -2771,11 +2772,9 @@
+   }
    
    // convert to md5 hash
 -  uchar md5_sig[16];
    QCString sigStr(33);
 -  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
 +  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());
+   //printf("memAnchor=%s\n",memAnchor.data());
+-  MD5SigToString(md5_sig,sigStr.data(),33);
    m_impl->anc = "a"+sigStr;
  }
  
-diff -ruN src/membergroup.cpp src/membergroup.cpp
---- src/membergroup.cpp.orig	2010-07-29 14:51:15.000000000 -0400
-+++ src/membergroup.cpp	2010-10-10 23:04:12.000000000 -0400
-@@ -262,12 +262,10 @@
+--- src/membergroup.cpp.orig	2011-04-22 18:08:07.000000000 +0800
++++ src/membergroup.cpp	2011-10-31 17:32:47.886381993 +0800
+@@ -265,12 +265,10 @@
  
  QCString MemberGroup::anchor() const
  {
@@ -181,18 +171,17 @@ diff -ruN src/membergroup.cpp src/membergroup.cpp
    return "amgrp"+sigStr;
  }
  
-diff -ruN src/util.cpp src/util.cpp
---- src/util.cpp.orig	2010-09-11 13:54:37.000000000 -0400
-+++ src/util.cpp	2010-10-10 23:08:11.000000000 -0400
-@@ -19,6 +19,7 @@
- #include <ctype.h>
+--- src/util.cpp.orig	2011-08-19 23:11:12.000000000 +0800
++++ src/util.cpp	2011-10-31 17:32:47.892382197 +0800
+@@ -20,6 +20,7 @@
  #include <errno.h>
+ #include <math.h>
  
 +#include <sys/types.h>
- #include <md5.h>
+ #include "md5.h"
  
  #include "qtbc.h"
-@@ -4922,16 +4923,16 @@
+@@ -4901,16 +4902,16 @@
      if (resultLen>=128) // prevent names that cannot be created!
      {
        // third algorithm based on MD5 hash
@@ -212,7 +201,7 @@ diff -ruN src/util.cpp src/util.cpp
  
  #if MAP_ALGO==ALGO_COUNT 
      // old algorithm, has the problem that after regeneration the
-@@ -4962,12 +4963,13 @@
+@@ -4941,12 +4942,13 @@
      l2Dir = (dirNum>>4)&0xff;
  #elif MAP_ALGO==ALGO_MD5
      // third algorithm based on MD5 hash