Date: Fri, 21 Aug 2009 01:52:03 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138013: [MAINTAINER] devel/doxygen: update to 1.6.0 Message-ID: <200908210552.n7L5q3eM024250@kirby.cyberbotx.com> Resent-Message-ID: <200908210600.n7L6043X059555@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138013 >Category: ports >Synopsis: [MAINTAINER] devel/doxygen: update to 1.6.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: Fri Aug 21 06:00:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 3 04:24:13 EDT >Description: - Update to 1.6.0 Removed file(s): - files/patch-png Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- doxygen-1.6.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/doxygen/Makefile /kirby/shared/ports/doxygen/Makefile --- /usr/ports/devel/doxygen/Makefile 2009-08-01 11:13:01.000000000 -0400 +++ /kirby/shared/ports/doxygen/Makefile 2009-08-21 00:41:42.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= doxygen -PORTVERSION= 1.5.9 -PORTREVISION= 1 +PORTVERSION= 1.6.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 2009-05-09 17:51:36.000000000 -0400 +++ /kirby/shared/ports/doxygen/distinfo 2009-08-21 00:42:06.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (doxygen-1.5.9.src.tar.gz) = 33c5598fa6d24cbc55849eaf89652557 -SHA256 (doxygen-1.5.9.src.tar.gz) = 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e -SIZE (doxygen-1.5.9.src.tar.gz) = 4141375 +MD5 (doxygen-1.6.0.src.tar.gz) = 54b2e1fe0de7071fe135bd0297d903ff +SHA256 (doxygen-1.6.0.src.tar.gz) = f33c82794d034b8b9f60ff80c49624c3da3eeaace277a9be27f56fe6ccf3c253 +SIZE (doxygen-1.6.0.src.tar.gz) = 3899759 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 2008-12-29 21:26:32.000000000 -0500 +++ /kirby/shared/ports/doxygen/files/patch-addon-doxywizard-Makefile.in 2009-08-21 00:47:40.000000000 -0400 @@ -1,22 +1,11 @@ ---- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 -+++ addon/doxywizard/Makefile.in 2008-12-28 15:32:07.000000000 -0500 -@@ -10,16 +10,16 @@ +--- 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 +@@ -10,7 +10,7 @@ # See the GNU General Public License for more details. # --QMAKE = qmake -+QMAKE = qmake-qt4 +-QMAKE=qmake ++QMAKE=qmake-qt4 all: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard - - Makefile.doxywizard: doxywizard.pro -- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard -+ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard - - qmake: -- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard -+ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard - - clean: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard clean 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 2008-12-29 22:22:38.000000000 -0500 +++ /kirby/shared/ports/doxygen/files/patch-configure 2009-08-21 00:51:06.000000000 -0400 @@ -1,5 +1,5 @@ ---- configure.orig 2008-12-26 14:22:39.000000000 -0500 -+++ configure 2008-12-28 16:27:43.000000000 -0500 +--- configure.orig 2009-08-20 08:15:07.000000000 -0400 ++++ configure 2009-08-21 00:50:54.000000000 -0400 @@ -269,7 +269,7 @@ echo " QTDIR environment variable not set!" echo -n " Checking for Qt..." @@ -31,29 +31,24 @@ 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 libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/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 libmd5/Makefile.in addon/doxyapp/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" for i in $f_inmakefiles ; do SRC=$i -@@ -591,10 +591,8 @@ - if test $i = Makefile.in; then +@@ -592,7 +592,6 @@ echo "" >> $DST echo "all: src/version.cpp " >> $DST -- echo " \$(MAKE) -C qtools" >> $DST -- echo " \$(MAKE) -C libpng" >> $DST + echo " \$(MAKE) -C qtools" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST -- echo " \$(MAKE) -C src" >> $DST -+ echo " \$(MAKE) -j2 -C qtools" >> $DST -+ echo " \$(MAKE) -j2 -C src" >> $DST + echo " \$(MAKE) -C src" >> $DST if test $f_wizard = YES; then echo " \$(MAKE) -C addon/doxywizard" >> $DST - fi -@@ -616,7 +614,7 @@ +@@ -615,7 +614,7 @@ echo " Created $DST from $SRC..." done --f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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 libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" +-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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" +f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.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" for i in $f_inprofiles ; do 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 2009-05-09 17:51:36.000000000 -0400 +++ /kirby/shared/ports/doxygen/files/patch-md5 2009-08-21 01:10:18.000000000 -0400 @@ -4,8 +4,8 @@ -mi diff -ruN src/definition.cpp src/definition.cpp ---- src/definition.cpp Sat Sep 1 13:11:48 2007 -+++ src/definition.cpp Mon Dec 3 01:25:59 2007 +--- src/definition.cpp.orig 2009-06-13 09:42:16.000000000 -0400 ++++ src/definition.cpp 2009-08-21 00:54:43.000000000 -0400 @@ -18,6 +18,7 @@ #include "qtbc.h" #include <ctype.h> @@ -16,7 +16,7 @@ #include <stdlib.h> @@ -363,13 +364,11 @@ - bool Definition::_docsAlreadyAdded(const QString &doc) + bool Definition::_docsAlreadyAdded(const QCString &doc) { - uchar md5_sig[16]; QCString sigStr(33); @@ -25,19 +25,19 @@ QCString docStr = doc.simplifyWhiteSpace(); - 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()); ++ 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; diff -ruN src/dirdef.cpp src/dirdef.cpp ---- src/dirdef.cpp Sun Jan 28 13:28:50 2007 -+++ src/dirdef.cpp Mon Jun 11 18:32:26 2007 +--- src/dirdef.cpp.orig 2009-05-02 09:05:03.000000000 -0400 ++++ src/dirdef.cpp 2009-08-21 00:56:06.000000000 -0400 @@ -1,3 +1,4 @@ +#include <sys/types.h> #include <md5.h> #include "dirdef.h" -@@ -73,10 +74,8 @@ +@@ -74,10 +75,8 @@ QCString result; // convert to md5 hash @@ -50,17 +50,17 @@ // old algorithm diff -ruN src/dot.cpp src/dot.cpp ---- src/dot.cpp Wed Mar 21 22:35:06 2007 -+++ src/dot.cpp Mon Jun 11 18:33:40 2007 -@@ -38,6 +38,7 @@ +--- src/dot.cpp.orig 2009-08-13 15:15:42.000000000 -0400 ++++ src/dot.cpp 2009-08-21 00:57:50.000000000 -0400 +@@ -39,6 +39,7 @@ #include <qdir.h> #include <qfile.h> #include <qtextstream.h> +#include <sys/types.h> #include <md5.h> - #define MAP_CMD "cmap" -@@ -1204,10 +1205,8 @@ + #define MAP_CMD "cmapx" +@@ -1100,10 +1101,8 @@ } writeGraphFooter(md5stream); resetReNumbering(); @@ -72,7 +72,7 @@ if (checkAndUpdateMd5Signature(baseName,sigStr) || !QFileInfo(mapName).exists()) { -@@ -1833,10 +1832,8 @@ +@@ -1761,10 +1760,8 @@ } } writeGraphFooter(md5stream); @@ -85,29 +85,29 @@ { resetReNumbering(); diff -ruN src/doxygen.pro.in src/doxygen.pro.in ---- src/doxygen.pro.in Tue Feb 20 19:27:35 2007 -+++ src/doxygen.pro.in Mon Jun 11 18:34:03 2007 +--- src/doxygen.pro.in.orig 2009-08-02 09:55:02.000000000 -0400 ++++ src/doxygen.pro.in 2009-08-21 00:58:38.000000000 -0400 @@ -18,7 +18,7 @@ CONFIG = console warn_on $extraopts HEADERS = doxygen.h SOURCES = main.cpp --unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 - win32-msvc:LIBS += qtools.lib png.lib md5.lib doxygen.lib doxycfg.lib shell32.lib + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 + 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 -lpng -lmd5 + win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti --INCLUDEPATH += ../qtools ../libpng ../libmd5 . +-INCLUDEPATH += ../qtools ../libmd5 . +INCLUDEPATH += ../qtools . - #win32-g++:INCLUDEPATH -= ../libpng DESTDIR = ../bin TARGET = doxygen + unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a diff -ruN src/memberdef.cpp src/memberdef.cpp ---- src/memberdef.cpp Wed Mar 14 15:49:45 2007 -+++ src/memberdef.cpp Mon Jun 11 18:32:26 2007 +--- src/memberdef.cpp.orig 2009-08-13 15:15:43.000000000 -0400 ++++ src/memberdef.cpp 2009-08-21 00:59:48.000000000 -0400 @@ -17,6 +17,7 @@ #include <stdio.h> @@ -116,7 +116,7 @@ #include <assert.h> #include <md5.h> #include "memberdef.h" -@@ -2361,10 +2362,8 @@ +@@ -2561,10 +2562,8 @@ memAnchor.prepend(definition()); // convert to md5 hash @@ -125,12 +125,12 @@ - MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig); - MD5SigToString(md5_sig,sigStr.data(),33); + MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data()); - m_impl->anc = sigStr; + m_impl->anc = "a"+sigStr; } diff -ruN src/util.cpp src/util.cpp ---- src/util.cpp Wed Mar 14 13:36:26 2007 -+++ src/util.cpp Mon Jun 11 18:32:26 2007 +--- src/util.cpp.orig 2009-08-20 08:13:51.000000000 -0400 ++++ src/util.cpp 2009-08-21 01:03:39.000000000 -0400 @@ -19,6 +19,7 @@ #include <ctype.h> #include <errno.h> @@ -139,7 +139,7 @@ #include <md5.h> #include "qtbc.h" -@@ -4561,16 +4562,16 @@ +@@ -4851,16 +4852,16 @@ if (resultLen>=128) // prevent names that cannot be created! { // third algorithm based on MD5 hash @@ -159,7 +159,7 @@ #if MAP_ALGO==ALGO_COUNT // old algorithm, has the problem that after regeneration the -@@ -4601,12 +4602,13 @@ +@@ -4891,12 +4892,13 @@ l2Dir = (dirNum>>4)&0xff; #elif MAP_ALGO==ALGO_MD5 // third algorithm based on MD5 hash @@ -175,5 +175,5 @@ result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir)); +#endif } + //printf("*** convertNameToFile(%s)->%s\n",name,result.data()); return result; - } diff -ruN --exclude=CVS /usr/ports/devel/doxygen/files/patch-png /kirby/shared/ports/doxygen/files/patch-png --- /usr/ports/devel/doxygen/files/patch-png 2006-06-27 00:35:57.000000000 -0400 +++ /kirby/shared/ports/doxygen/files/patch-png 1969-12-31 19:00:00.000000000 -0500 @@ -1,25 +0,0 @@ -Use the standard png-library instead of rolling our own. - - -mi - ---- src/pngenc.cpp Sun May 7 14:02:31 2006 -+++ src/pngenc.cpp Wed Jun 14 01:50:19 2006 -@@ -21,10 +21,5 @@ - */ - --#ifndef png_jmpbuf --# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) --#endif -- --#define ALL_STATIC --#include <../libpng/png.h> -+#include <png.h> - #include <stdio.h> - #include <stdlib.h> -@@ -33,6 +28,4 @@ - #include "pngenc.h" - #include "message.h" -- --#undef jmpbuf - - static void user_error_fn(png_structp, png_const_charp error_msg) --- doxygen-1.6.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?200908210552.n7L5q3eM024250>