Index: head/devel/doxygen/Makefile =================================================================== --- head/devel/doxygen/Makefile (revision 377616) +++ head/devel/doxygen/Makefile (revision 377617) @@ -1,124 +1,124 @@ # Created by: Joep Grooten # $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/ \ http://ftp.stack.nl/pub/users/dimitri/ EXTRACT_SUFX= .src.tar.gz MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake \ ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= bison gmake iconv perl5 python:2 ALL_TARGET= all HAS_CONFIGURE= yes QT_NONSTANDARD= yes # non-standard configure arguments CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \ --install "${INSTALL}" --flex ${LOCALBASE}/bin/flex REINPLACE_ARGS= -i '' EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \ --exclude '*/libpng' \ --exclude '*/tmake' PLIST= ${WRKDIR}/plist TMPDOCDEST= ${WRKDIR}/tmpdocdest PLIST_FILES= bin/doxygen OPTIONS_DEFINE= GRAPHVIZ LATEX QT4 HTMLDOCS PDFDOCS OPTIONS_DEFAULT= GRAPHVIZ LATEX QT4_DESC= Install Doxywizard GUI HTMLDOCS_DESC= Install documentation in HTML format PDFDOCS_DESC= Install documentation in PDF format GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz LATEX_USE= TEX=base,dvipsk,pdftex QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build QT4_CONFIGURE_ENV= QTDIR="${QTDIR}" QT4_CONFIGURE_ON= --with-doxywizard QT4_PLIST_FILES= bin/doxywizard HTMLDOCS_ALL_TARGET= docs HTMLDOCS_BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz PDFDOCS_ALL_TARGET= pdf PDFDOCS_MAKE_ARGS= HAVE_LATEX=yes .include .if ${PORT_OPTIONS:MPDFDOCS} && \ (empty(PORT_OPTIONS:MHTMLDOCS) || empty(PORT_OPTIONS:MLATEX)) IGNORE= PDFDOCS option requires HTMLDOCS and LATEX options to be set .endif .if ${PORT_OPTIONS:MPDFDOCS} USE_GHOSTSCRIPT_BUILD= yes .endif .if ${PORT_OPTIONS:MQT4} # Need this in env for the build QTDIR?= ${QT_PREFIX} .endif pre-configure: @cd ${WRKSRC}; for pro in src/*.pro.in \ addon/doxywizard/doxywizard.pro.in; do \ ${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done @${CHMOD} +x ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e 's|TMAKE *=.*|TMAKE=${LOCALBASE}/bin/tmake|' \ -e 's|TMAKEPATH *=.*|TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++|' \ ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \ ${WRKSRC}/addon/doxywizard/Makefile post-build: ${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/examples all pre-install: ${RM} -rf ${TMPDOCDEST} ${PLIST} ${TOUCH} ${PLIST} .if ${PORT_OPTIONS:MHTMLDOCS} ${MKDIR} ${TMPDOCDEST}/doxygen ${RM} -f ${WRKSRC}/examples/diagrams/html/*.md5 \ ${WRKSRC}/examples/diagrams/html/*.map ${TAR} -C ${WRKSRC} --exclude '*/_*' -cf - html \ | ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf - ${TAR} -C ${WRKSRC} --exclude '*/Makefile*' --exclude '*.dot' \ -cf - examples \ | ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf - .if ${PORT_OPTIONS:MPDFDOCS} ${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.pdf \ ${WRKSRC}/latex/archoverview.eps \ ${TMPDOCDEST}/doxygen .endif @cd ${TMPDOCDEST} \ && ${FIND} -s * -type f -o -type l \ | ${SED} -e 's|^|share/doc/|' >> ${PLIST} .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MQT4} ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MHTMLDOCS} ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/doxygen ${TAR} -C ${TMPDOCDEST} -cf - doxygen \ | ${TAR} -C ${STAGEDIR}${PREFIX}/share/doc --unlink -xf - .endif .include Index: head/devel/doxygen/distinfo =================================================================== --- head/devel/doxygen/distinfo (revision 377616) +++ head/devel/doxygen/distinfo (revision 377617) @@ -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 Index: head/devel/doxygen/files/patch-md5-definition =================================================================== --- head/devel/doxygen/files/patch-md5-definition (revision 377616) +++ head/devel/doxygen/files/patch-md5-definition (revision 377617) @@ -1,25 +1,25 @@ ---- 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 #include +#include #include "md5.h" #include #include -@@ -539,13 +540,11 @@ +@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList) { - uchar md5_sig[16]; QCString sigStr(33); // to avoid mismatches due to differences in indenting, we first remove // 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 Index: head/devel/doxygen/files/patch-md5-dirdef =================================================================== --- head/devel/doxygen/files/patch-md5-dirdef (revision 377616) +++ head/devel/doxygen/files/patch-md5-dirdef (revision 377617) @@ -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 #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 Index: head/devel/doxygen/files/patch-md5-dot =================================================================== --- head/devel/doxygen/files/patch-md5-dot (revision 377616) +++ head/devel/doxygen/files/patch-md5-dot (revision 377617) @@ -1,70 +1,70 @@ ---- 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" #include "vhdldocgen.h" #include "ftextstream.h" +#include #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; Index: head/devel/doxygen/files/patch-md5-memberdef =================================================================== --- head/devel/doxygen/files/patch-md5-memberdef (revision 377616) +++ head/devel/doxygen/files/patch-md5-memberdef (revision 377617) @@ -1,23 +1,23 @@ ---- 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 #include #include +#include #include "md5.h" #include "memberdef.h" #include "membername.h" -@@ -3305,11 +3306,9 @@ +@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor() } // convert to md5 hash - uchar md5_sig[16]; 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; } Index: head/devel/doxygen/files/patch-md5-membergroup =================================================================== --- head/devel/doxygen/files/patch-md5-membergroup (revision 377616) +++ head/devel/doxygen/files/patch-md5-membergroup (revision 377617) @@ -1,24 +1,24 @@ ---- 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" #include "entry.h" +#include #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 { - uchar md5_sig[16]; QCString sigStr(33); 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; } Index: head/devel/doxygen/files/patch-md5-util =================================================================== --- head/devel/doxygen/files/patch-md5-util (revision 377616) +++ head/devel/doxygen/files/patch-md5-util (revision 377617) @@ -1,48 +1,48 @@ ---- 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 #include +#include #include "md5.h" #include -@@ -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; } } if (createSubdirs) { +#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16 int l1Dir=0,l2Dir=0; +#endif #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 - uchar md5_sig[16]; - MD5Buffer((const unsigned char *)result.data(),result.length(),md5_sig); - l1Dir = md5_sig[14]&0xf; - l2Dir = md5_sig[15]; + char md5[33]; + MD5Data((const unsigned char *)result.data(),result.length(),md5); + result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31])); #endif +#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16 result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir)); +#endif } //printf("*** convertNameToFile(%s)->%s\n",name,result.data()); return result;