From 2ad06fe91b12d2966790a3ebfef93c2bffdb81f8 Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 11 Dec 2007 21:46:34 +0000 Subject: Update to 1.5.4. PR: ports/118392 Submitted by: Naram Qashat Approved by: maintainer --- devel/doxygen/Makefile | 5 +++-- devel/doxygen/distinfo | 6 +++--- devel/doxygen/files/patch-fix_with_libiconv-1.11 | 11 ----------- devel/doxygen/files/patch-md5 | 25 +++++++++++++++++++++++- 4 files changed, 30 insertions(+), 17 deletions(-) delete mode 100644 devel/doxygen/files/patch-fix_with_libiconv-1.11 diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 9d97b157186..afc166a1149 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -6,9 +6,10 @@ # PORTNAME= doxygen -PORTVERSION= 1.5.2 +PORTVERSION= 1.5.4 CATEGORIES= devel -MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ +MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ + http://ftp.stack.nl/pub/users/dimitri/ EXTRACT_SUFX= .src.tar.gz MAINTAINER= mwisnicki+freebsd@gmail.com diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo index 1d0b0adce8c..9c975e32f32 100644 --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -1,3 +1,3 @@ -MD5 (doxygen-1.5.2.src.tar.gz) = f2782e5bd31a7d10b092500bf0d96ae2 -SHA256 (doxygen-1.5.2.src.tar.gz) = 496220360b92de6169458b282a8faa32065f71db26d33fb9dc291178fc75381d -SIZE (doxygen-1.5.2.src.tar.gz) = 3599976 +MD5 (doxygen-1.5.4.src.tar.gz) = 10ffe8d445dc1bf7dd69292b266906ff +SHA256 (doxygen-1.5.4.src.tar.gz) = 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2 +SIZE (doxygen-1.5.4.src.tar.gz) = 3762535 diff --git a/devel/doxygen/files/patch-fix_with_libiconv-1.11 b/devel/doxygen/files/patch-fix_with_libiconv-1.11 deleted file mode 100644 index 64c98676d9a..00000000000 --- a/devel/doxygen/files/patch-fix_with_libiconv-1.11 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/portable.cpp.orig 2007-10-11 14:27:23.000000000 -0500 -+++ src/portable.cpp 2007-10-11 14:28:15.000000000 -0500 -@@ -378,7 +378,7 @@ - #else - #define CASTNEEDED(x) (char **)(x) - #endif -- return iconv(cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft); -+ return iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft); - } - - int portable_iconv_close (void *cd) diff --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5 index 27c21819fe7..74ebf3d3a5d 100644 --- a/devel/doxygen/files/patch-md5 +++ b/devel/doxygen/files/patch-md5 @@ -3,6 +3,29 @@ implementation. Try to trim this insanity, where we can... -mi +diff -ruN src/definition.cpp src/definition.cpp +--- src/definition.cpp Sat Sep 1 13:11:48 2007 ++++ src/definition.cpp Mon Dec 3 01:25:59 2007 +@@ -18,6 +18,7 @@ + #include "qtbc.h" + #include + #include ++#include + #include + #include + #include +@@ -352,10 +353,8 @@ + + bool Definition::_docsAlreadyAdded(const QString &doc) + { +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)doc.data(),doc.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char*)doc.data(),doc.length(),sigStr.data()); + 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 Sun Jan 28 13:28:50 2007 +++ src/dirdef.cpp Mon Jun 11 18:32:26 2007 @@ -150,4 +173,4 @@ diff -ruN src/util.cpp src/util.cpp +#endif } return result; - } \ No newline at end of file + } -- cgit