Attachment #173105 for bug #211447

View | Details | Raw Unified | Return to bug 211447
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	doxygen
PORTVERSION=	1.8.11
PORTREVISION=	3
PORTEPOCH=	2
CATEGORIES=	devel
MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \

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' \

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (doxygen-1.8.10.src.tar.gz) = cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93	1	TIMESTAMP = 1467043745
2	SIZE (doxygen-1.8.10.src.tar.gz) = 4818276	2	SHA256 (doxygen-1.8.11.src.tar.gz) = 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049
		3	SIZE (doxygen-1.8.11.src.tar.gz) = 4834291

Lines 1-10 Link Here

(-)files/patch-cmake_run__translator.cmake (-10 lines)
1	--- cmake/run_translator.cmake.orig 2015-05-31 21:24:49 UTC
2	+++ cmake/run_translator.cmake
3	@@ -1,5 +1,5 @@
4	include(${SOURCE}/cmake/version.cmake)
5	-find_program(PYTHON NAMES python)
6	+find_package(PythonInterp)
7	execute_process(
8	- COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/translator.py
9	+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/translator.py
10	)

Line 0 Link Here

(-)files/patch-doc_CMakeLists.txt (+11 lines)
	1	--- doc/CMakeLists.txt.orig 2015-09-01 12:42:06 UTC
	2	+++ doc/CMakeLists.txt
	3	@@ -169,7 +169,7 @@ install(FILES
	4	"${PROJECT_BINARY_DIR}/man/doxywizard.1"
	5	"${PROJECT_BINARY_DIR}/man/doxysearch.1"
	6	"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
	7	- DESTINATION share/man/man1
	8	+ DESTINATION man/man1
	9	)
	10
	11	install(FILES




--- src/dot.cpp.orig	2015-12-28 19:46:20 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"

 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D
   }
   writeGraphFooter(md5stream);
   resetReNumbering();

   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro
     }
   }
   writeGraphFooter(md5stream);

   if (reNumber)
   {
     resetReNumbering();
@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   QGString theGraph;
   FTextStream md5stream(&theGraph);
   //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);

   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -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);

   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt = getDotImageExtension();
@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra
 
   writeGraphFooter(md5stream);
   resetReNumbering();

Lines 1-11 Link Here

(-)files/patch-src_code.l (-11 lines)
1	--- src/code.l.orig 2015-05-31 19:01:12 UTC
2	+++ src/code.l
3	@@ -3695,7 +3695,7 @@ void codeFreeScanner()
4	extern "C" { // some bogus code to keep the compiler happy
5	void codeYYdummy() { yy_flex_realloc(0,0); }
6	}
7	-#elif YY_FLEX_SUBMINOR_VERSION<33
8	+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
9	#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!"
10	#endif
11




--- 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);

Lines 1-11 Link Here

(-)files/patch-src_fortrancode.l (-11 lines)
1	--- src/fortrancode.l.orig 2015-11-19 06:39:17 UTC
2	+++ src/fortrancode.l
3	@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterfac
4	extern "C" { // some bogus code to keep the compiler happy
5	void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
6	}
7	-#elif YY_FLEX_SUBMINOR_VERSION<33
8	+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
9	#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!"
10	#else
11	extern "C" { // some bogus code to keep the compiler happy

Lines 1-11 Link Here

(-)files/patch-src_pycode.l (-11 lines)
1	--- src/pycode.l.orig 2015-11-19 06:41:15 UTC
2	+++ src/pycode.l
3	@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface
4	extern "C" { // some bogus code to keep the compiler happy
5	void pycodeYYdummy() { yy_flex_realloc(0,0); }
6	}
7	-#elif YY_FLEX_SUBMINOR_VERSION<33
8	+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
9	#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)."
10	#endif
11

Lines 1-11 Link Here

(-)files/patch-src_vhdlcode.l (-11 lines)
1	--- src/vhdlcode.l.orig 2015-11-19 06:41:43 UTC
2	+++ src/vhdlcode.l
3	@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
4	extern "C" { // some bogus code to keep the compiler happy
5	void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
6	}
7	-#elif YY_FLEX_SUBMINOR_VERSION<33
8	+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
9	#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!"
10	#endif
11

Lines 1-11 Link Here

(-)files/patch-src_xmlcode.l (-11 lines)
1	--- src/xmlcode.l.orig 2015-05-31 19:01:12 UTC
2	+++ src/xmlcode.l
3	@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
4	extern "C" { // some bogus code to keep the compiler happy
5	void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
6	}
7	-#elif YY_FLEX_SUBMINOR_VERSION<33
8	+#elif YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION<33
9	#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)."
10	#endif
11

Return to bug 211447

Lines 2-9 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.10	5	PORTVERSION= 1.8.11
6	PORTREVISION= 3
7	PORTEPOCH= 2	6	PORTEPOCH= 2
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
Lines 20-25 Link Here
20	ALL_TARGET= all	19	ALL_TARGET= all
21	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}	20	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
22	REINPLACE_ARGS= -i ''	21	REINPLACE_ARGS= -i ''
		22	# I need to look into why it doesn't work with parallel jobs
		23	MAKE_JOBS_UNSAFE= yes
