Attachment #159206 for bug #201365




# $FreeBSD$

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

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		bison cmake:outsource iconv python:2
		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png

USES=		bison gmake iconv perl5 python:2
ALL_TARGET=	all
CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
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 DOCS
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,uic_build
QT4_CMAKE_ON=		-Dbuild_wizard:BOOLEAN=ON
QT4_CMAKE_OFF=		-Dbuild_wizard:BOOLEAN=OFF
QT4_PLIST_FILES=	bin/doxywizard

DOCS_USES=		ghostscript:build
DOCS_ALL_TARGET=	docs
DOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
DOCS_CMAKE_ON=		-Dbuild_doc:BOOLEAN=ON
DOCS_CMAKE_OFF=		-Dbuild_doc:BOOLEAN=OFF
DOCS_PLIST_FILES=	man/man1/doxygen.1.gz \
			man/man1/doxyindexer.1.gz \
			man/man1/doxysearch.1.gz \
			man/man1/doxywizard.1.gz

PDFDOCS_ALL_TARGET=	pdf
PDFDOCS_MAKE_ARGS=	HAVE_LATEX=yes

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MLATEX)
IGNORE=		cannot build Doxygen's PDF docs without option LATEX enabled
IGNORE=		PDFDOCS option requires HTMLDOCS and LATEX options to be set
.endif

.if ${OSVERSION} < 1000033
BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
CMAKE_ARGS+=	-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
.endif

.if ${PORT_OPTIONS:MDOCS}
PORTDOCS=		*
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 <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (doxygen-1.8.9.1.src.tar.gz) = d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec	1	SHA256 (doxygen-1.8.10.src.tar.gz) = cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
2	SIZE (doxygen-1.8.9.1.src.tar.gz) = 5007458	2	SIZE (doxygen-1.8.10.src.tar.gz) = 4818276

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+10 lines)
	1	--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC
	2	+++ CMakeLists.txt
	3	@@ -122,7 +122,6 @@ if (win_static)
	4	endif()
	5
	6
	7	-add_subdirectory(libmd5)
	8	add_subdirectory(qtools)
	9	add_subdirectory(vhdlparser)
	10	add_subdirectory(src)




--- Makefile.in.orig	2014-08-22 08:36:24 UTC
+++ Makefile.in
@@ -2,26 +2,25 @@
 DESTDIR = 
 
 doxywizard:
-	cd addon/doxywizard ; $(MAKE) 
+	$(MAKE) -C addon/doxywizard
 
 doxysearch:
-	cd addon/doxysearch ; $(MAKE) 
+	$(MAKE) -C addon/doxysearch
 
 doxmlparser:
-	cd addon/doxmlparser/src ; $(MAKE)
-	cd addon/doxmlparser/test ; $(MAKE)
-	cd addon/doxmlparser/examples/metrics ; $(MAKE)
+	$(MAKE) -C addon/doxmlparser/src
+	$(MAKE) -C addon/doxmlparser/test
+	$(MAKE) -C addon/doxmlparser/examples/metrics
 
 doxyapp:
 	cd addon/doxyapp ; $(MAKE) clean
 
 clean: FORCE
-	- cd examples ; $(MAKE) clean
-	- cd doc ; $(MAKE) clean
-	- cd qtools ; $(MAKE) clean
-	- cd src ; $(MAKE) clean
-	- cd libmd5 ; $(MAKE) clean
-	- cd vhdlparser ; $(MAKE) clean
+	-cd examples ; $(MAKE) clean
+	-cd doc ; $(MAKE) clean
+	-cd qtools ; $(MAKE) clean
+	-cd src ; $(MAKE) clean
+	-cd vhdlparser ; $(MAKE) clean
 	-cd addon/doxywizard ; $(MAKE) clean
 	-cd addon/doxysearch ; $(MAKE) clean
 	-cd addon/doxyapp ; $(MAKE) clean
@@ -33,7 +32,6 @@
 
 distclean: clean
 	-cd src ; $(MAKE) distclean
