ports/118392: [PATCH] devel/doxygen: update to 1.5.4

[Naram Qashat]

>Number:         118392
>Category:       ports
>Synopsis:       [PATCH] devel/doxygen: update to 1.5.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 03 06:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #12: Sun Oct 14 16:14:35 EDT 2007
>Description:
- Update to 1.5.4
- Add extra master site to MASTER_SITES

Removed file(s):
- files/patch-fix_with_libiconv-1.11

Port maintainer (mwisnicki+freebsd at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.77

NOTE: I'm not sure if the patch I removed is actually needed,
      which is why I removed it.  I compiled and installed it,
      and Doxygen runs with no problems.
>How-To-Repeat:
>Fix:

--- doxygen-1.5.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/doxygen/Makefile /kirby/shared/ports/doxygen/Makefile
--- /usr/ports/devel/doxygen/Makefile	Thu Oct 25 10:31:55 2007
+++ /kirby/shared/ports/doxygen/Makefile	Mon Dec  3 01:46:17 2007
@@ -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 at gmail.com
diff -ruN --exclude=CVS /usr/ports/devel/doxygen/distinfo /kirby/shared/ports/doxygen/distinfo
--- /usr/ports/devel/doxygen/distinfo	Wed Jun 13 08:55:30 2007
+++ /kirby/shared/ports/doxygen/distinfo	Mon Dec  3 00:52:33 2007
@@ -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 -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-fix_with_libiconv-1.11 /kirby/shared/ports/doxygen/files/patch-fix_with_libiconv-1.11
--- /usr/ports/devel/doxygen/files/patch-fix_with_libiconv-1.11	Wed Oct 24 19:35:14 2007
+++ /kirby/shared/ports/doxygen/files/patch-fix_with_libiconv-1.11	Wed Dec 31 19:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-md5 /kirby/shared/ports/doxygen/files/patch-md5
--- /usr/ports/devel/doxygen/files/patch-md5	Wed Jun 13 08:55:30 2007
+++ /kirby/shared/ports/doxygen/files/patch-md5	Mon Dec  3 01:26:27 2007
@@ -3,6 +3,29 @@
 
 	-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 <ctype.h>
+ #include <qregexp.h>
++#include <sys/types.h>
+ #include <md5.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -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
--- doxygen-1.5.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: