mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
- Update to 1.5.2
PR: ports/113598 Submitted by: Marcin Wisnicki <mwisnicki+freebsd@gmail.com> Approved by: sat (mentor)
This commit is contained in:
Beech Rintoul
parent
b79fa4678b
commit
93ef84dec5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=193386
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= doxygen
|
||||
PORTVERSION= 1.5.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5.2
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/
|
||||
EXTRACT_SUFX= .src.tar.gz
|
||||
@ -18,13 +17,13 @@ COMMENT= A documentation system for C, C++ and other languages
|
||||
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
|
||||
LIB_DEPENDS= png:${PORTSDIR}/graphics/png
|
||||
|
||||
USE_ICONV= yes
|
||||
ALL_TARGET= all
|
||||
|
||||
EXTRACT_AFTER_ARGS=|${TAR} -xpf - \
|
||||
--exclude '*/libmd5' \
|
||||
--exclude '*/libpng' \
|
||||
--exclude '*/tmake' \
|
||||
--exclude '*/.gdb_history' # XXX: remove this when no longer needed
|
||||
--exclude '*/tmake'
|
||||
|
||||
CONFIGURE_ENV+= CXX="${CXX}"
|
||||
|
||||
@ -77,6 +76,10 @@ PLIST_FILES= bin/doxygen \
|
||||
PLIST_FILES+= bin/doxywizard
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
@cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \
|
||||
${ECHO} "unix:LIBS += -liconv" >> $$pro; done
|
||||
|
||||
post-configure:
|
||||
@${REINPLACE_CMD} -e 's|TMAKE *=.*|TMAKE=${LOCALBASE}/bin/tmake|' \
|
||||
-e 's|TMAKEPATH *=.*|TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++|' \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (doxygen-1.5.1.src.tar.gz) = 43b8e58e5ca70cb8f1285c35a171014e
|
||||
SHA256 (doxygen-1.5.1.src.tar.gz) = c00233e17f64b9da8d05b7bc2b077abebc03edbfa9fbc063359ef17ec6e11578
|
||||
SIZE (doxygen-1.5.1.src.tar.gz) = 2888159
|
||||
MD5 (doxygen-1.5.2.src.tar.gz) = f2782e5bd31a7d10b092500bf0d96ae2
|
||||
SHA256 (doxygen-1.5.2.src.tar.gz) = 496220360b92de6169458b282a8faa32065f71db26d33fb9dc291178fc75381d
|
||||
SIZE (doxygen-1.5.2.src.tar.gz) = 3599976
|
||||
|
||||
@ -3,13 +3,16 @@ implementation. Try to trim this insanity, where we can...
|
||||
|
||||
-mi
|
||||
|
||||
--- src/dirdef.cpp Sun May 7 14:02:30 2006
|
||||
+++ src/dirdef.cpp Wed Jun 14 01:30:20 2006
|
||||
@@ -1,2 +1,3 @@
|
||||
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
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <sys/types.h>
|
||||
#include <md5.h>
|
||||
|
||||
@@ -74,8 +75,6 @@
|
||||
#include "dirdef.h"
|
||||
@@ -73,10 +74,8 @@
|
||||
QCString result;
|
||||
|
||||
// convert to md5 hash
|
||||
- uchar md5_sig[16];
|
||||
@ -19,27 +22,34 @@ implementation. Try to trim this insanity, where we can...
|
||||
+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.data());
|
||||
return sigStr;
|
||||
|
||||
--- src/dot.cpp Sun May 7 14:02:30 2006
|
||||
+++ src/dot.cpp Wed Jun 14 01:32:54 2006
|
||||
@@ -33,4 +33,5 @@
|
||||
// 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 @@
|
||||
#include <qdir.h>
|
||||
#include <qfile.h>
|
||||
#include <qtextstream.h>
|
||||
+#include <sys/types.h>
|
||||
#include <md5.h>
|
||||
|
||||
@@ -1089,8 +1090,6 @@
|
||||
#define MAP_CMD "cmap"
|
||||
@@ -1204,10 +1205,8 @@
|
||||
}
|
||||
writeGraphFooter(md5stream);
|
||||
resetReNumbering();
|
||||
- uchar md5_sig[16];
|
||||
QCString sigStr(33);
|
||||
- MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig);
|
||||
- MD5Buffer((const unsigned char *)theGraph.ascii(),theGraph.length(),md5_sig);
|
||||
- MD5SigToString(md5_sig,sigStr.data(),33);
|
||||
+ MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data());
|
||||
+ MD5Data((const unsigned char *)theGraph.ascii(),theGraph.length(),sigStr.data());
|
||||
if (checkAndUpdateMd5Signature(baseName,sigStr) ||
|
||||
!QFileInfo(mapName).exists())
|
||||
@@ -1643,8 +1642,6 @@
|
||||
{
|
||||
@@ -1833,10 +1832,8 @@
|
||||
}
|
||||
}
|
||||
writeGraphFooter(md5stream);
|
||||
- uchar md5_sig[16];
|
||||
QCString sigStr(33);
|
||||
- MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig);
|
||||
@ -47,15 +57,41 @@ implementation. Try to trim this insanity, where we can...
|
||||
+ MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data());
|
||||
if (reNumber)
|
||||
{
|
||||
--- src/memberdef.cpp Sat Jun 10 12:56:24 2006
|
||||
+++ src/memberdef.cpp Wed Jun 14 01:47:53 2006
|
||||
@@ -18,4 +18,5 @@
|
||||
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
|
||||
@@ -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
|
||||
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
|
||||
@@ -28,7 +28,7 @@
|
||||
win32:TMAKE_CXXFLAGS += -DQT_NODLL
|
||||
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
-INCLUDEPATH += ../qtools ../libpng ../libmd5 .
|
||||
+INCLUDEPATH += ../qtools .
|
||||
#win32-g++:INCLUDEPATH -= ../libpng
|
||||
DESTDIR = ../bin
|
||||
TARGET = doxygen
|
||||
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
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <qregexp.h>
|
||||
+#include <sys/types.h>
|
||||
#include <assert.h>
|
||||
#include <md5.h>
|
||||
#include "memberdef.h"
|
||||
@@ -2134,8 +2135,6 @@
|
||||
@@ -2361,10 +2362,8 @@
|
||||
memAnchor.prepend(definition());
|
||||
|
||||
// convert to md5 hash
|
||||
- uchar md5_sig[16];
|
||||
@ -63,24 +99,22 @@ implementation. Try to trim this insanity, where we can...
|
||||
- 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());
|
||||
anc = sigStr;
|
||||
m_impl->anc = sigStr;
|
||||
}
|
||||
--- src/util.cpp Sun May 7 14:02:32 2006
|
||||
+++ src/util.cpp Wed Jun 14 02:05:03 2006
|
||||
@@ -22,4 +22,5 @@
|
||||
#endif
|
||||
|
||||
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
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <md5.h>
|
||||
|
||||
@@ -4319,5 +4320,5 @@
|
||||
if (value==0)
|
||||
{
|
||||
- usedNames.insert(name,(void *)count);
|
||||
+ usedNames.insert(name,(void *)(intptr_t)count);
|
||||
num = count++;
|
||||
}
|
||||
@@ -4335,8 +4336,6 @@
|
||||
#include "qtbc.h"
|
||||
@@ -4561,16 +4562,16 @@
|
||||
if (resultLen>=128) // prevent names that cannot be created!
|
||||
{
|
||||
// third algorithm based on MD5 hash
|
||||
- uchar md5_sig[16];
|
||||
@ -90,7 +124,7 @@ implementation. Try to trim this insanity, where we can...
|
||||
+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.data());
|
||||
result=result.left(128-32)+sigStr;
|
||||
}
|
||||
@@ -4344,5 +4343,7 @@
|
||||
}
|
||||
if (createSubdirs)
|
||||
{
|
||||
+#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
|
||||
@ -98,7 +132,9 @@ implementation. Try to trim this insanity, where we can...
|
||||
+#endif
|
||||
|
||||
#if MAP_ALGO==ALGO_COUNT
|
||||
@@ -4375,10 +4376,11 @@
|
||||
// old algorithm, has the problem that after regeneration the
|
||||
@@ -4601,12 +4602,13 @@
|
||||
l2Dir = (dirNum>>4)&0xff;
|
||||
#elif MAP_ALGO==ALGO_MD5
|
||||
// third algorithm based on MD5 hash
|
||||
- uchar md5_sig[16];
|
||||
@ -114,19 +150,4 @@ implementation. Try to trim this insanity, where we can...
|
||||
+#endif
|
||||
}
|
||||
return result;
|
||||
--- src/doxygen.pro.in Sun May 7 14:02:30 2006
|
||||
+++ src/doxygen.pro.in Wed Jun 14 02:08:53 2006
|
||||
@@ -19,5 +19,5 @@
|
||||
HEADERS = doxygen.h
|
||||
SOURCES = main.cpp
|
||||
-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
|
||||
+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd
|
||||
win32:INCLUDEPATH += .
|
||||
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
|
||||
@@ -29,5 +29,5 @@
|
||||
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
-INCLUDEPATH += ../qtools ../libpng ../libmd5 .
|
||||
+INCLUDEPATH += ../qtools .
|
||||
#win32-g++:INCLUDEPATH -= ../libpng
|
||||
DESTDIR = ../bin
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user