-	-cd libmd5 ; $(MAKE) distclean
 	-cd vhdlparser ; $(MAKE) distclean
 	-cd qtools ; $(MAKE) distclean
 	-cd addon/doxywizard ; $(MAKE) distclean
@@ -54,10 +52,9 @@
 	-rm -rf xml
 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
 	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
-	-rm -f libmd5/Makefile.libmd5
 	-rm -f vhdlparser/Makefile.vhdlparser
 	-rm -f .makeconfig .tmakeconfig
-	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
+	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro vhdlparser/vhdlparser.pro
 	-rm -rf generated_src
 	-rm -f addon/doxywizard/doxywizard.pro
 	-rm -f VERSION
@@ -92,14 +89,14 @@
 	cp -r examples $(DESTDIR)$(DOCDIR)
 	cp -r html $(DESTDIR)$(DOCDIR)
 
-docs: FORCE
-	cd examples ; $(MAKE)
-	cd doc ; $(MAKE)
+docs: all FORCE
+	$(MAKE) -C examples
+	$(MAKE) -C doc
 
 pdf: docs
-	cd latex ; $(MAKE)
+	$(MAKE) -C latex
 
-DISTFILES =  Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
+DISTFILES =  Doxyfile vhdlparser addon tmake doc examples bin lib objects testing \
              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
              Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
              VERSION README.md packages winbuild jquery

Lines 1-11 Link Here

(-)files/patch-addon-doxywizard-Makefile.in (-11 lines)
1	--- addon/doxywizard/Makefile.in-orig 2014-06-13 23:29:16.000000000 +0200
2	+++ addon/doxywizard/Makefile.in 2014-06-13 23:28:50.000000000 +0200
3	@@ -10,7 +10,7 @@
4	# See the GNU General Public License for more details.
5	#
6
7	-QMAKE=$(QTDIR)/bin/qmake $(MKSPECS)
8	+QMAKE=$(QTDIR)/bin/qmake-qt4 $(MKSPECS)
9	INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
10
11	all: Makefile.doxywizard

Line 0 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	)




--- configure.orig	2014-08-22 08:43:05 UTC
+++ configure
@@ -363,25 +363,25 @@
     echo "  QTDIR environment variable not set!"
     printf "  Checking for Qt..."
     for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
-      if test -x "$d/bin/qmake"; then
+      if test -x "$d/bin/qmake-qt4"; then
         QTDIR=$d
         break 2
       fi
     done
   else
-    if test -e "$QTDIR/bin/qmake"; then
+    if test -e "$QTDIR/bin/qmake-qt4"; then
       printf "  Detected Qt via the QTDIR environment variable..."
     else
       printf "ERROR Detected Qt via the QTDIR environment variable..."
-      echo ", but $QTDIR/bin/qmake does not exist."
-      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
+      echo ", but $QTDIR/bin/qmake-qt4 does not exist."
+      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
       exit 2
     fi
   fi
   if test -z "$QTDIR"; then
     echo "QTDIR not set and Qt not found at standard locations!"
     echo
-    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
+    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
     echo "check the Qt installation instructions!"
     exit 2
   fi
@@ -857,7 +857,7 @@
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
-TMAKE_MOC = $QTDIR/bin/moc
+TMAKE_MOC = $QTDIR/bin/moc-qt4
 EOF
 fi
 
@@ -868,7 +868,7 @@
 EOF
 fi
 
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -892,7 +892,6 @@
 #       fi
        echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
        echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
        echo "	\$(MAKE) -C vhdlparser" >> $DST
        echo "	\$(MAKE) -C src" >> $DST
 
@@ -932,7 +931,7 @@
 cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
 cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
 
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
 
 for i in $f_inprofiles ; do
      SRC=$i




--- doc/Makefile.in.orig	2014-07-13 13:04:37 UTC
+++ doc/Makefile.in
@@ -18,12 +18,14 @@
         VERSION=$(VERSION) ; \
 	export VERSION; \
 	"$(DOXYGEN)/bin/doxygen"