23		24
24	EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \	25	EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \
25	--exclude '*/libpng' \	26	--exclude '*/libpng' \

Lines 1-4 Link Here

(-)files/patch-md5-dot (-8 / +8 lines)
1	--- src/dot.cpp.orig 2015-03-15 12:15:52 UTC	1	--- src/dot.cpp.orig 2015-12-28 19:46:20 UTC
2	+++ src/dot.cpp	2	+++ src/dot.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"	4	#include "dirdef.h"
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberlist.h"	9	#include "memberlist.h"
10	#include "groupdef.h"	10	#include "groupdef.h"
11	@@ -2311,10 +2312,8 @@ void DotGfxHierarchyTable::createGraph(D	11	@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D
12	}	12	}
13	writeGraphFooter(md5stream);	13	writeGraphFooter(md5stream);
14	resetReNumbering();	14	resetReNumbering();
Lines 20-26 Link Here
20	bool regenerate=FALSE;	20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))	22	!checkDeliverables(absImgName,absMapName))
23	@@ -3073,10 +3072,8 @@ QCString computeMd5Signature(DotNode *ro	23	@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro
24	}	24	}
25	}	25	}
26	writeGraphFooter(md5stream);	26	writeGraphFooter(md5stream);
Lines 32-41 Link Here
32	if (reNumber)	32	if (reNumber)
33	{	33	{
34	resetReNumbering();	34	resetReNumbering();
35	@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr	35	@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	QGString theGraph;
37	FTextStream md5stream(&theGraph);	36	FTextStream md5stream(&theGraph);
38	m_dir->writeDepGraph(md5stream);	37	//m_dir->writeDepGraph(md5stream);
		38	writeDotDirDepGraph(md5stream,m_dir,linkRelations);
39	- uchar md5_sig[16];	39	- uchar md5_sig[16];
40	QCString sigStr(33);	40	QCString sigStr(33);
41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
Lines 44-50 Link Here
44	bool regenerate=FALSE;	44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :	46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
47	@@ -4152,10 +4147,8 @@ void generateGraphLegend(const char *pat	47	@@ -4154,10 +4149,8 @@ void generateGraphLegend(const char *pat
48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";	48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";	49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
50	writeGraphFooter(md5stream);	50	writeGraphFooter(md5stream);
Lines 56-62 Link Here
56	QCString absBaseName = (QCString)path+"/graph_legend";	56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";	57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = getDotImageExtension();	58	QCString imgExt = getDotImageExtension();
59	@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra	59	@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra
60		60
61	writeGraphFooter(md5stream);	61	writeGraphFooter(md5stream);
62	resetReNumbering();	62	resetReNumbering();

Lines 1-20 Link Here

(-)files/patch-src_commentscan.l (-20 lines)
1	--- src/commentscan.l.orig 2015-05-31 19:01:12 UTC
2	+++ src/commentscan.l
3	@@ -1103,7 +1103,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
4	// but we need to know the position in the input buffer where this
5	// rule matched.
6	// for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
7	-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
8	+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 \|\| YY_FLEX_MINOR_VERSION>=6
9	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
10	#else
11	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
12	@@ -1165,7 +1165,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
13	g_memberGroupHeader.resize(0);
14	parseMore=TRUE;
15	needNewEntry = TRUE;
16	-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
17	+#if YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33 \|\| YY_FLEX_MINOR_VERSION>=6
18	inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
19	#else
20	inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);