Index: Makefile =================================================================== --- Makefile (revision 419269) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= doxygen -PORTVERSION= 1.8.10 -PORTREVISION= 3 +PORTVERSION= 1.8.11 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ @@ -20,6 +19,8 @@ ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} REINPLACE_ARGS= -i '' +# I need to look into why it doesn't work with parallel jobs +MAKE_JOBS_UNSAFE= yes EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \ --exclude '*/libpng' \ Index: distinfo =================================================================== --- distinfo (revision 419269) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (doxygen-1.8.10.src.tar.gz) = cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 -SIZE (doxygen-1.8.10.src.tar.gz) = 4818276 +TIMESTAMP = 1467043745 +SHA256 (doxygen-1.8.11.src.tar.gz) = 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 +SIZE (doxygen-1.8.11.src.tar.gz) = 4834291 Index: files/patch-cmake_run__translator.cmake =================================================================== --- files/patch-cmake_run__translator.cmake (revision 419269) +++ files/patch-cmake_run__translator.cmake (nonexistent) @@ -1,10 +0,0 @@ ---- cmake/run_translator.cmake.orig 2015-05-31 21:24:49 UTC -+++ cmake/run_translator.cmake -@@ -1,5 +1,5 @@ - include(${SOURCE}/cmake/version.cmake) --find_program(PYTHON NAMES python) -+find_package(PythonInterp) - execute_process( -- COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/translator.py -+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/translator.py - ) Property changes on: files/patch-cmake_run__translator.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-doc_CMakeLists.txt =================================================================== --- files/patch-doc_CMakeLists.txt (nonexistent) +++ files/patch-doc_CMakeLists.txt (working copy) @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt.orig 2015-09-01 12:42:06 UTC ++++ doc/CMakeLists.txt +@@ -169,7 +169,7 @@ install(FILES + "${PROJECT_BINARY_DIR}/man/doxywizard.1" + "${PROJECT_BINARY_DIR}/man/doxysearch.1" + "${PROJECT_BINARY_DIR}/man/doxyindexer.1" +- DESTINATION share/man/man1 ++ DESTINATION man/man1 + ) + + install(FILES Property changes on: files/patch-doc_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-md5-dot =================================================================== --- files/patch-md5-dot (revision 419269) +++ files/patch-md5-dot (working copy) @@ -1,4 +1,4 @@ ---- src/dot.cpp.orig 2015-03-15 12:15:52 UTC +--- src/dot.cpp.orig 2015-12-28 19:46:20 UTC +++ src/dot.cpp @@ -39,6 +39,7 @@ #include "dirdef.h" @@ -8,7 +8,7 @@ #include "md5.h" #include "memberlist.h" #include "groupdef.h" -@@ -2311,10 +2312,8 @@ void DotGfxHierarchyTable::createGraph(D +@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D } writeGraphFooter(md5stream); resetReNumbering(); @@ -20,7 +20,7 @@ bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(absImgName,absMapName)) -@@ -3073,10 +3072,8 @@ QCString computeMd5Signature(DotNode *ro +@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro } } writeGraphFooter(md5stream); @@ -32,10 +32,10 @@ if (reNumber) { resetReNumbering(); -@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr - QGString theGraph; +@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr FTextStream md5stream(&theGraph); - m_dir->writeDepGraph(md5stream); + //m_dir->writeDepGraph(md5stream); + writeDotDirDepGraph(md5stream,m_dir,linkRelations); - uchar md5_sig[16]; QCString sigStr(33); - MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); @@ -44,7 +44,7 @@ bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName : -@@ -4152,10 +4147,8 @@ void generateGraphLegend(const char *pat +@@ -4154,10 +4149,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,7 +56,7 @@ QCString absBaseName = (QCString)path+"/graph_legend"; QCString absDotName = absBaseName+".dot"; QCString imgExt = getDotImageExtension(); -@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra +@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra writeGraphFooter(md5stream); resetReNumbering(); Index: files/patch-src_code.l =================================================================== --- files/patch-src_code.l (revision 419269) +++ files/patch-src_code.l (nonexistent) @@ -1,11 +0,0 @@ ---- src/code.l.orig 2015-05-31 19:01:12 UTC -+++ src/code.l -@@ -3695,7 +3695,7 @@ void codeFreeScanner() - extern "C" { // some bogus code to keep the compiler happy - void codeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - Property changes on: files/patch-src_code.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_commentscan.l =================================================================== --- files/patch-src_commentscan.l (revision 419269) +++ files/patch-src_commentscan.l (nonexistent) @@ -1,20 +0,0 @@ ---- src/commentscan.l.orig 2015-05-31 19:01:12 UTC -+++ src/commentscan.l -@@ -1103,7 +1103,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" - // but we need to know the position in the input buffer where this - // rule matched. - // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE --#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 -+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6 - inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf); - #else - inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf); -@@ -1165,7 +1165,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" - g_memberGroupHeader.resize(0); - parseMore=TRUE; - needNewEntry = TRUE; --#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 -+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6 - inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext); - #else - inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext); Property changes on: files/patch-src_commentscan.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_fortrancode.l =================================================================== --- files/patch-src_fortrancode.l (revision 419269) +++ files/patch-src_fortrancode.l (nonexistent) @@ -1,11 +0,0 @@ ---- src/fortrancode.l.orig 2015-11-19 06:39:17 UTC -+++ src/fortrancode.l -@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterfac - extern "C" { // some bogus code to keep the compiler happy - void fortrancodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #else - extern "C" { // some bogus code to keep the compiler happy Property changes on: files/patch-src_fortrancode.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_pycode.l =================================================================== --- files/patch-src_pycode.l (revision 419269) +++ files/patch-src_pycode.l (nonexistent) @@ -1,11 +0,0 @@ ---- src/pycode.l.orig 2015-11-19 06:41:15 UTC -+++ src/pycode.l -@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface - extern "C" { // some bogus code to keep the compiler happy - void pycodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." - #endif - Property changes on: files/patch-src_pycode.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_vhdlcode.l =================================================================== --- files/patch-src_vhdlcode.l (revision 419269) +++ files/patch-src_vhdlcode.l (nonexistent) @@ -1,11 +0,0 @@ ---- src/vhdlcode.l.orig 2015-11-19 06:41:43 UTC -+++ src/vhdlcode.l -@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner() - extern "C" { // some bogus code to keep the compiler happy - void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - Property changes on: files/patch-src_vhdlcode.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_xmlcode.l =================================================================== --- files/patch-src_xmlcode.l (revision 419269) +++ files/patch-src_xmlcode.l (nonexistent) @@ -1,11 +0,0 @@ ---- src/xmlcode.l.orig 2015-05-31 19:01:12 UTC -+++ src/xmlcode.l -@@ -407,7 +407,7 @@ void resetXmlCodeParserState() - extern "C" { // some bogus code to keep the compiler happy - void xmlcodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." - #endif - Property changes on: files/patch-src_xmlcode.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property