- Update devel/doxygen to 1.8.12

- Adjust plist of ports depending on it

PR:		212869

9 files changed, 25 insertions, 23 deletions

diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 8b69db300f87..5a0f92a27bd7 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cppunit
 PORTVERSION=	1.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/
 
diff --git a/devel/cppunit/pkg-plist b/devel/cppunit/pkg-plist
index d6c778143621..43545dd49ab1 100644
--- a/devel/cppunit/pkg-plist
+++ b/devel/cppunit/pkg-plist
@@ -854,8 +854,6 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/_xml_outputter_hook_8h__incl.png
 %%DOXYGEN%%%%DOCSDIR%%/html/_xml_outputter_hook_8h_source.html
 %%DOXYGEN%%%%DOCSDIR%%/html/annotated.html
-%%DOXYGEN%%%%DOCSDIR%%/html/arrowdown.png
-%%DOXYGEN%%%%DOCSDIR%%/html/arrowright.png
 %%DOXYGEN%%%%DOCSDIR%%/html/bc_s.png
 %%DOXYGEN%%%%DOCSDIR%%/html/bdwn.png
 %%DOXYGEN%%%%DOCSDIR%%/html/class_additional_message-members.html
@@ -1570,6 +1568,8 @@ share/aclocal/cppunit.m4
 %%DOXYGEN%%%%DOCSDIR%%/html/inherit_graph_9.png
 %%DOXYGEN%%%%DOCSDIR%%/html/inherits.html
 %%DOXYGEN%%%%DOCSDIR%%/html/jquery.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menu.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menudata.js
 %%DOXYGEN%%%%DOCSDIR%%/html/modules.html
 %%DOXYGEN%%%%DOCSDIR%%/html/money_example.html
 %%DOXYGEN%%%%DOCSDIR%%/html/msvc6_2testrunner_2_test_runner_8h.html
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 152c6d42eefa..318245561c9b 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doxygen
-PORTVERSION=	1.8.11
+PORTVERSION=	1.8.12
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index fb176dd322e7..fd21f8b75d43 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467043745
-SHA256 (doxygen-1.8.11.src.tar.gz) = 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049
-SIZE (doxygen-1.8.11.src.tar.gz) = 4834291
+TIMESTAMP = 1474244407
+SHA256 (doxygen-1.8.12.src.tar.gz) = 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c
+SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
diff --git a/devel/doxygen/files/patch-md5-dot b/devel/doxygen/files/patch-md5-dot
index a88947d60036..b98d4e01f9b1 100644
--- a/devel/doxygen/files/patch-md5-dot
+++ b/devel/doxygen/files/patch-md5-dot
@@ -1,4 +1,4 @@
---- src/dot.cpp.orig	2015-12-28 19:46:20 UTC
+--- src/dot.cpp.orig	2016-05-10 19:51:52 UTC
 +++ src/dot.cpp
 @@ -39,6 +39,7 @@
  #include "dirdef.h"
@@ -8,10 +8,10 @@
  #include "md5.h"
  #include "memberlist.h"
  #include "groupdef.h"
-@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D
+@@ -2271,10 +2272,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);
@@ -20,7 +20,7 @@
    bool regenerate=FALSE;
    if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
        !checkDeliverables(absImgName,absMapName))
-@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro
+@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
      }
    }
    writeGraphFooter(md5stream);
@@ -29,10 +29,10 @@
 -  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
 -  MD5SigToString(md5_sig,sigStr.rawData(),33);
 +  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
-   if (reNumber)
-   {
-     resetReNumbering();
-@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr
+   graphStr=buf.data();
+   //printf("md5: %s | file: %s\n",sigStr,baseName.data());
+   return sigStr;
+@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
    FTextStream md5stream(&theGraph);
    //m_dir->writeDepGraph(md5stream);
    writeDotDirDepGraph(md5stream,m_dir,linkRelations);
@@ -44,7 +44,7 @@
    bool regenerate=FALSE;
    if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
        !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
-@@ -4154,10 +4149,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);
@@ -56,15 +56,15 @@
    QCString absBaseName = (QCString)path+"/graph_legend";
    QCString absDotName  = absBaseName+".dot";
    QCString imgExt = getDotImageExtension();
-@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra
+@@ -4507,10 +4500,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.rawData(),33);
 +  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
    QCString imgExt = getDotImageExtension();
-   QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
+   QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
    QCString baseName    = m_diskName;
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index c3234e371c6f..542f29b648b4 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libdbusmenu-qt
 PORTVERSION=	${MAJOR_VER}.${SNAPSHOT_VER:S/.//g}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/libd/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index 0a0a4293aac6..fab8e21a259b 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -11,8 +11,6 @@ lib/libdbusmenu-qt%%QTVER_SUFFIX%%.so.2
 lib/libdbusmenu-qt%%QTVER_SUFFIX%%.so.2.6.0
 libdata/pkgconfig/dbusmenu-qt%%QTVER_SUFFIX%%.pc
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/annotated.html
-%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/arrowdown.png
-%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/arrowright.png
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/bc_s.png
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/bdwn.png
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/classDBusMenuExporter-members.html
@@ -41,6 +39,8 @@ libdata/pkgconfig/dbusmenu-qt%%QTVER_SUFFIX%%.pc
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/hierarchy.html
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/index.html
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/jquery.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/menu.js
+%%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/menudata.js
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_f.png
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_g.png
 %%DOXYGEN%%%%DOCSDIR%%%%QTVER_SUFFIX%%/nav_h.png
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index d741118944cb..373161a83d3d 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libthai
 PORTVERSION=	0.1.24
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/
 
diff --git a/devel/libthai/pkg-plist b/devel/libthai/pkg-plist
index dd1da2831d3b..23a92ecf0832 100644
--- a/devel/libthai/pkg-plist
+++ b/devel/libthai/pkg-plist
@@ -21,8 +21,6 @@ lib/libthai.so.0
 lib/libthai.so.0.2.4
 libdata/pkgconfig/libthai.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/annotated.html
-%%DOXYGEN%%%%DOCSDIR%%/html/arrowdown.png
-%%DOXYGEN%%%%DOCSDIR%%/html/arrowright.png
 %%DOXYGEN%%%%DOCSDIR%%/html/bc_s.png
 %%DOXYGEN%%%%DOCSDIR%%/html/bdwn.png
 %%DOXYGEN%%%%DOCSDIR%%/html/classes.html
@@ -58,6 +56,8 @@ libdata/pkgconfig/libthai.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_type.html
 %%DOXYGEN%%%%DOCSDIR%%/html/index.html
 %%DOXYGEN%%%%DOCSDIR%%/html/jquery.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menu.js
+%%DOXYGEN%%%%DOCSDIR%%/html/menudata.js
 %%DOXYGEN%%%%DOCSDIR%%/html/nav_f.png
 %%DOXYGEN%%%%DOCSDIR%%/html/nav_g.png
 %%DOXYGEN%%%%DOCSDIR%%/html/nav_h.png