diff options
| -rw-r--r-- | audio/libnjb/Makefile | 2 | ||||
| -rw-r--r-- | audio/libnjb/pkg-plist | 94 | ||||
| -rw-r--r-- | devel/doxygen/Makefile | 3 | ||||
| -rw-r--r-- | devel/doxygen/distinfo | 6 | ||||
| -rw-r--r-- | devel/doxygen/files/patch-addon-doxywizard-Makefile.in | 8 | ||||
| -rw-r--r-- | devel/doxygen/files/patch-configure | 14 | ||||
| -rw-r--r-- | devel/doxygen/files/patch-md5 | 112 | ||||
| -rw-r--r-- | graphics/libwpg/Makefile | 2 | ||||
| -rw-r--r-- | graphics/libwpg/pkg-plist | 9 | ||||
| -rw-r--r-- | graphics/libwpg01/Makefile | 2 | ||||
| -rw-r--r-- | graphics/libwpg01/pkg-plist | 9 |
11 files changed, 160 insertions, 101 deletions
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile index 061392409c71..b5d5646b1643 100644 --- a/audio/libnjb/Makefile +++ b/audio/libnjb/Makefile @@ -7,7 +7,7 @@ PORTNAME= libnjb PORTVERSION= 2.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/libnjb/pkg-plist b/audio/libnjb/pkg-plist index 67027a4c7586..1195f8572c2a 100644 --- a/audio/libnjb/pkg-plist +++ b/audio/libnjb/pkg-plist @@ -29,60 +29,62 @@ libdata/pkgconfig/libnjb.pc %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/annotated.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/base_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/base_8h_source.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/bc_s.png %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/byteorder_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/byteorder_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/classes.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/cursesplay.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/closed.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/cursesplay_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/datafile_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/datafile_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/defs_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/delfile.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/deltr.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/delfile_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/deltr_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/doxygen.css %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/doxygen.png -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumpeax.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumptime.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumpeax_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/dumptime_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/eax_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/eax_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/examples.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/examples_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files.c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/files_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/functions.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/functions_vars.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/fwupgrade.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getfile.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getowner.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/gettr.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getusage.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/fwupgrade_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getfile_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getowner_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/gettr_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/getusage_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x64.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x65.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x66.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x67.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6c.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6d.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6e.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6f.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x70.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x73.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x74.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x75.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_defs.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_enum.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6d.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6e.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x64.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x65.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x66.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x67.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6d.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x6e.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x70.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x73.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x74.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_func_0x75.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_type.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_vars.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6c.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6d.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6e.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x6f.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x64.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x65.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x66.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x67.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x70.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x73.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x74.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/globals_0x75.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__basic.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__codecs.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__datatagapi.html @@ -100,7 +102,7 @@ libdata/pkgconfig/libnjb.pc %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__turboflags.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__types.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/group__unicodeflags.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/handshake.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/handshake_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/index.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/ioutil_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/ioutil_8h_source.html @@ -108,14 +110,17 @@ libdata/pkgconfig/libnjb.pc %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/libnjb_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/mainpage_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/modules.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/nav_f.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/nav_h.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njb__error_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njbtime_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njbtime_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/njb__error_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlists.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/open.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/pl_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/play_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlist_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlist_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/play.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/pl.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/playlists_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/procedure_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/procedure_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8c.html @@ -123,17 +128,13 @@ libdata/pkgconfig/libnjb.pc %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol3_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/protocol_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendfile.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendtr.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setowner.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setpbm.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/settime.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendfile_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/sendtr_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setowner_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/setpbm_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/settime_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/songid_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/songid_8h_source.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbdfhdr__t.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjblibctr__t.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbplhdr__t.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbttaghdr__t.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb3__state__t.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__datafile__struct.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__device__entry.html @@ -147,12 +148,17 @@ libdata/pkgconfig/libnjb.pc %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__state__t.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__struct.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjb__time__struct.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbdfhdr__t.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjblibctr__t.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbplhdr__t.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/structnjbttaghdr__t.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_a.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_b.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_h.png +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_s.png %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tabs.css -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_b.gif -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_l.gif -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tab_r.gif -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tagtr.c-example.html -%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tracks.c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tagtr_8c-example.html +%%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/tracks_8c-example.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/unicode_8c.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/unicode_8h_source.html %%PORTDOCS%%share/doc/libnjb-%%PORTVERSION%%/html/usb__io_8c.html diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 3fe4c003a4a9..3ff2ee824f64 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -6,8 +6,7 @@ # PORTNAME= doxygen -PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTVERSION= 1.7.1 CATEGORIES= devel MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ http://ftp.stack.nl/pub/users/dimitri/ diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo index 86656525868a..75d0bcce75dc 100644 --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -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.1.src.tar.gz) = 13e76e10fb55581a16ee04de35c264f0 +SHA256 (doxygen-1.7.1.src.tar.gz) = 4b866f3b194970d7e0768944255d89b0a1aae7bf337f5ae3e4b8358da349da31 +SIZE (doxygen-1.7.1.src.tar.gz) = 4116363 diff --git a/devel/doxygen/files/patch-addon-doxywizard-Makefile.in b/devel/doxygen/files/patch-addon-doxywizard-Makefile.in index c204f9de1591..8f017b9283ba 100644 --- a/devel/doxygen/files/patch-addon-doxywizard-Makefile.in +++ b/devel/doxygen/files/patch-addon-doxywizard-Makefile.in @@ -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 --git a/devel/doxygen/files/patch-configure b/devel/doxygen/files/patch-configure index 828ed0004a69..64b0ce01d482 100644 --- a/devel/doxygen/files/patch-configure +++ b/devel/doxygen/files/patch-configure @@ -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/{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 @@ -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 --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5 index 44e0d676f3d0..a3a763e85f07 100644 --- a/devel/doxygen/files/patch-md5 +++ b/devel/doxygen/files/patch-md5 @@ -4,8 +4,8 @@ implementation. Try to trim this insanity, where we can... -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 @@ diff -ruN src/definition.cpp src/definition.cpp #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 @@ diff -ruN src/definition.cpp src/definition.cpp { 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 @@ diff -ruN src/dirdef.cpp src/dirdef.cpp // 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 @@ diff -ruN src/doxygen.pro.in src/doxygen.pro.in 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/memberdef.cpp src/memberdef.cpp } 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/membergroup.cpp src/membergroup.cpp } 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 @@ diff -ruN src/util.cpp src/util.cpp #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 @@ diff -ruN src/util.cpp src/util.cpp #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 diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile index 83b5b18019b7..18d362386b59 100644 --- a/graphics/libwpg/Makefile +++ b/graphics/libwpg/Makefile @@ -7,7 +7,7 @@ PORTNAME= libwpg PORTVERSION= 0.1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/libwpg/pkg-plist b/graphics/libwpg/pkg-plist index 53721597896e..705b733995b0 100644 --- a/graphics/libwpg/pkg-plist +++ b/graphics/libwpg/pkg-plist @@ -86,6 +86,7 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h.html %%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h_source.html %%PORTDOCS%%%%DOCSDIR%%/html/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.html %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.png @@ -186,6 +187,7 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate.html %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics.html +%%PORTDOCS%%%%DOCSDIR%%/html/closed.png %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png %%PORTDOCS%%%%DOCSDIR%%/html/files.html @@ -283,6 +285,13 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/main.html %%PORTDOCS%%%%DOCSDIR%%/html/namespacelibwpg.html %%PORTDOCS%%%%DOCSDIR%%/html/namespaces.html +%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/open.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css %%PORTDOCS%%%%DOCSDIR%%/html/tree.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile index 83b5b18019b7..18d362386b59 100644 --- a/graphics/libwpg01/Makefile +++ b/graphics/libwpg01/Makefile @@ -7,7 +7,7 @@ PORTNAME= libwpg PORTVERSION= 0.1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/libwpg01/pkg-plist b/graphics/libwpg01/pkg-plist index 53721597896e..705b733995b0 100644 --- a/graphics/libwpg01/pkg-plist +++ b/graphics/libwpg01/pkg-plist @@ -86,6 +86,7 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h.html %%PORTDOCS%%%%DOCSDIR%%/html/WPGraphics_8h_source.html %%PORTDOCS%%%%DOCSDIR%%/html/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.html %%PORTDOCS%%%%DOCSDIR%%/html/classWPG1Parser.png @@ -186,6 +187,7 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGStringPrivate.html %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classlibwpg_1_1WPGraphics.html +%%PORTDOCS%%%%DOCSDIR%%/html/closed.png %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png %%PORTDOCS%%%%DOCSDIR%%/html/files.html @@ -283,6 +285,13 @@ libdata/pkgconfig/libwpg-stream-0.1.pc %%PORTDOCS%%%%DOCSDIR%%/html/main.html %%PORTDOCS%%%%DOCSDIR%%/html/namespacelibwpg.html %%PORTDOCS%%%%DOCSDIR%%/html/namespaces.html +%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/open.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png %%PORTDOCS%%%%DOCSDIR%%/html/tabs.css %%PORTDOCS%%%%DOCSDIR%%/html/tree.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html |