Attachment 143761 Details for Bug 190943 – Alternate paching for Makefile and files/patch-md5

[patch] Alternate paching for Makefile and files/patch-md5

doxygen-1.8.7.patch (text/plain), 11.47 KB, created by Naram Qashat on 2014-06-13 22:19:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2014-06-13 22:19:54 UTC

Size: 11.47 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357724)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	doxygen
>-PORTVERSION=	1.8.3.1
>-PORTREVISION=	1
>+PORTVERSION=	1.8.7
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
> 		http://ftp.stack.nl/pub/users/dimitri/
>@@ -15,15 +14,18 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
>-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
>+BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake \
>+		flex>0:${PORTSDIR}/textproc/flex
>+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
> 
> USES=		bison iconv perl5 gmake
>+USE_PYTHON_BUILD=	yes
> ALL_TARGET=	all
> HAS_CONFIGURE=	yes
> QT_NONSTANDARD=	yes	# non-standard configure arguments
> CONFIGURE_ARGS=	--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
>-		--install "${INSTALL}"
>+		--install "${INSTALL}" --flex ${LOCALBASE}/bin/flex \
>+		--python ${PYTHON_CMD}
> REINPLACE_ARGS=	-i ''
> 
> EXTRACT_AFTER_ARGS=	--exclude '*/libmd5'	\
>@@ -44,7 +46,6 @@
> 
> .if ${PORT_OPTIONS:MHTMLDOCS}
> ALL_TARGET+=	docs
>-USE_PYTHON_BUILD=	yes
> BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
> 
> .if ${PORT_OPTIONS:MPDFDOCS}
>Index: files/patch-md5
>===================================================================
>--- files/patch-md5	(revision 357724)
>+++ files/patch-md5	(working copy)
>@@ -1,7 +1,56 @@
>---- src/definition.cpp.orig	2011-08-19 15:34:17.000000000 +0800
>-+++ src/definition.cpp	2011-10-31 17:32:47.870380518 +0800
>-@@ -18,6 +18,7 @@
>- #include "qtbc.h"
>+--- ./Doxyfile.orig	2014-02-08 08:06:14.000000000 -0500
>++++ ./Doxyfile	2014-05-04 20:07:48.000000000 -0400
>+@@ -257,7 +257,7 @@
>+ MACRO_EXPANSION        = YES
>+ EXPAND_ONLY_PREDEF     = YES
>+ SEARCH_INCLUDES        = YES
>+-INCLUDE_PATH           = qtools libmd5
>++INCLUDE_PATH           = qtools
>+ INCLUDE_FILE_PATTERNS  =
>+ PREDEFINED             =
>+ EXPAND_AS_DEFINED      =
>+--- ./Makefile.in.orig	2014-02-08 08:06:14.000000000 -0500
>++++ ./Makefile.in	2014-05-04 20:08:58.000000000 -0400
>+@@ -20,7 +20,6 @@
>+ 	- cd doc ; $(MAKE) clean
>+ 	- cd qtools ; $(MAKE) clean
>+ 	- cd src ; $(MAKE) clean
>+-	- cd libmd5 ; $(MAKE) clean
>+ 	-cd addon/doxywizard ; $(MAKE) clean
>+ 	-cd addon/doxysearch ; $(MAKE) clean
>+ 	-cd addon/doxyapp ; $(MAKE) clean
>+@@ -32,7 +31,6 @@
>+ 
>+ distclean: clean
>+ 	-cd src ; $(MAKE) distclean
>+-	-cd libmd5 ; $(MAKE) distclean
>+ 	-cd addon/doxywizard ; $(MAKE) distclean
>+ 	-cd addon/doxysearch ; $(MAKE) distclean
>+ 	-cd addon/doxyapp ; $(MAKE) distclean
>+@@ -51,9 +49,8 @@
>+ 	-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 .makeconfig .tmakeconfig
>+-	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
>++	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro
>+ 	-rm -rf generated_src
>+ 	-rm -f addon/doxywizard/doxywizard.pro
>+ 	-rm -f VERSION
>+@@ -95,7 +92,7 @@
>+ pdf: docs
>+ 	cd latex ; $(MAKE)
>+ 
>+-DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects testing \
>++DISTFILES =  Doxyfile 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
>+--- ./src/definition.cpp.orig	2014-02-22 07:10:44.000000000 -0500
>++++ ./src/definition.cpp	2014-05-04 20:10:03.000000000 -0400
>+@@ -17,6 +17,7 @@
>+ 
>  #include <ctype.h>
>  #include <qregexp.h>
> +#include <sys/types.h>
>@@ -8,9 +57,9 @@
>  #include "md5.h"
>  #include <stdio.h>
>  #include <stdlib.h>
>-@@ -361,13 +362,11 @@
>+@@ -539,13 +540,11 @@
>  
>- bool Definition::_docsAlreadyAdded(const QCString &doc)
>+ bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
>  {
> -  uchar md5_sig[16];
>    QCString sigStr(33);
>@@ -20,17 +69,17 @@
> -  MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
> -  MD5SigToString(md5_sig,sigStr.data(),33);
> +  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data());
>-   if (m_impl->docSignatures.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
>-   {
>-     m_impl->docSignatures+=":"+sigStr;
>---- src/dirdef.cpp.orig	2011-07-26 19:54:31.000000000 +0800
>-+++ src/dirdef.cpp	2011-10-31 17:32:47.872380214 +0800
>+   //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
>+   //    name().data(),doc.data(),sigStr.data(),sigList.data());
>+   if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
>+--- ./src/dirdef.cpp.orig	2014-03-11 16:53:16.000000000 -0400
>++++ ./src/dirdef.cpp	2014-05-04 20:10:57.000000000 -0400
> @@ -1,3 +1,4 @@
> +#include <sys/types.h>
>  #include "md5.h"
>  
>  #include "dirdef.h"
>-@@ -75,10 +76,8 @@
>+@@ -83,10 +84,8 @@
>    QCString result;
>  
>    // convert to md5 hash
>@@ -42,17 +91,17 @@
>    return sigStr;
>  
>    // old algorithm
>---- src/dot.cpp.orig	2011-08-09 02:06:19.000000000 +0800
>-+++ src/dot.cpp	2011-10-31 17:32:47.877389789 +0800
>-@@ -39,6 +39,7 @@
>+--- ./src/dot.cpp.orig	2014-04-20 08:20:55.000000000 -0400
>++++ ./src/dot.cpp	2014-05-04 20:13:41.000000000 -0400
>+@@ -22,6 +22,7 @@
>+ #endif
>+ 
>+ #include <stdlib.h>
>++#include <sys/types.h>
>+ 
>  #include <qdir.h>
>  #include <qfile.h>
>- #include "ftextstream.h"
>-+#include <sys/types.h>
>- #include "md5.h"
>- #include <qqueue.h>
>- 
>-@@ -2063,10 +2064,8 @@
>+@@ -2318,10 +2319,8 @@
>      }
>      writeGraphFooter(md5stream);
>      resetReNumbering();
>@@ -64,7 +113,7 @@
>      bool regenerate=FALSE;
>      if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
>          !checkDeliverables(absImgName,absMapName))
>-@@ -2758,10 +2757,8 @@
>+@@ -3021,10 +3020,8 @@
>      }
>    }
>    writeGraphFooter(md5stream);
>@@ -76,7 +125,7 @@
>    if (reNumber)
>    {
>      resetReNumbering();
>-@@ -3609,10 +3606,8 @@
>+@@ -3895,10 +3892,8 @@
>    QGString theGraph;
>    FTextStream md5stream(&theGraph);
>    m_dir->writeDepGraph(md5stream);
>@@ -88,7 +137,7 @@
>    bool regenerate=FALSE;
>    if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
>        !checkDeliverables(format==BITMAP ? absImgName :
>-@@ -3739,10 +3734,8 @@
>+@@ -4025,10 +4020,8 @@
>    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);
>@@ -100,7 +149,7 @@
>    QCString absBaseName = (QCString)path+"/graph_legend";
>    QCString absDotName  = absBaseName+".dot";
>    QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
>-@@ -4139,10 +4132,8 @@
>+@@ -4424,10 +4417,8 @@
>  
>    writeGraphFooter(md5stream);
>    resetReNumbering();
>@@ -112,29 +161,40 @@
>    QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
>    QCString baseName    = m_diskName;
>    QCString imgName     = baseName+"."+imgExt;
>---- src/doxygen.pro.in.orig	2011-01-04 04:14:46.000000000 +0800
>-+++ src/doxygen.pro.in	2011-10-31 17:32:47.879381383 +0800
>+--- ./src/doxygen.pro.in.orig	2014-02-22 07:10:44.000000000 -0500
>++++ ./src/doxygen.pro.in	2014-05-04 20:14:18.000000000 -0400
> @@ -18,7 +18,7 @@
>  CONFIG       =	console warn_on $extraopts
>  HEADERS      =	doxygen.h 
>  SOURCES      =	main.cpp 
>--unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
>-+unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread
>+-unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
>++unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
>  win32:INCLUDEPATH          += .
>- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
>+ win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
>  win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
>-@@ -28,7 +28,7 @@
>- win32:TMAKE_CXXFLAGS       += -DQT_NODLL
>- win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread
>+@@ -29,7 +29,7 @@
>+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -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 .
> +INCLUDEPATH                += ../qtools .
>  DESTDIR                    =  ../bin
>  TARGET                     =  doxygen
>  unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
>---- src/memberdef.cpp.orig	2011-08-18 22:46:40.000000000 +0800
>-+++ src/memberdef.cpp	2011-10-31 17:35:14.027187598 +0800
>-@@ -19,6 +19,7 @@
>+--- ./src/libdoxygen.pro.in.orig	2014-03-22 14:17:06.000000000 -0400
>++++ ./src/libdoxygen.pro.in	2014-05-04 20:14:48.000000000 -0400
>+@@ -222,7 +222,7 @@
>+ win32-msvc:TMAKE_CXXFLAGS  += -Zm200
>+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions
>+ linux-g++:TMAKE_CXXFLAGS   += -fno-exceptions
>+-INCLUDEPATH                += ../generated_src/doxygen ../src ../qtools ../libmd5
>++INCLUDEPATH                += ../generated_src/doxygen ../src ../qtools
>+ INCLUDEPATH                += %%SQLITE3_INC%%
>+ DEPENDPATH                 += ../generated_src/doxygen
>+ win32:INCLUDEPATH          += .
>+--- ./src/memberdef.cpp.orig	2014-04-12 11:02:02.000000000 -0400
>++++ ./src/memberdef.cpp	2014-05-04 20:15:46.000000000 -0400
>+@@ -17,6 +17,7 @@
>  #include <qglobal.h>
>  #include <qregexp.h>
>  #include <assert.h>
>@@ -142,9 +202,9 @@
>  #include "md5.h"
>  #include "memberdef.h"
>  #include "membername.h"
>-@@ -2771,11 +2772,9 @@
>+@@ -3305,11 +3306,9 @@
>    }
>-   
>+ 
>    // convert to md5 hash
> -  uchar md5_sig[16];
>    QCString sigStr(33);
>@@ -155,10 +215,18 @@
>    m_impl->anc = "a"+sigStr;
>  }
>  
>---- src/membergroup.cpp.orig	2011-04-22 18:08:07.000000000 +0800
>-+++ src/membergroup.cpp	2011-10-31 17:32:47.886381993 +0800
>-@@ -265,12 +265,10 @@
>+--- ./src/membergroup.cpp.orig	2014-02-22 07:10:44.000000000 -0500
>++++ ./src/membergroup.cpp	2014-05-04 20:17:27.000000000 -0400
>+@@ -15,6 +15,7 @@
>+  *
>+  */
>  
>++#include <sys/types.h>
>+ #include "membergroup.h"
>+ #include "memberlist.h"
>+ #include "outputlist.h"
>+@@ -307,12 +308,10 @@
>+ 
>  QCString MemberGroup::anchor() const
>  {
> -  uchar md5_sig[16];
>@@ -171,9 +239,9 @@
>    return "amgrp"+sigStr;
>  }
>  
>---- src/util.cpp.orig	2011-08-19 23:11:12.000000000 +0800
>-+++ src/util.cpp	2011-10-31 17:32:47.892382197 +0800
>-@@ -20,6 +20,7 @@
>+--- ./src/util.cpp.orig	2014-04-12 17:35:51.000000000 -0400
>++++ ./src/util.cpp	2014-05-04 20:22:17.000000000 -0400
>+@@ -19,6 +19,7 @@
>  #include <errno.h>
>  #include <math.h>
>  
>@@ -180,8 +248,8 @@
> +#include <sys/types.h>
>  #include "md5.h"
>  
>- #include "qtbc.h"
>-@@ -4901,16 +4902,16 @@
>+ #include <qregexp.h>
>+@@ -5283,16 +5284,16 @@
>      if (resultLen>=128) // prevent names that cannot be created!
>      {
>        // third algorithm based on MD5 hash
>@@ -201,7 +269,7 @@
>  
>  #if MAP_ALGO==ALGO_COUNT 
>      // old algorithm, has the problem that after regeneration the
>-@@ -4941,12 +4942,13 @@
>+@@ -5323,12 +5324,13 @@
>      l2Dir = (dirNum>>4)&0xff;
>  #elif MAP_ALGO==ALGO_MD5
>      // third algorithm based on MD5 hash

Actions: View | Diff

Attachments on bug 190943: 143688 | 143759 | 143761 | 143785 | 145488