mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

Update to 1.8.9.1

Browse Source 
PR:		196841
Submitted by:	maintainer
Mini exp-run:	self
This commit is contained in:
Antoine Brodin 2015-01-21 16:37:54 +00:00
parent 4b191cae60
commit 1db8c76e0e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=377617
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/doxygen/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= doxygen
PORTVERSION= 1.8.9
PORTVERSION= 1.8.9.1
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \

4
devel/doxygen/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (doxygen-1.8.9.src.tar.gz) = f0dd662fb98c394c20deed5b00b29d73d9bee8ea1a52f7a687dd9b70f5444fc6
SIZE (doxygen-1.8.9.src.tar.gz) = 5006046
SHA256 (doxygen-1.8.9.1.src.tar.gz) = d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec
SIZE (doxygen-1.8.9.1.src.tar.gz) = 5007458

10
devel/doxygen/files/patch-md5-definition
View File

@ -1,5 +1,5 @@
--- src/definition.cpp-orig 2014-06-11 20:09:07.000000000 +0200
+++ src/definition.cpp 2014-06-11 20:12:32.000000000 +0200
--- src/definition.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/definition.cpp
@@ -17,6 +17,7 @@
#include <ctype.h>
@ -8,7 +8,7 @@
#include "md5.h"
#include <stdio.h>
#include <stdlib.h>
@@ -539,13 +540,11 @@
@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil
bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
{
@ -18,8 +18,8 @@
// double whitespaces...
QCString docStr = doc.simplifyWhiteSpace();
- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
// name().data(),doc.data(),sigStr.data(),sigList.data());
if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it

14
devel/doxygen/files/patch-md5-dirdef
View File

@ -1,19 +1,19 @@
--- src/dirdef.cpp-orig 2014-06-11 20:11:16.000000000 +0200
+++ src/dirdef.cpp 2014-06-11 20:11:59.000000000 +0200
--- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/dirdef.cpp
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include "md5.h"
#include "dirdef.h"
@@ -83,10 +84,8 @@
QCString result;
@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd)
static QCString encodeDirName(const QCString &anchor)
{
// convert to md5 hash
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
return sigStr;
// old algorithm

32
devel/doxygen/files/patch-md5-dot
View File

@ -1,4 +1,4 @@
--- src/dot.cpp.orig 2014-12-25 12:44:06 UTC
--- src/dot.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
#include "dirdef.h"
@ -8,63 +8,63 @@
#include "md5.h"
#include "memberlist.h"
#include "groupdef.h"
@@ -2297,10 +2298,8 @@ void DotGfxHierarchyTable::createGraph(D
@@ -2296,10 +2297,8 @@ void DotGfxHierarchyTable::createGraph(D
}
writeGraphFooter(md5stream);
resetReNumbering();
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
bool regenerate=FALSE;
if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
!checkDeliverables(absImgName,absMapName))
@@ -3025,10 +3024,8 @@ QCString computeMd5Signature(DotNode *ro
@@ -3024,10 +3023,8 @@ QCString computeMd5Signature(DotNode *ro
}
}
writeGraphFooter(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
if (reNumber)
{
resetReNumbering();
@@ -3959,10 +3956,8 @@ QCString DotDirDeps::writeGraph(FTextStr
@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
QGString theGraph;
FTextStream md5stream(&theGraph);
m_dir->writeDepGraph(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
bool regenerate=FALSE;
if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4105,10 +4100,8 @@ void generateGraphLegend(const char *pat
@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
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];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
QCString absBaseName = (QCString)path+"/graph_legend";
QCString absDotName = absBaseName+".dot";
QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
@@ -4505,10 +4498,8 @@ QCString DotGroupCollaboration::writeGra
@@ -4499,10 +4492,8 @@ QCString DotGroupCollaboration::writeGra
writeGraphFooter(md5stream);
resetReNumbering();
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
QCString baseName = m_diskName;
QCString imgName = baseName+"."+imgExt;

10
devel/doxygen/files/patch-md5-memberdef
View File

@ -1,5 +1,5 @@
--- src/memberdef.cpp-orig 2014-06-11 20:17:47.000000000 +0200
+++ src/memberdef.cpp 2014-06-11 20:19:38.000000000 +0200
--- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/memberdef.cpp
@@ -17,6 +17,7 @@
#include <qglobal.h>
#include <qregexp.h>
@ -8,7 +8,7 @@
#include "md5.h"
#include "memberdef.h"
#include "membername.h"
@@ -3305,11 +3306,9 @@
@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()
}
// convert to md5 hash
@ -16,8 +16,8 @@
QCString sigStr(33);
- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
//printf("memAnchor=%s\n",memAnchor.data());
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
m_impl->anc = "a"+sigStr;
}

10
devel/doxygen/files/patch-md5-membergroup
View File

@ -1,5 +1,5 @@
--- src/membergroup.cpp-orig 2014-06-11 20:23:51.000000000 +0200
+++ src/membergroup.cpp 2014-06-11 20:24:25.000000000 +0200
--- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/membergroup.cpp
@@ -28,6 +28,7 @@
#include "docparser.h"
#include "marshal.h"
@ -8,7 +8,7 @@
#include "md5.h"
//static QCString idToName(int id)
@@ -307,12 +308,10 @@
@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b)
QCString MemberGroup::anchor() const
{
@ -17,8 +17,8 @@
QCString locHeader = grpHeader;
if (locHeader.isEmpty()) locHeader="[NOHEADER]";
- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
return "amgrp"+sigStr;
}

12
devel/doxygen/files/patch-md5-util
View File

@ -1,5 +1,5 @@
--- src/util.cpp-orig 2014-06-11 20:24:54.000000000 +0200
+++ src/util.cpp 2014-06-11 20:26:48.000000000 +0200
--- src/util.cpp.orig 2015-01-03 22:45:44 UTC
+++ src/util.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <math.h>
@ -8,15 +8,15 @@
#include "md5.h"
#include <qregexp.h>
@@ -5283,16 +5284,16 @@
@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n
if (resultLen>=128) // prevent names that cannot be created!
{
// third algorithm based on MD5 hash
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
- MD5SigToString(md5_sig,sigStr.data(),33);
+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
result=result.left(128-32)+sigStr;
}
}
@ -28,7 +28,7 @@
#if MAP_ALGO==ALGO_COUNT
// old algorithm, has the problem that after regeneration the
@@ -5323,12 +5324,13 @@
@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n
l2Dir = (dirNum>>4)&0xff;
#elif MAP_ALGO==ALGO_MD5
// third algorithm based on MD5 hash