Date: Tue, 15 Jun 2010 08:38:12 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/147878: [MAINTAINER] devel/doxygen: update to 1.7.0 Message-ID: <201006151238.o5FCcC8h029224@kirby.cyberbotx.com> Resent-Message-ID: <201006151240.o5FCe0Ru035356@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147878 >Category: ports >Synopsis: [MAINTAINER] devel/doxygen: update to 1.7.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jun 15 12:40:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Apr 16 09:09:45 EDT 2010 >Description: - Update to 1.7.0 Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- doxygen-1.7.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/doxygen/Makefile /kirby/shared/ports/doxygen/Makefile --- /usr/ports/devel/doxygen/Makefile 2010-04-16 17:49:09.000000000 -0400 +++ /kirby/shared/ports/doxygen/Makefile 2010-06-15 07:43:17.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= doxygen -PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTVERSION= 1.7.0 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ diff -ruN --exclude=CVS /usr/ports/devel/doxygen/distinfo /kirby/shared/ports/doxygen/distinfo --- /usr/ports/devel/doxygen/distinfo 2010-04-16 17:49:09.000000000 -0400 +++ /kirby/shared/ports/doxygen/distinfo 2010-06-15 07:43:22.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (doxygen-1.6.3.src.tar.gz) = 2d6ea20a9d850d94321cee78bab7bb87 -SHA256 (doxygen-1.6.3.src.tar.gz) = a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492 -SIZE (doxygen-1.6.3.src.tar.gz) = 3986440 +MD5 (doxygen-1.7.0.src.tar.gz) = 5b678b08e96b51eb9b63307a9fac6e96 +SHA256 (doxygen-1.7.0.src.tar.gz) = c842a485b82061b0456f7b83295cf7f0d7afa864398ce9521c12033a46b60eaa +SIZE (doxygen-1.7.0.src.tar.gz) = 4113934 diff -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-addon-doxywizard-Makefile.in /kirby/shared/ports/doxygen/files/patch-addon-doxywizard-Makefile.in --- /usr/ports/devel/doxygen/files/patch-addon-doxywizard-Makefile.in 2010-04-16 17:49:09.000000000 -0400 +++ /kirby/shared/ports/doxygen/files/patch-addon-doxywizard-Makefile.in 2010-06-15 07:45:13.000000000 -0400 @@ -1,11 +1,11 @@ ---- addon/doxywizard/Makefile.in.orig 2009-07-13 16:09:03.000000000 -0400 -+++ addon/doxywizard/Makefile.in 2009-08-21 00:47:10.000000000 -0400 +--- addon/doxywizard/Makefile.in.orig 2010-05-23 10:51:31.000000000 -0400 ++++ addon/doxywizard/Makefile.in 2010-06-15 07:44:44.000000000 -0400 @@ -10,7 +10,7 @@ # See the GNU General Public License for more details. # --QMAKE=qmake -+QMAKE=qmake-qt4 +-QMAKE=qmake $(MKSPECS) ++QMAKE=qmake-qt4 $(MKSPECS) all: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard diff -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-configure /kirby/shared/ports/doxygen/files/patch-configure --- /usr/ports/devel/doxygen/files/patch-configure 2010-04-16 17:49:09.000000000 -0400 +++ /kirby/shared/ports/doxygen/files/patch-configure 2010-06-15 07:48:53.000000000 -0400 @@ -1,9 +1,9 @@ ---- configure.orig 2009-08-20 08:15:07.000000000 -0400 -+++ configure 2009-08-21 00:50:54.000000000 -0400 +--- configure.orig 2010-06-15 04:00:19.000000000 -0400 ++++ configure 2010-06-15 07:48:37.000000000 -0400 @@ -269,7 +269,7 @@ echo " QTDIR environment variable not set!" echo -n " Checking for Qt..." - for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do + for d in /usr /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do - if test -x "$d/bin/qmake"; then + if test -x "$d/bin/qmake-qt4"; then QTDIR=$d @@ -18,7 +18,7 @@ echo "check the Qt installation instructions!" exit 2 fi -@@ -565,7 +565,7 @@ +@@ -576,7 +576,7 @@ fi if test "$f_wizard" = YES; then cat >> .tmakeconfig <<EOF @@ -27,7 +27,7 @@ EOF fi -@@ -575,7 +575,7 @@ +@@ -586,7 +586,7 @@ EOF fi @@ -36,7 +36,7 @@ for i in $f_inmakefiles ; do SRC=$i -@@ -592,7 +592,6 @@ +@@ -603,7 +603,6 @@ echo "" >> $DST echo "all: src/version.cpp " >> $DST echo " \$(MAKE) -C qtools" >> $DST @@ -44,7 +44,7 @@ echo " \$(MAKE) -C src" >> $DST if test $f_wizard = YES; then echo " \$(MAKE) -C addon/doxywizard" >> $DST -@@ -615,7 +614,7 @@ +@@ -626,7 +625,7 @@ echo " Created $DST from $SRC..." done diff -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-md5 /kirby/shared/ports/doxygen/files/patch-md5 --- /usr/ports/devel/doxygen/files/patch-md5 2010-04-16 17:49:09.000000000 -0400 +++ /kirby/shared/ports/doxygen/files/patch-md5 2010-06-15 08:13:12.000000000 -0400 @@ -4,8 +4,8 @@ -mi diff -ruN src/definition.cpp src/definition.cpp ---- src/definition.cpp.orig 2009-12-08 14:19:28.000000000 -0500 -+++ src/definition.cpp 2009-12-31 11:52:30.000000000 -0500 +--- src/definition.cpp.orig 2010-06-10 07:50:15.000000000 -0400 ++++ src/definition.cpp 2010-06-15 07:52:03.000000000 -0400 @@ -18,6 +18,7 @@ #include "qtbc.h" #include <ctype.h> @@ -14,7 +14,7 @@ #include <md5.h> #include <stdio.h> #include <stdlib.h> -@@ -364,13 +365,11 @@ +@@ -362,13 +363,11 @@ bool Definition::_docsAlreadyAdded(const QCString &doc) { @@ -30,14 +30,14 @@ { m_impl->docSignatures+=":"+sigStr; diff -ruN src/dirdef.cpp src/dirdef.cpp ---- src/dirdef.cpp.orig 2009-10-04 15:15:11.000000000 -0400 -+++ src/dirdef.cpp 2009-12-31 11:55:59.000000000 -0500 +--- src/dirdef.cpp.orig 2010-04-30 06:45:25.000000000 -0400 ++++ src/dirdef.cpp 2010-06-15 07:55:03.000000000 -0400 @@ -1,3 +1,4 @@ +#include <sys/types.h> #include <md5.h> #include "dirdef.h" -@@ -74,10 +75,8 @@ +@@ -75,10 +76,8 @@ QCString result; // convert to md5 hash @@ -50,55 +50,91 @@ // old algorithm diff -ruN src/dot.cpp src/dot.cpp ---- src/dot.cpp.orig 2009-10-10 06:50:28.000000000 -0400 -+++ src/dot.cpp 2009-12-31 11:57:49.000000000 -0500 +--- src/dot.cpp.orig 2010-06-11 08:03:22.000000000 -0400 ++++ src/dot.cpp 2010-06-15 08:12:47.000000000 -0400 @@ -39,6 +39,7 @@ #include <qdir.h> #include <qfile.h> - #include <qtextstream.h> + #include "ftextstream.h" +#include <sys/types.h> #include <md5.h> - - #define MAP_CMD "cmapx" -@@ -1144,10 +1145,8 @@ + #include <qqueue.h> + +@@ -1569,10 +1570,8 @@ } writeGraphFooter(md5stream); resetReNumbering(); - uchar md5_sig[16]; QCString sigStr(33); -- MD5Buffer((const unsigned char *)theGraph.ascii(),theGraph.length(),md5_sig); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); -+ MD5Data((const unsigned char *)theGraph.ascii(),theGraph.length(),sigStr.data()); - if (checkAndUpdateMd5Signature(absBaseName,sigStr) || - !QFileInfo(absMapName).exists()) - { -@@ -1805,10 +1804,8 @@ ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + bool regenerate=FALSE; + if (checkAndUpdateMd5Signature(absBaseName,sigStr) || + !checkDeliverables(absMapName)) +@@ -2227,10 +2226,8 @@ } } writeGraphFooter(md5stream); - uchar md5_sig[16]; QCString sigStr(33); -- MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig); +- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); -+ MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data()); ++ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data()); if (reNumber) { resetReNumbering(); +@@ -3023,10 +3020,8 @@ + QGString theGraph; + FTextStream md5stream(&theGraph); + m_dir->writeDepGraph(md5stream); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + bool regenerate=FALSE; + if (checkAndUpdateMd5Signature(absBaseName,sigStr) || + !checkDeliverables(format==BITMAP ? absImgName : +@@ -3135,10 +3130,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); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + QCString absBaseName = (QCString)path+"/graph_legend"; + QCString absDotName = absBaseName+".dot"; + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); +@@ -3501,10 +3494,8 @@ + + writeGraphFooter(md5stream); + resetReNumbering(); +- uchar md5_sig[16]; + QCString sigStr(33); +- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); +- MD5SigToString(md5_sig,sigStr.data(),33); ++ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data()); + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString baseName = m_diskName; + QCString imgName = baseName+"."+imgExt; diff -ruN src/doxygen.pro.in src/doxygen.pro.in ---- src/doxygen.pro.in.orig 2009-08-02 09:55:02.000000000 -0400 -+++ src/doxygen.pro.in 2009-12-31 11:58:49.000000000 -0500 +--- src/doxygen.pro.in.orig 2010-05-08 04:57:08.000000000 -0400 ++++ src/doxygen.pro.in 2010-06-15 07:58:47.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 -+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread 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 + win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -INCLUDEPATH += ../qtools ../libmd5 . +INCLUDEPATH += ../qtools . @@ -106,17 +142,17 @@ TARGET = doxygen unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a diff -ruN src/memberdef.cpp src/memberdef.cpp ---- src/memberdef.cpp.orig 2009-11-21 17:58:04.000000000 -0500 -+++ src/memberdef.cpp 2009-12-31 12:00:03.000000000 -0500 -@@ -17,6 +17,7 @@ - +--- src/memberdef.cpp.orig 2010-05-13 06:11:21.000000000 -0400 ++++ src/memberdef.cpp 2010-06-15 08:00:50.000000000 -0400 +@@ -18,6 +18,7 @@ #include <stdio.h> #include <qregexp.h> -+#include <sys/types.h> #include <assert.h> ++#include <sys/types.h> #include <md5.h> #include "memberdef.h" -@@ -2516,10 +2517,8 @@ + #include "membername.h" +@@ -2556,10 +2557,8 @@ memAnchor.prepend(definition()); // convert to md5 hash @@ -129,8 +165,8 @@ } diff -ruN src/membergroup.cpp src/membergroup.cpp ---- src/membergroup.cpp.orig 2009-12-22 06:35:39.000000000 -0500 -+++ src/membergroup.cpp 2009-12-31 12:01:18.000000000 -0500 +--- src/membergroup.cpp.orig 2010-01-01 06:52:59.000000000 -0500 ++++ src/membergroup.cpp 2010-06-15 08:02:18.000000000 -0400 @@ -261,10 +261,8 @@ QCString MemberGroup::anchor() const @@ -144,8 +180,8 @@ } diff -ruN src/util.cpp src/util.cpp ---- src/util.cpp.orig 2009-12-28 06:00:55.000000000 -0500 -+++ src/util.cpp 2009-12-31 12:03:47.000000000 -0500 +--- src/util.cpp.orig 2010-06-14 05:15:31.000000000 -0400 ++++ src/util.cpp 2010-06-15 08:06:41.000000000 -0400 @@ -19,6 +19,7 @@ #include <ctype.h> #include <errno.h> @@ -154,7 +190,7 @@ #include <md5.h> #include "qtbc.h" -@@ -4844,16 +4845,16 @@ +@@ -4886,16 +4887,16 @@ if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash @@ -174,7 +210,7 @@ #if MAP_ALGO==ALGO_COUNT // old algorithm, has the problem that after regeneration the -@@ -4884,12 +4885,13 @@ +@@ -4926,12 +4927,13 @@ l2Dir = (dirNum>>4)&0xff; #elif MAP_ALGO==ALGO_MD5 // third algorithm based on MD5 hash --- doxygen-1.7.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006151238.o5FCcC8h029224>