-	@rm -f ../latex/refman.tex
 	@cp doxygen_logo*.gif ../html
+ifdef HAVE_LATEX
+	@rm -f ../latex/refman.tex
 	@cp Makefile.latex ../latex/Makefile
 	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex
 	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty 
 	@epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
+endif # HAVE_LATEX
 
 clean: 
 	rm -rf ../html ../latex *.bak 




--- doc/Makefile.latex.old	2012-01-29 10:11:54.000000000 -0500
+++ doc/Makefile.latex	2012-12-30 12:15:00.000000000 -0500
@@ -15,11 +15,11 @@
 all: doxygen_manual.pdf
 
 doxygen_manual.pdf: doxygen_manual.tex doxygen.sty
-	echo "Running latex..."
+	@echo "Running latex..."
 	pdflatex doxygen_manual.tex 
-	echo "Running makeindex..."
+	@echo "Running makeindex..."
 	makeindex doxygen_manual.idx
-	echo "Rerunning latex...."
+	@echo "Rerunning latex...."
 	pdflatex doxygen_manual.tex
 clean:
 	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log doxygen_manual.pdf




--- doc/doxygen_manual.tex.orig	2015-02-28 15:26:54 UTC
+++ doc/doxygen_manual.tex
@@ -13,7 +13,7 @@
 % input used in their production; they are not affected by this license.
 

 \usepackage{makeidx}
 \usepackage{natbib}
 \usepackage{graphicx}
@@ -28,8 +28,7 @@
 \usepackage{alltt}
 \usepackage{ifpdf}
 \ifpdf
