Index: Makefile =================================================================== --- Makefile (revision 392642) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= doxygen -PORTVERSION= 1.8.9.1 +PORTVERSION= 1.8.10 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ @@ -15,16 +15,9 @@ 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 +USES= bison cmake:outsource iconv 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 +CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} REINPLACE_ARGS= -i '' EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \ @@ -31,94 +24,44 @@ --exclude '*/libpng' \ --exclude '*/tmake' -PLIST= ${WRKDIR}/plist -TMPDOCDEST= ${WRKDIR}/tmpdocdest - PLIST_FILES= bin/doxygen -OPTIONS_DEFINE= GRAPHVIZ LATEX QT4 HTMLDOCS PDFDOCS +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 -QT4_CONFIGURE_ENV= QTDIR="${QTDIR}" -QT4_CONFIGURE_ON= --with-doxywizard +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 -HTMLDOCS_ALL_TARGET= docs -HTMLDOCS_BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz +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 -.if ${PORT_OPTIONS:MPDFDOCS} && \ - (empty(PORT_OPTIONS:MHTMLDOCS) || empty(PORT_OPTIONS:MLATEX)) -IGNORE= PDFDOCS option requires HTMLDOCS and LATEX options to be set +.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MLATEX) +IGNORE= cannot build Doxygen's PDF docs without option LATEX enabled .endif -.if ${PORT_OPTIONS:MPDFDOCS} -USES+= ghostscript:build +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CMAKE_ARGS+= -DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex .endif -.if ${PORT_OPTIONS:MQT4} -# Need this in env for the build -QTDIR?= ${QT_PREFIX} +.if ${PORT_OPTIONS:MDOCS} +PORTDOCS= * .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: distinfo =================================================================== --- distinfo (revision 392642) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (doxygen-1.8.9.1.src.tar.gz) = d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec -SIZE (doxygen-1.8.9.1.src.tar.gz) = 5007458 +SHA256 (doxygen-1.8.10.src.tar.gz) = cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 +SIZE (doxygen-1.8.10.src.tar.gz) = 4818276 Index: files/patch-CMakeLists.txt =================================================================== --- files/patch-CMakeLists.txt (revision 0) +++ files/patch-CMakeLists.txt (working copy) @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC ++++ CMakeLists.txt +@@ -122,7 +122,6 @@ if (win_static) + endif() + + +-add_subdirectory(libmd5) + add_subdirectory(qtools) + add_subdirectory(vhdlparser) + add_subdirectory(src) Property changes on: files/patch-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-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 392642) +++ files/patch-Makefile.in (working copy) @@ -1,79 +0,0 @@ ---- 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 Index: files/patch-addon-doxywizard-Makefile.in =================================================================== --- files/patch-addon-doxywizard-Makefile.in (revision 392642) +++ files/patch-addon-doxywizard-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- addon/doxywizard/Makefile.in-orig 2014-06-13 23:29:16.000000000 +0200 -+++ addon/doxywizard/Makefile.in 2014-06-13 23:28:50.000000000 +0200 -@@ -10,7 +10,7 @@ - # See the GNU General Public License for more details. - # - --QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) -+QMAKE=$(QTDIR)/bin/qmake-qt4 $(MKSPECS) - INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py - - all: Makefile.doxywizard Index: files/patch-cmake_run__translator.cmake =================================================================== --- files/patch-cmake_run__translator.cmake (revision 0) +++ files/patch-cmake_run__translator.cmake (working copy) @@ -0,0 +1,10 @@ +--- 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 ___________________________________________________________________ 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-configure =================================================================== --- files/patch-configure (revision 392642) +++ files/patch-configure (working copy) @@ -1,68 +0,0 @@ ---- 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 <> $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 Index: files/patch-doc-Makefile.in =================================================================== --- files/patch-doc-Makefile.in (revision 392642) +++ files/patch-doc-Makefile.in (working copy) @@ -1,18 +0,0 @@ ---- 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 Index: files/patch-doc-Makefile.latex =================================================================== --- files/patch-doc-Makefile.latex (revision 392642) +++ files/patch-doc-Makefile.latex (working copy) @@ -1,17 +0,0 @@ ---- 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 Index: files/patch-doc-doxygen_manual.tex =================================================================== --- files/patch-doc-doxygen_manual.tex (revision 392642) +++ files/patch-doc-doxygen_manual.tex (working copy) @@ -1,5 +1,5 @@ ---- doc/doxygen_manual.tex.orig 2012-02-11 18:34:00.000000000 -0500 -+++ doc/doxygen_manual.tex 2012-03-04 13:56:33.000000000 -0500 +--- 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. @@ -9,13 +9,3 @@ \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 Index: files/patch-md5-dot =================================================================== --- files/patch-md5-dot (revision 392642) +++ files/patch-md5-dot (working copy) @@ -1,4 +1,4 @@ ---- src/dot.cpp.orig 2015-01-03 22:38:57 UTC +--- src/dot.cpp.orig 2015-03-15 12:15:52 UTC +++ src/dot.cpp @@ -39,6 +39,7 @@ #include "dirdef.h" @@ -8,7 +8,7 @@ #include "md5.h" #include "memberlist.h" #include "groupdef.h" -@@ -2296,10 +2297,8 @@ void DotGfxHierarchyTable::createGraph(D +@@ -2311,10 +2312,8 @@ void DotGfxHierarchyTable::createGraph(D } writeGraphFooter(md5stream); resetReNumbering(); @@ -20,7 +20,7 @@ bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(absImgName,absMapName)) -@@ -3024,10 +3023,8 @@ QCString computeMd5Signature(DotNode *ro +@@ -3073,10 +3072,8 @@ QCString computeMd5Signature(DotNode *ro } } writeGraphFooter(md5stream); @@ -32,7 +32,7 @@ if (reNumber) { resetReNumbering(); -@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr +@@ -4007,10 +4004,8 @@ QCString DotDirDeps::writeGraph(FTextStr QGString theGraph; FTextStream md5stream(&theGraph); m_dir->writeDepGraph(md5stream); @@ -44,7 +44,7 @@ bool regenerate=FALSE; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName : -@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat +@@ -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); @@ -55,8 +55,8 @@ + 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"); -@@ -4499,10 +4492,8 @@ QCString DotGroupCollaboration::writeGra + QCString imgExt = getDotImageExtension(); +@@ -4555,10 +4548,8 @@ QCString DotGroupCollaboration::writeGra writeGraphFooter(md5stream); resetReNumbering(); @@ -65,6 +65,6 @@ - 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 = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString baseName = m_diskName; - QCString imgName = baseName+"."+imgExt; Index: files/patch-md5-doxygen.pro.in =================================================================== --- files/patch-md5-doxygen.pro.in (revision 392642) +++ files/patch-md5-doxygen.pro.in (working copy) @@ -1,20 +0,0 @@ ---- 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 Index: files/patch-qtools_CMakeLists.txt =================================================================== --- files/patch-qtools_CMakeLists.txt (revision 0) +++ files/patch-qtools_CMakeLists.txt (working copy) @@ -0,0 +1,8 @@ +--- qtools/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC ++++ qtools/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(.) ++include_directories(BEFORE .) + + list(APPEND qtools_src + qbuffer.cpp Property changes on: files/patch-qtools_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-src_CMakeLists.txt =================================================================== --- files/patch-src_CMakeLists.txt (revision 0) +++ files/patch-src_CMakeLists.txt (working copy) @@ -0,0 +1,21 @@ +--- 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} Property changes on: files/patch-src_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-vhdlparser_CMakeLists.txt =================================================================== --- files/patch-vhdlparser_CMakeLists.txt (revision 0) +++ files/patch-vhdlparser_CMakeLists.txt (working copy) @@ -0,0 +1,8 @@ +--- vhdlparser/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC ++++ vhdlparser/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) ++include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) + add_library(vhdlparser + CharStream.cc + ParseException.cc Property changes on: files/patch-vhdlparser_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