diff options
12 files changed, 470 insertions, 190 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index b13ca67e10a9..ea7abb1ed87a 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.6.3 +PORTVERSION= 2.6.4 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo index 660dd3430718..b79385d749ce 100644 --- a/net-p2p/mldonkey-devel/distinfo +++ b/net-p2p/mldonkey-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (mldonkey-2.6.3.tar.bz2) = 5a71317970b0c5c2a50d3d4e98c14f41 -SIZE (mldonkey-2.6.3.tar.bz2) = 2660337 +MD5 (mldonkey-2.6.4.tar.bz2) = d969f81b51e194fcaf46790686269e3e +SIZE (mldonkey-2.6.4.tar.bz2) = 2669228 diff --git a/net-p2p/mldonkey-devel/files/patch-config::configure.in b/net-p2p/mldonkey-devel/files/patch-config::configure.in new file mode 100644 index 000000000000..e5cf5ae2ebf8 --- /dev/null +++ b/net-p2p/mldonkey-devel/files/patch-config::configure.in @@ -0,0 +1,232 @@ +--- config/configure.in.orig Sat Sep 3 20:27:22 2005 ++++ config/configure.in Sun Sep 4 11:48:13 2005 +@@ -17,20 +17,15 @@ + + OS_FILES=unix + OS_FILES2=unix ++ + case $host in + *mingw*) + OS_FILES=mingw + OS_FILES2=mingw +- PTHREAD_LIBS="-lpthreadGC2 -lwsock32" +- PTHREAD_CFLAGS="-DPTW32_STATIC_LIB" + ;; + *cygwin*) + OS_FILES2=cygwin + ;; +- *freebsd*) +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" +- ;; + esac + + case "`uname -s`" in +@@ -59,13 +54,8 @@ + + if test -d .svn; then + AC_MSG_NOTICE(checking SVN revision) +- AC_CHECK_PROG(SVNVERSION,svnversion,svnversion) +- if test "$ac_cv_prog_SVNVERSION" = "svnversion"; then +- SUB_VERSION3="SVN" +- SCM_VERSION=`svnversion -n .` +- else AC_MSG_NOTICE(cannot checking SVN revision... no SVNVERSION) +- SCM_VERSION="cannot find out SVN revision (no SVNVERSION)" +- fi ++ SUB_VERSION3="SVN" ++ SCM_VERSION=`svnversion -n .` + fi + if test -f ./CVS/Entries ; then + AC_MSG_NOTICE(checking CVS checkout date) +@@ -95,16 +85,10 @@ + fi + fi + fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no CUT) +- SCM_VERSION="cannot find out SCM Version (no CUT)" + fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no SED) +- SCM_VERSION="cannot find out SCM Version (no SED)" +- fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no STAT) +- SCM_VERSION="cannot find out SCM Version (no STAT)" + fi + fi ++fi + MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION + if test -f ./subrelease; then + MLDONKEY_VERSION=$MLDONKEY_VERSION`cat ./subrelease` +@@ -201,11 +185,15 @@ + fi + fi + +-USE_PTHREAD=yes +-AC_ARG_ENABLE(pthread, [ --disable-pthread allows you to disable pthread support in mldonkey], [USE_PTHREAD="$enableval"]) +-AC_ARG_ENABLE(pthread-lib, [ --enable-pthread-lib legacy option], [USE_PTHREAD="$enableval"]) ++PTHREAD_LIBS=yes ++AC_ARG_ENABLE(pthread, [ --disable-pthread allows you to disable pthread support in mldonkey], [PTHREAD_LIBS="$enableval"]) ++AC_ARG_ENABLE(pthread-lib, [ --enable-pthread-lib legacy option], [PTHREAD_LIBS="$enableval"]) + +-ICONV=yes ++if [ test "$SYSTEM" = "windows"]; then ++ ICONV=no ++else ++ ICONV=yes ++fi + AC_ARG_ENABLE(iconv, [ --disable-iconv disable the use of iconv for compiling on broken windows environments], [ICONV="$enableval"]) + + GD=yes +@@ -583,7 +571,7 @@ + BZIP2=no + HAS_BZIP2=false + if test "$USE_BZIP2" != "no"; then +- AC_CHECK_HEADERS(bzlib.h,[AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[BZIP2=yes],)]) ++ AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[AC_CHECK_HEADERS(bzlib.h,[BZIP2=yes],)]) + fi + + if test "$BZIP2" = "yes"; then +@@ -624,21 +612,19 @@ + if test "$ICONV" = "yes"; then + AM_ICONV + if test "$am_cv_func_iconv" != "yes"; then +- AC_MSG_FAILURE([iconv() is missing, did you install the libraries and the developer packages for libiconv?]) ++ echo "iconv() is missing, did you install the libraries and the developer packages for libiconv?" ++ exit 1 + fi + LIBS="$LIBS $LIBICONV" +- AC_CHECK_FUNCS([locale_charset],, +- AC_TRY_LINK([#include <langinfo.h>], +- [char* cs = nl_langinfo(CODESET);], +- AC_MSG_NOTICE(found nl_langinfo(CODESET)), +- [AC_MSG_FAILURE(Your iconv implementation is incomplete)])) +- AC_CHECK_LIB(charset,locale_charset) ++ AC_CHECK_FUNCS([locale_charset]) + AC_CHECK_HEADERS([libcharset.h]) + AC_CHECK_HEADERS([locale.h]) ++ AC_CHECK_LIB(charset,locale_charset) + else + AC_DEFINE(DISABLE_ICONV, 1, [Define to 1 if you want to replace iconv and related with stubs.]) + fi + ++ + # On linux plaforms, we will have to check that includes from kernel are + # available. glibc version test was shamelessly taken from + # http://public.activestate.com/gsar/APC/perl-5.8.x/Configure +@@ -652,7 +638,7 @@ + CPPFLAGS=$OLD_CPPFLAGS] + ) + AC_CHECK_HEADERS(gnu/libc-version.h,,) +- AC_MSG_CHECKING(for GNU C Library version) ++ AC_MSG_CHECKING(Checking for GNU C Library version) + + cat >try.c <<'EOCP' + /* Find out version of GNU C library. __GLIBC__ and __GLIBC_MINOR__ +@@ -1014,7 +1000,7 @@ + + if test "$IM" = "yes"; then + CRYPTOKIT=no +- AC_MSG_CHECKING(for CryptoKit) ++ AC_MSG_CHECKING(Checking for CryptoKit) + if test -f $OCAMLLIB/cryptokit.$OCAMLLIB_EXT; then + CRYPTOKIT=yes + AC_MSG_RESULT(yes) +@@ -1045,7 +1031,7 @@ + fi + fi + +-if test "$USE_PTHREAD" = "no"; then ++if test "$PTHREAD_LIBS" = "no"; then + PTHREAD_LIBS="" + echo "Dont use threads" + else +@@ -1112,49 +1098,15 @@ + if test "$GD" != "no"; then + GD=no + LIBGD=no +- SAVE_LIBS=$LIBS +- +- AC_CHECK_PROG(GDLIBCONFIG, gdlib-config, gdlib-config) +- if test "$ac_cv_prog_GDLIBCONFIG" = "gdlib-config"; then +- GDLIBCONFIG=`$GDLIBCONFIG --libs` +- GDLIBS="$LIBS -lgd $GDLIBCONFIG" +- LIBS=$GDLIBS +- fi +- +- AC_MSG_CHECKING(for gdImageCreate in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImageCreate (0,0);], +- [LIBGD=yes], [LIBGD=no]) +- AC_MSG_RESULT($LIBGD) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImageCreate, [LIBGD=yes], [LIBGD=no]) +- fi +- ++ AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes]) + if test "$LIBGD" = "yes"; then +- + LIBPNG=no + AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes]) +- ++ LIBGD_PNG=no ++ AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes]) + if test "$LIBPNG" = "no"; then + AC_MSG_NOTICE(png support not available) + else +- LIBGD_PNG=no +- LIBS=$GDLIBS +- AC_MSG_CHECKING(for gdImagePng in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImagePng (0,0);], +- [LIBGD_PNG=yes], [LIBGD_PNG=no]) +- AC_MSG_RESULT($LIBGD_PNG) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD_PNG" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes], [LIBGD_PNG=no]) +- fi +- + if test "$LIBGD_PNG" = "yes"; then + GD=yes + HAS_GD_PNG=true +@@ -1167,27 +1119,13 @@ + AC_MSG_NOTICE(png support not available in libgd) + fi + fi +- + LIBJPEG=no + AC_CHECK_LIB(jpeg, jpeg_CreateCompress, [LIBJPEG=yes]) +- ++ LIBGD_JPG=no ++ AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes]) + if test "$LIBJPEG" = "no"; then + AC_MSG_NOTICE(jpeg support not available) + else +- LIBGD_JPG=no +- LIBS=$GDLIBS +- AC_MSG_CHECKING(for gdImageJpeg in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImageJpeg (0,0,0);], +- [LIBGD_JPG=yes], [LIBGD_JPG=no]) +- AC_MSG_RESULT($LIBGD_JPG) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD_JPG" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes], [LIBGD_JPG=no]) +- fi +- + if test "$LIBGD_JPG" = "yes"; then + GD=yes + HAS_GD_JPG=true +@@ -1202,7 +1140,6 @@ + else + AC_MSG_NOTICE(libgd not available) + fi +- LIBS=$SAVE_LIBS + fi + AC_MSG_CHECKING(support for graphical statistics) + if test "$GD" != "no"; then diff --git a/net-p2p/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml b/net-p2p/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml deleted file mode 100644 index 6be3259d9bc1..000000000000 --- a/net-p2p/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml +++ /dev/null @@ -1,24 +0,0 @@ ---- src/daemon/common/commonGlobals.ml 28 Aug 2005 12:18:30 -0000 1.50 -+++ src/daemon/common/commonGlobals.ml 29 Aug 2005 00:03:36 -0000 -@@ -278,7 +278,7 @@ - - let download_control = TcpBufferedSocket.create_read_bandwidth_controler - "Download" -- (!!max_hard_download_rate * 2048) (* TODO: changed from 1024 to 2048 because of bug *) -+ (!!max_hard_download_rate * 1024) - - - let _ = -@@ -288,7 +288,7 @@ - option_hook max_hard_download_rate (fun _ -> - let rate = !!max_hard_download_rate in - TcpBufferedSocket.change_rate download_control -- (rate * 2048)) (* TODO: changed from 1024 to 2048 because of bug *) -+ (rate * 1024)) - - let udp_write_controler = UdpSocket.new_bandwidth_controler upload_control - -Index: src/networks/bittorrent/bTClients.ml -=================================================================== -RCS file: /cvsroot/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v -retrieving revision 1.48 diff --git a/net-p2p/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml b/net-p2p/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml deleted file mode 100644 index 82017869e17a..000000000000 --- a/net-p2p/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml +++ /dev/null @@ -1,48 +0,0 @@ ---- src/networks/bittorrent/bTClients.ml 15 Aug 2005 20:30:11 -0000 1.48 -+++ src/networks/bittorrent/bTClients.ml 29 Aug 2005 00:42:36 -0000 -@@ -763,13 +763,9 @@ - Int64Swarmer.downloaded swarmer in - - (*Update rate and amount of data received from client*) -- c.client_downloaded <- c.client_downloaded ++ -- (new_downloaded -- old_downloaded); -+ count_download c file (new_downloaded -- old_downloaded); - (* use len here with max_dr quickfix *) - Rate.update c.client_downloaded_rate (float_of_int len); -- (* update the stats *) -- let len64 = Int64.of_int len in -- count_download c file len64; - network_must_update network; - if !verbose_msg_clients then - (match c.client_ranges_sent with -@@ -1455,14 +1451,13 @@ - let file = c.client_file in - let offset = pos ++ file.file_piece_size *.. num in - c.client_allowed_to_write <- c.client_allowed_to_write -- len; -- c.client_uploaded <- c.client_uploaded ++ len; -+ count_upload c file len; - let len = Int64.to_int len in - CommonUploads.consume_bandwidth len; - (* lprintf "Unix32.read: offset %Ld len %d\n" offset len; *) - Unix32.read (file_fd file) offset upload_buffer 0 len; - (* update upload rate from len bytes *) -- (* will be reverted to len instead of len / 2 when rate bug will be fixed *) -- Rate.update c.client_upload_rate (float_of_int (len / 2)); -+ Rate.update c.client_upload_rate (float_of_int len); - file.file_uploaded <- file.file_uploaded ++ (Int64.of_int len); - let _ = - (* update stats *) -@@ -1477,9 +1472,6 @@ - in - (* lprintf "sending piece\n"; *) - send_client c (Piece (num, pos, upload_buffer, 0, len)); -- (* update stats *) -- let uploaded = Int64.of_int len in -- count_upload c file uploaded; - network_must_update network; - iter_upload sock c - end else -Index: src/networks/donkey/donkeyOneFile.ml -=================================================================== -RCS file: /cvsroot/mldonkey/mldonkey/src/networks/donkey/donkeyOneFile.ml,v -retrieving revision 1.26 diff --git a/net-p2p/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml b/net-p2p/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml deleted file mode 100644 index 6d56249f8954..000000000000 --- a/net-p2p/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml +++ /dev/null @@ -1,20 +0,0 @@ ---- src/networks/donkey/donkeyOneFile.ml 18 Aug 2005 13:00:03 -0000 1.26 -+++ src/networks/donkey/donkeyOneFile.ml 29 Aug 2005 00:04:10 -0000 -@@ -429,7 +429,6 @@ - - set_client_state c (Connected_downloading (file_num file)); - let len64 = Int64.of_int bloc_len in -- count_download c file len64; - network_must_update network; - - (* TODO: verify the received data has been requested *) -@@ -462,8 +461,7 @@ - (* List.iter Int64Swarmer.alloc_range c.client_ranges; *) - let new_downloaded = - Int64Swarmer.downloaded swarmer in -- c.client_downloaded <- c.client_downloaded ++ ( -- new_downloaded -- old_downloaded); -+ count_download c file (new_downloaded -- old_downloaded); - (* - if not (List.mem c.client_ip bb.block_contributors) then - bb.block_contributors <- c.client_ip :: diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile index b13ca67e10a9..ea7abb1ed87a 100644 --- a/net/mldonkey-devel/Makefile +++ b/net/mldonkey-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.6.3 +PORTVERSION= 2.6.4 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo index 660dd3430718..b79385d749ce 100644 --- a/net/mldonkey-devel/distinfo +++ b/net/mldonkey-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (mldonkey-2.6.3.tar.bz2) = 5a71317970b0c5c2a50d3d4e98c14f41 -SIZE (mldonkey-2.6.3.tar.bz2) = 2660337 +MD5 (mldonkey-2.6.4.tar.bz2) = d969f81b51e194fcaf46790686269e3e +SIZE (mldonkey-2.6.4.tar.bz2) = 2669228 diff --git a/net/mldonkey-devel/files/patch-config::configure.in b/net/mldonkey-devel/files/patch-config::configure.in new file mode 100644 index 000000000000..e5cf5ae2ebf8 --- /dev/null +++ b/net/mldonkey-devel/files/patch-config::configure.in @@ -0,0 +1,232 @@ +--- config/configure.in.orig Sat Sep 3 20:27:22 2005 ++++ config/configure.in Sun Sep 4 11:48:13 2005 +@@ -17,20 +17,15 @@ + + OS_FILES=unix + OS_FILES2=unix ++ + case $host in + *mingw*) + OS_FILES=mingw + OS_FILES2=mingw +- PTHREAD_LIBS="-lpthreadGC2 -lwsock32" +- PTHREAD_CFLAGS="-DPTW32_STATIC_LIB" + ;; + *cygwin*) + OS_FILES2=cygwin + ;; +- *freebsd*) +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +- LDFLAGS="${LDFLAGS} -L/usr/local/lib" +- ;; + esac + + case "`uname -s`" in +@@ -59,13 +54,8 @@ + + if test -d .svn; then + AC_MSG_NOTICE(checking SVN revision) +- AC_CHECK_PROG(SVNVERSION,svnversion,svnversion) +- if test "$ac_cv_prog_SVNVERSION" = "svnversion"; then +- SUB_VERSION3="SVN" +- SCM_VERSION=`svnversion -n .` +- else AC_MSG_NOTICE(cannot checking SVN revision... no SVNVERSION) +- SCM_VERSION="cannot find out SVN revision (no SVNVERSION)" +- fi ++ SUB_VERSION3="SVN" ++ SCM_VERSION=`svnversion -n .` + fi + if test -f ./CVS/Entries ; then + AC_MSG_NOTICE(checking CVS checkout date) +@@ -95,16 +85,10 @@ + fi + fi + fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no CUT) +- SCM_VERSION="cannot find out SCM Version (no CUT)" + fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no SED) +- SCM_VERSION="cannot find out SCM Version (no SED)" +- fi +- else AC_MSG_NOTICE(cannot checking CVS checkout date... no STAT) +- SCM_VERSION="cannot find out SCM Version (no STAT)" + fi + fi ++fi + MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION + if test -f ./subrelease; then + MLDONKEY_VERSION=$MLDONKEY_VERSION`cat ./subrelease` +@@ -201,11 +185,15 @@ + fi + fi + +-USE_PTHREAD=yes +-AC_ARG_ENABLE(pthread, [ --disable-pthread allows you to disable pthread support in mldonkey], [USE_PTHREAD="$enableval"]) +-AC_ARG_ENABLE(pthread-lib, [ --enable-pthread-lib legacy option], [USE_PTHREAD="$enableval"]) ++PTHREAD_LIBS=yes ++AC_ARG_ENABLE(pthread, [ --disable-pthread allows you to disable pthread support in mldonkey], [PTHREAD_LIBS="$enableval"]) ++AC_ARG_ENABLE(pthread-lib, [ --enable-pthread-lib legacy option], [PTHREAD_LIBS="$enableval"]) + +-ICONV=yes ++if [ test "$SYSTEM" = "windows"]; then ++ ICONV=no ++else ++ ICONV=yes ++fi + AC_ARG_ENABLE(iconv, [ --disable-iconv disable the use of iconv for compiling on broken windows environments], [ICONV="$enableval"]) + + GD=yes +@@ -583,7 +571,7 @@ + BZIP2=no + HAS_BZIP2=false + if test "$USE_BZIP2" != "no"; then +- AC_CHECK_HEADERS(bzlib.h,[AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[BZIP2=yes],)]) ++ AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[AC_CHECK_HEADERS(bzlib.h,[BZIP2=yes],)]) + fi + + if test "$BZIP2" = "yes"; then +@@ -624,21 +612,19 @@ + if test "$ICONV" = "yes"; then + AM_ICONV + if test "$am_cv_func_iconv" != "yes"; then +- AC_MSG_FAILURE([iconv() is missing, did you install the libraries and the developer packages for libiconv?]) ++ echo "iconv() is missing, did you install the libraries and the developer packages for libiconv?" ++ exit 1 + fi + LIBS="$LIBS $LIBICONV" +- AC_CHECK_FUNCS([locale_charset],, +- AC_TRY_LINK([#include <langinfo.h>], +- [char* cs = nl_langinfo(CODESET);], +- AC_MSG_NOTICE(found nl_langinfo(CODESET)), +- [AC_MSG_FAILURE(Your iconv implementation is incomplete)])) +- AC_CHECK_LIB(charset,locale_charset) ++ AC_CHECK_FUNCS([locale_charset]) + AC_CHECK_HEADERS([libcharset.h]) + AC_CHECK_HEADERS([locale.h]) ++ AC_CHECK_LIB(charset,locale_charset) + else + AC_DEFINE(DISABLE_ICONV, 1, [Define to 1 if you want to replace iconv and related with stubs.]) + fi + ++ + # On linux plaforms, we will have to check that includes from kernel are + # available. glibc version test was shamelessly taken from + # http://public.activestate.com/gsar/APC/perl-5.8.x/Configure +@@ -652,7 +638,7 @@ + CPPFLAGS=$OLD_CPPFLAGS] + ) + AC_CHECK_HEADERS(gnu/libc-version.h,,) +- AC_MSG_CHECKING(for GNU C Library version) ++ AC_MSG_CHECKING(Checking for GNU C Library version) + + cat >try.c <<'EOCP' + /* Find out version of GNU C library. __GLIBC__ and __GLIBC_MINOR__ +@@ -1014,7 +1000,7 @@ + + if test "$IM" = "yes"; then + CRYPTOKIT=no +- AC_MSG_CHECKING(for CryptoKit) ++ AC_MSG_CHECKING(Checking for CryptoKit) + if test -f $OCAMLLIB/cryptokit.$OCAMLLIB_EXT; then + CRYPTOKIT=yes + AC_MSG_RESULT(yes) +@@ -1045,7 +1031,7 @@ + fi + fi + +-if test "$USE_PTHREAD" = "no"; then ++if test "$PTHREAD_LIBS" = "no"; then + PTHREAD_LIBS="" + echo "Dont use threads" + else +@@ -1112,49 +1098,15 @@ + if test "$GD" != "no"; then + GD=no + LIBGD=no +- SAVE_LIBS=$LIBS +- +- AC_CHECK_PROG(GDLIBCONFIG, gdlib-config, gdlib-config) +- if test "$ac_cv_prog_GDLIBCONFIG" = "gdlib-config"; then +- GDLIBCONFIG=`$GDLIBCONFIG --libs` +- GDLIBS="$LIBS -lgd $GDLIBCONFIG" +- LIBS=$GDLIBS +- fi +- +- AC_MSG_CHECKING(for gdImageCreate in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImageCreate (0,0);], +- [LIBGD=yes], [LIBGD=no]) +- AC_MSG_RESULT($LIBGD) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImageCreate, [LIBGD=yes], [LIBGD=no]) +- fi +- ++ AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes]) + if test "$LIBGD" = "yes"; then +- + LIBPNG=no + AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes]) +- ++ LIBGD_PNG=no ++ AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes]) + if test "$LIBPNG" = "no"; then + AC_MSG_NOTICE(png support not available) + else +- LIBGD_PNG=no +- LIBS=$GDLIBS +- AC_MSG_CHECKING(for gdImagePng in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImagePng (0,0);], +- [LIBGD_PNG=yes], [LIBGD_PNG=no]) +- AC_MSG_RESULT($LIBGD_PNG) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD_PNG" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes], [LIBGD_PNG=no]) +- fi +- + if test "$LIBGD_PNG" = "yes"; then + GD=yes + HAS_GD_PNG=true +@@ -1167,27 +1119,13 @@ + AC_MSG_NOTICE(png support not available in libgd) + fi + fi +- + LIBJPEG=no + AC_CHECK_LIB(jpeg, jpeg_CreateCompress, [LIBJPEG=yes]) +- ++ LIBGD_JPG=no ++ AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes]) + if test "$LIBJPEG" = "no"; then + AC_MSG_NOTICE(jpeg support not available) + else +- LIBGD_JPG=no +- LIBS=$GDLIBS +- AC_MSG_CHECKING(for gdImageJpeg in -lgd) +- AC_TRY_LINK([#include <gd.h>], +- [gdImageJpeg (0,0,0);], +- [LIBGD_JPG=yes], [LIBGD_JPG=no]) +- AC_MSG_RESULT($LIBGD_JPG) +- LIBS=$SAVE_LIBS +- +- if test "$LIBGD_JPG" = "no"; then +- AC_MSG_NOTICE(not found, trying another method) +- AC_CHECK_LIB(gd, gdImageJpeg, [LIBGD_JPG=yes], [LIBGD_JPG=no]) +- fi +- + if test "$LIBGD_JPG" = "yes"; then + GD=yes + HAS_GD_JPG=true +@@ -1202,7 +1140,6 @@ + else + AC_MSG_NOTICE(libgd not available) + fi +- LIBS=$SAVE_LIBS + fi + AC_MSG_CHECKING(support for graphical statistics) + if test "$GD" != "no"; then diff --git a/net/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml b/net/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml deleted file mode 100644 index 6be3259d9bc1..000000000000 --- a/net/mldonkey-devel/files/patch-src::daemon::common::commonGlobals.ml +++ /dev/null @@ -1,24 +0,0 @@ ---- src/daemon/common/commonGlobals.ml 28 Aug 2005 12:18:30 -0000 1.50 -+++ src/daemon/common/commonGlobals.ml 29 Aug 2005 00:03:36 -0000 -@@ -278,7 +278,7 @@ - - let download_control = TcpBufferedSocket.create_read_bandwidth_controler - "Download" -- (!!max_hard_download_rate * 2048) (* TODO: changed from 1024 to 2048 because of bug *) -+ (!!max_hard_download_rate * 1024) - - - let _ = -@@ -288,7 +288,7 @@ - option_hook max_hard_download_rate (fun _ -> - let rate = !!max_hard_download_rate in - TcpBufferedSocket.change_rate download_control -- (rate * 2048)) (* TODO: changed from 1024 to 2048 because of bug *) -+ (rate * 1024)) - - let udp_write_controler = UdpSocket.new_bandwidth_controler upload_control - -Index: src/networks/bittorrent/bTClients.ml -=================================================================== -RCS file: /cvsroot/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v -retrieving revision 1.48 diff --git a/net/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml b/net/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml deleted file mode 100644 index 82017869e17a..000000000000 --- a/net/mldonkey-devel/files/patch-src::networks::bittorrent::bTClients.ml +++ /dev/null @@ -1,48 +0,0 @@ ---- src/networks/bittorrent/bTClients.ml 15 Aug 2005 20:30:11 -0000 1.48 -+++ src/networks/bittorrent/bTClients.ml 29 Aug 2005 00:42:36 -0000 -@@ -763,13 +763,9 @@ - Int64Swarmer.downloaded swarmer in - - (*Update rate and amount of data received from client*) -- c.client_downloaded <- c.client_downloaded ++ -- (new_downloaded -- old_downloaded); -+ count_download c file (new_downloaded -- old_downloaded); - (* use len here with max_dr quickfix *) - Rate.update c.client_downloaded_rate (float_of_int len); -- (* update the stats *) -- let len64 = Int64.of_int len in -- count_download c file len64; - network_must_update network; - if !verbose_msg_clients then - (match c.client_ranges_sent with -@@ -1455,14 +1451,13 @@ - let file = c.client_file in - let offset = pos ++ file.file_piece_size *.. num in - c.client_allowed_to_write <- c.client_allowed_to_write -- len; -- c.client_uploaded <- c.client_uploaded ++ len; -+ count_upload c file len; - let len = Int64.to_int len in - CommonUploads.consume_bandwidth len; - (* lprintf "Unix32.read: offset %Ld len %d\n" offset len; *) - Unix32.read (file_fd file) offset upload_buffer 0 len; - (* update upload rate from len bytes *) -- (* will be reverted to len instead of len / 2 when rate bug will be fixed *) -- Rate.update c.client_upload_rate (float_of_int (len / 2)); -+ Rate.update c.client_upload_rate (float_of_int len); - file.file_uploaded <- file.file_uploaded ++ (Int64.of_int len); - let _ = - (* update stats *) -@@ -1477,9 +1472,6 @@ - in - (* lprintf "sending piece\n"; *) - send_client c (Piece (num, pos, upload_buffer, 0, len)); -- (* update stats *) -- let uploaded = Int64.of_int len in -- count_upload c file uploaded; - network_must_update network; - iter_upload sock c - end else -Index: src/networks/donkey/donkeyOneFile.ml -=================================================================== -RCS file: /cvsroot/mldonkey/mldonkey/src/networks/donkey/donkeyOneFile.ml,v -retrieving revision 1.26 diff --git a/net/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml b/net/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml deleted file mode 100644 index 6d56249f8954..000000000000 --- a/net/mldonkey-devel/files/patch-src::networks::donkey::donkeyOneFile.ml +++ /dev/null @@ -1,20 +0,0 @@ ---- src/networks/donkey/donkeyOneFile.ml 18 Aug 2005 13:00:03 -0000 1.26 -+++ src/networks/donkey/donkeyOneFile.ml 29 Aug 2005 00:04:10 -0000 -@@ -429,7 +429,6 @@ - - set_client_state c (Connected_downloading (file_num file)); - let len64 = Int64.of_int bloc_len in -- count_download c file len64; - network_must_update network; - - (* TODO: verify the received data has been requested *) -@@ -462,8 +461,7 @@ - (* List.iter Int64Swarmer.alloc_range c.client_ranges; *) - let new_downloaded = - Int64Swarmer.downloaded swarmer in -- c.client_downloaded <- c.client_downloaded ++ ( -- new_downloaded -- old_downloaded); -+ count_download c file (new_downloaded -- old_downloaded); - (* - if not (List.mem c.client_ip bb.block_contributors) then - bb.block_contributors <- c.client_ip :: |