-\usepackage[pdftex,
-            pagebackref=true,
+\usepackage[pagebackref=true,
             colorlinks=true,
             linkcolor=blue,
             unicode




--- src/dot.cpp.orig	2015-03-15 12:15:52 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"

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

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

   if (reNumber)
   {
     resetReNumbering();
@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   QGString theGraph;
   FTextStream md5stream(&theGraph);
   m_dir->writeDepGraph(md5stream);

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

+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt = getDotImageExtension();
@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra
 
   writeGraphFooter(md5stream);
   resetReNumbering();

-  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 baseName    = m_diskName;
   QCString imgName     = baseName+"."+imgExt;




--- src/doxygen.pro.in.orig	2014-08-14 17:46:42 UTC
+++ src/doxygen.pro.in
@@ -18,7 +18,7 @@
 CONFIG       =	console warn_on $extraopts
 HEADERS      =	doxygen.h 
 SOURCES      =	main.cpp 
-unix:LIBS                  += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+unix:LIBS                  += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
 win32:INCLUDEPATH          += .
 win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
 win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
@@ -29,7 +29,7 @@
 win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
 win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
 DEPENDPATH                 += ../generated_src/doxygen
-INCLUDEPATH                += ../qtools ../libmd5 . ../vhdlparser
+INCLUDEPATH                += ../qtools . ../vhdlparser
 DESTDIR                    =  ../bin
 TARGET                     =  doxygen
 unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a

Line 0 Link Here

(-)files/patch-qtools_CMakeLists.txt (+8 lines)
	1	--- qtools/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC
	2	+++ qtools/CMakeLists.txt
	3	@@ -1,4 +1,4 @@
	4	-include_directories(.)
	5	+include_directories(BEFORE .)
	6
	7	list(APPEND qtools_src
	8	qbuffer.cpp




--- src/CMakeLists.txt.orig	2015-05-31 19:01:12 UTC
+++ src/CMakeLists.txt
@@ -1,8 +1,7 @@
 # vim:ts=4:sw=4:expandtab:autoindent:
 
-include_directories(
+include_directories(BEFORE
     ${CMAKE_SOURCE_DIR}/qtools
-    ${CMAKE_SOURCE_DIR}/libmd5
     ${CMAKE_SOURCE_DIR}/vhdlparser/
     ${CMAKE_SOURCE_DIR}/src
     ${CLANG_INCLUDEDIR}
@@ -229,7 +228,7 @@ target_link_libraries(doxygen
     _doxygen
     doxycfg
     qtools
-    md5
+    md
     vhdlparser
     ${SQLITE3_LIBRARIES}
     ${ICONV_LIBRARIES}

Line 0 Link Here

(-)files/patch-vhdlparser_CMakeLists.txt (+8 lines)
	1	--- vhdlparser/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC
	2	+++ vhdlparser/CMakeLists.txt
	3	@@ -1,4 +1,4 @@
	4	-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
	5	+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
	6	add_library(vhdlparser
	7	CharStream.cc
	8	ParseException.cc

Return to bug 201365

Lines 2-8 Link Here

(-)Makefile (-80 / +23 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.9.1	5	PORTVERSION= 1.8.10
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
Lines 15-30 Link Here
15	LICENSE= GPLv2	15	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/LICENSE	16	LICENSE_FILE= ${WRKSRC}/LICENSE
17		17
18	BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake \	18	USES= bison cmake:outsource iconv python:2
19	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
20	LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
21
22	USES= bison gmake iconv perl5 python:2
23	ALL_TARGET= all	19	ALL_TARGET= all
24	HAS_CONFIGURE= yes	20	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
25	QT_NONSTANDARD= yes # non-standard configure arguments
26	CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
27	--install "${INSTALL}" --flex ${LOCALBASE}/bin/flex
28	REINPLACE_ARGS= -i ''	21	REINPLACE_ARGS= -i ''
29		22
30	EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \	23	EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \
Lines 31-124 Link Here
31	--exclude '*/libpng' \	24	--exclude '*/libpng' \
32	--exclude '*/tmake'	25	--exclude '*/tmake'
33		26
34	PLIST= ${WRKDIR}/plist
35	TMPDOCDEST= ${WRKDIR}/tmpdocdest
36
37	PLIST_FILES= bin/doxygen	27	PLIST_FILES= bin/doxygen
38		28
39	OPTIONS_DEFINE= GRAPHVIZ LATEX QT4 HTMLDOCS PDFDOCS	29	OPTIONS_DEFINE= GRAPHVIZ LATEX QT4 DOCS
40	OPTIONS_DEFAULT= GRAPHVIZ LATEX	30	OPTIONS_DEFAULT= GRAPHVIZ LATEX
41	QT4_DESC= Install Doxywizard GUI	31	QT4_DESC= Install Doxywizard GUI
42	HTMLDOCS_DESC= Install documentation in HTML format
43	PDFDOCS_DESC= Install documentation in PDF format
44		32
45	GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz	33	GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
46		34
47	LATEX_USE= TEX=base,dvipsk,pdftex	35	LATEX_USE= TEX=base,dvipsk,pdftex
48		36
49	QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build	37	QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build
50	QT4_CONFIGURE_ENV= QTDIR="${QTDIR}"	38	QT4_CMAKE_ON= -Dbuild_wizard:BOOLEAN=ON
51	QT4_CONFIGURE_ON= --with-doxywizard	39	QT4_CMAKE_OFF= -Dbuild_wizard:BOOLEAN=OFF
52	QT4_PLIST_FILES= bin/doxywizard	40	QT4_PLIST_FILES= bin/doxywizard
53		41
54	HTMLDOCS_ALL_TARGET= docs	42	DOCS_USES= ghostscript:build
55	HTMLDOCS_BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz	43	DOCS_ALL_TARGET= docs
		44	DOCS_BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
		45	DOCS_CMAKE_ON= -Dbuild_doc:BOOLEAN=ON
		46	DOCS_CMAKE_OFF= -Dbuild_doc:BOOLEAN=OFF
		47	DOCS_PLIST_FILES= man/man1/doxygen.1.gz \
		48	man/man1/doxyindexer.1.gz \
		49	man/man1/doxysearch.1.gz \
		50	man/man1/doxywizard.1.gz
56		51
57	PDFDOCS_ALL_TARGET= pdf
58	PDFDOCS_MAKE_ARGS= HAVE_LATEX=yes
59
60	.include <bsd.port.options.mk>	52	.include <bsd.port.options.mk>
61		53
62	.if ${PORT_OPTIONS:MPDFDOCS} && \	54	.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MLATEX)
63	(empty(PORT_OPTIONS:MHTMLDOCS) \|\| empty(PORT_OPTIONS:MLATEX))	55	IGNORE= cannot build Doxygen's PDF docs without option LATEX enabled
64	IGNORE= PDFDOCS option requires HTMLDOCS and LATEX options to be set
65	.endif	56	.endif
66		57
67	.if ${PORT_OPTIONS:MPDFDOCS}	58	.if ${OSVERSION} < 1000033
68	USES+= ghostscript:build	59	BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
		60	CMAKE_ARGS+= -DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
69	.endif	61	.endif
70		62
71	.if ${PORT_OPTIONS:MQT4}	63	.if ${PORT_OPTIONS:MDOCS}
72	# Need this in env for the build	64	PORTDOCS= *
73	QTDIR?= ${QT_PREFIX}
74	.endif	65	.endif
75		66
76	pre-configure:
77	@cd ${WRKSRC}; for pro in src/*.pro.in \
78	addon/doxywizard/doxywizard.pro.in; do \
79	${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
80	@${CHMOD} +x ${WRKSRC}/configure
81
82	post-configure:
83	@${REINPLACE_CMD} -e 's\|TMAKE =.\|TMAKE=${LOCALBASE}/bin/tmake\|' \
84	-e 's\|TMAKEPATH =.\|TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++\|' \
85	${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \
86	${WRKSRC}/addon/doxywizard/Makefile
87
88	post-build:
89	${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/examples all
90
91	pre-install:
92	${RM} -rf ${TMPDOCDEST} ${PLIST}
93	${TOUCH} ${PLIST}
94	.if ${PORT_OPTIONS:MHTMLDOCS}
95	${MKDIR} ${TMPDOCDEST}/doxygen
96	${RM} -f ${WRKSRC}/examples/diagrams/html/*.md5 \
97	${WRKSRC}/examples/diagrams/html/*.map
98	${TAR} -C ${WRKSRC} --exclude '/_' -cf - html \
99	\| ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf -
100	${TAR} -C ${WRKSRC} --exclude '/Makefile' --exclude '*.dot' \
101	-cf - examples \
102	\| ${TAR} -C ${TMPDOCDEST}/doxygen --unlink -xf -
103	.if ${PORT_OPTIONS:MPDFDOCS}
104	${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.pdf \
105	${WRKSRC}/latex/archoverview.eps \
106	${TMPDOCDEST}/doxygen
107	.endif
108	@cd ${TMPDOCDEST} \
109	&& ${FIND} -s * -type f -o -type l \
110	\| ${SED} -e 's\|^\|share/doc/\|' >> ${PLIST}
111	.endif
112
113	do-install:
114	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${STAGEDIR}${PREFIX}/bin
115	.if ${PORT_OPTIONS:MQT4}
116	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${STAGEDIR}${PREFIX}/bin
117	.endif
118	.if ${PORT_OPTIONS:MHTMLDOCS}
119	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/doxygen
120	${TAR} -C ${TMPDOCDEST} -cf - doxygen \
121	\| ${TAR} -C ${STAGEDIR}${PREFIX}/share/doc --unlink -xf -
122	.endif
123
124	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-79 Link Here

(-)files/patch-Makefile.in (-79 lines)
1	--- Makefile.in.orig 2014-08-22 08:36:24 UTC
2	+++ Makefile.in
3	@@ -2,26 +2,25 @@
4	DESTDIR =
5
6	doxywizard:
7	- cd addon/doxywizard ; $(MAKE)
8	+ $(MAKE) -C addon/doxywizard
9
10	doxysearch:
11	- cd addon/doxysearch ; $(MAKE)
12	+ $(MAKE) -C addon/doxysearch
13
14	doxmlparser:
15	- cd addon/doxmlparser/src ; $(MAKE)
16	- cd addon/doxmlparser/test ; $(MAKE)
17	- cd addon/doxmlparser/examples/metrics ; $(MAKE)
18	+ $(MAKE) -C addon/doxmlparser/src
19	+ $(MAKE) -C addon/doxmlparser/test
20	+ $(MAKE) -C addon/doxmlparser/examples/metrics
21
22	doxyapp:
23	cd addon/doxyapp ; $(MAKE) clean
24
25	clean: FORCE
26	- - cd examples ; $(MAKE) clean
27	- - cd doc ; $(MAKE) clean
28	- - cd qtools ; $(MAKE) clean
29	- - cd src ; $(MAKE) clean
30	- - cd libmd5 ; $(MAKE) clean
31	- - cd vhdlparser ; $(MAKE) clean
32	+ -cd examples ; $(MAKE) clean
33	+ -cd doc ; $(MAKE) clean
34	+ -cd qtools ; $(MAKE) clean
35	+ -cd src ; $(MAKE) clean
36	+ -cd vhdlparser ; $(MAKE) clean
37	-cd addon/doxywizard ; $(MAKE) clean
38	-cd addon/doxysearch ; $(MAKE) clean
39	-cd addon/doxyapp ; $(MAKE) clean
40	@@ -33,7 +32,6 @@
41
42	distclean: clean
43	-cd src ; $(MAKE) distclean
44	- -cd libmd5 ; $(MAKE) distclean
45	-cd vhdlparser ; $(MAKE) distclean
46	-cd qtools ; $(MAKE) distclean
47	-cd addon/doxywizard ; $(MAKE) distclean
48	@@ -54,10 +52,9 @@
49	-rm -rf xml
50	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
51	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
52	- -rm -f libmd5/Makefile.libmd5
53	-rm -f vhdlparser/Makefile.vhdlparser
54	-rm -f .makeconfig .tmakeconfig
55	- -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
56	+ -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro vhdlparser/vhdlparser.pro
57	-rm -rf generated_src
58	-rm -f addon/doxywizard/doxywizard.pro
59	-rm -f VERSION
60	@@ -92,14 +89,14 @@
61	cp -r examples $(DESTDIR)$(DOCDIR)
62	cp -r html $(DESTDIR)$(DOCDIR)
63
64	-docs: FORCE
65	- cd examples ; $(MAKE)
66	- cd doc ; $(MAKE)
67	+docs: all FORCE
68	+ $(MAKE) -C examples
69	+ $(MAKE) -C doc
70
71	pdf: docs
72	- cd latex ; $(MAKE)
73	+ $(MAKE) -C latex
74
75	-DISTFILES = Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
76	+DISTFILES = Doxyfile vhdlparser addon tmake doc examples bin lib objects testing \
77	qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
78	Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
79	VERSION README.md packages winbuild jquery

Lines 1-68 Link Here

(-)files/patch-configure (-68 lines)
1	--- configure.orig 2014-08-22 08:43:05 UTC
2	+++ configure
3	@@ -363,25 +363,25 @@
4	echo " QTDIR environment variable not set!"
5	printf " Checking for Qt..."
6	for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
7	- if test -x "$d/bin/qmake"; then
8	+ if test -x "$d/bin/qmake-qt4"; then
9	QTDIR=$d
10	break 2
11	fi
12	done
13	else
14	- if test -e "$QTDIR/bin/qmake"; then
15	+ if test -e "$QTDIR/bin/qmake-qt4"; then
16	printf " Detected Qt via the QTDIR environment variable..."
17	else
18	printf "ERROR Detected Qt via the QTDIR environment variable..."
19	- echo ", but $QTDIR/bin/qmake does not exist."
20	- echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
21	+ echo ", but $QTDIR/bin/qmake-qt4 does not exist."
22	+ echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
23	exit 2
24	fi
25	fi
26	if test -z "$QTDIR"; then
27	echo "QTDIR not set and Qt not found at standard locations!"
28	echo
29	- echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
30	+ echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
31	echo "check the Qt installation instructions!"
32	exit 2
33	fi
34	@@ -857,7 +857,7 @@
35	fi
36	if test "$f_wizard" = YES; then
37	cat >> .tmakeconfig <<EOF
38	-TMAKE_MOC = $QTDIR/bin/moc
39	+TMAKE_MOC = $QTDIR/bin/moc-qt4
40	EOF
41	fi
42
43	@@ -868,7 +868,7 @@
44	EOF
45	fi
46
47	-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
48	+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
49
50	for i in $f_inmakefiles ; do
51	SRC=$i
52	@@ -892,7 +892,6 @@
53	# fi
54	echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
55	echo " \$(MAKE) -C qtools" >> $DST
56	- echo " \$(MAKE) -C libmd5" >> $DST
57	echo " \$(MAKE) -C vhdlparser" >> $DST
58	echo " \$(MAKE) -C src" >> $DST
59
60	@@ -932,7 +931,7 @@
61	cat src/libdoxycfg.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxycfg.t
62	cat src/libdoxygen.t.in \| sed -e "s\|%%FLEX%%\|$f_flex\|g" -e "s\|%%BISON%%\|$f_bison\|g" -e "s\|%%PYTHON%%\|$f_python\|g" > src/libdoxygen.t
63
64	-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
65	+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
66
67	for i in $f_inprofiles ; do
68	SRC=$i

Lines 1-18 Link Here

(-)files/patch-doc-Makefile.in (-18 lines)
1	--- doc/Makefile.in.orig 2014-07-13 13:04:37 UTC
2	+++ doc/Makefile.in
3	@@ -18,12 +18,14 @@
4	VERSION=$(VERSION) ; \
5	export VERSION; \
6	"$(DOXYGEN)/bin/doxygen"
7	- @rm -f ../latex/refman.tex
8	@cp doxygen_logo*.gif ../html
9	+ifdef HAVE_LATEX
10	+ @rm -f ../latex/refman.tex
11	@cp Makefile.latex ../latex/Makefile
12	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex
13	@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty
14	@epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf
15	+endif # HAVE_LATEX
16
17	clean:
18	rm -rf ../html ../latex *.bak

Lines 1-17 Link Here

(-)files/patch-doc-Makefile.latex (-17 lines)
1	--- doc/Makefile.latex.old 2012-01-29 10:11:54.000000000 -0500
2	+++ doc/Makefile.latex 2012-12-30 12:15:00.000000000 -0500
3	@@ -15,11 +15,11 @@
4	all: doxygen_manual.pdf
5
6	doxygen_manual.pdf: doxygen_manual.tex doxygen.sty
7	- echo "Running latex..."
8	+ @echo "Running latex..."
9	pdflatex doxygen_manual.tex
10	- echo "Running makeindex..."
11	+ @echo "Running makeindex..."
12	makeindex doxygen_manual.idx
13	- echo "Rerunning latex...."
14	+ @echo "Rerunning latex...."
15	pdflatex doxygen_manual.tex
16	clean:
17	rm -f .ps .dvi .aux .toc .idx .ind .ilg .log doxygen_manual.pdf

Lines 1-5 Link Here

(-)files/patch-doc-doxygen_manual.tex (-12 / +2 lines)
1	--- doc/doxygen_manual.tex.orig 2012-02-11 18:34:00.000000000 -0500	1	--- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC
2	+++ doc/doxygen_manual.tex 2012-03-04 13:56:33.000000000 -0500	2	+++ doc/doxygen_manual.tex
3	@@ -13,7 +13,7 @@	3	@@ -13,7 +13,7 @@
4	% input used in their production; they are not affected by this license.	4	% input used in their production; they are not affected by this license.
5		5
Lines 9-21 Link Here
9	\usepackage{makeidx}	9	\usepackage{makeidx}
10	\usepackage{natbib}	10	\usepackage{natbib}
11	\usepackage{graphicx}	11	\usepackage{graphicx}
12	@@ -28,8 +28,7 @@
13	\usepackage{alltt}
14	\usepackage{ifpdf}
15	\ifpdf
16	-\usepackage[pdftex,
17	- pagebackref=true,
18	+\usepackage[pagebackref=true,
19	colorlinks=true,
20	linkcolor=blue,
21	unicode

Lines 1-4 Link Here

(-)files/patch-md5-dot (-9 / +9 lines)
1	--- src/dot.cpp.orig 2015-01-03 22:38:57 UTC	1	--- src/dot.cpp.orig 2015-03-15 12:15:52 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	@@ -2296,10 +2297,8 @@ void DotGfxHierarchyTable::createGraph(D	11	@@ -2311,10 +2312,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	@@ -3024,10 +3023,8 @@ QCString computeMd5Signature(DotNode *ro	23	@@ -3073,10 +3072,8 @@ QCString computeMd5Signature(DotNode *ro
24	}	24	}
25	}	25	}
26	writeGraphFooter(md5stream);	26	writeGraphFooter(md5stream);
Lines 32-38 Link Here
32	if (reNumber)	32	if (reNumber)
33	{	33	{
34	resetReNumbering();	34	resetReNumbering();
35	@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr	35	@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	QGString theGraph;	36	QGString theGraph;
37	FTextStream md5stream(&theGraph);	37	FTextStream md5stream(&theGraph);
38	m_dir->writeDepGraph(md5stream);	38	m_dir->writeDepGraph(md5stream);
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	@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat	47	@@ -4152,10 +4147,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 55-62 Link Here
55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());	55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
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 = Config_getEnum("DOT_IMAGE_FORMAT");	58	QCString imgExt = getDotImageExtension();
59	@@ -4499,10 +4492,8 @@ QCString DotGroupCollaboration::writeGra	59	@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra
60		60
61	writeGraphFooter(md5stream);	61	writeGraphFooter(md5stream);
62	resetReNumbering();	62	resetReNumbering();
Lines 65-70 Link Here
65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
66	- MD5SigToString(md5_sig,sigStr.rawData(),33);	66	- MD5SigToString(md5_sig,sigStr.rawData(),33);
67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());	67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
68	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");	68	QCString imgExt = getDotImageExtension();
		69	QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");
69	QCString baseName = m_diskName;	70	QCString baseName = m_diskName;
70	QCString imgName = baseName+"."+imgExt;

Lines 1-20 Link Here

(-)files/patch-md5-doxygen.pro.in (-20 lines)
1	--- src/doxygen.pro.in.orig 2014-08-14 17:46:42 UTC
2	+++ src/doxygen.pro.in
3	@@ -18,7 +18,7 @@
4	CONFIG = console warn_on $extraopts
5	HEADERS = doxygen.h
6	SOURCES = main.cpp
7	-unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
8	+unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
9	win32:INCLUDEPATH += .
10	win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
11	win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
12	@@ -29,7 +29,7 @@
13	win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
14	win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
15	DEPENDPATH += ../generated_src/doxygen
16	-INCLUDEPATH += ../qtools ../libmd5 . ../vhdlparser
17	+INCLUDEPATH += ../qtools . ../vhdlparser
18	DESTDIR = ../bin
19	TARGET = doxygen
20	unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a

Line 0 Link Here

(-)files/patch-src_CMakeLists.txt (+21 lines)
	1	--- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC
	2	+++ src/CMakeLists.txt
	3	@@ -1,8 +1,7 @@
	4	# vim:ts=4:sw=4:expandtab:autoindent:
	5
	6	-include_directories(
	7	+include_directories(BEFORE
	8	${CMAKE_SOURCE_DIR}/qtools
	9	- ${CMAKE_SOURCE_DIR}/libmd5
	10	${CMAKE_SOURCE_DIR}/vhdlparser/
	11	${CMAKE_SOURCE_DIR}/src
	12	${CLANG_INCLUDEDIR}
	13	@@ -229,7 +228,7 @@ target_link_libraries(doxygen
	14	_doxygen
	15	doxycfg
	16	qtools
	17	- md5
	18	+ md
	19	vhdlparser
	20	${SQLITE3_LIBRARIES}
	21	${ICONV_LIBRARIES}