Update to 2.5.10:

2004/02/09: Fabrice (version 2.5.10, tag release-2-5-10)
  * Applied patches sha1, #2597, #2603, #2604
  * New GUI messages:
      Gui -> Core: GetUploaders, GetPending,
                   GetSearches, (GetSearch search_id),
                   (ConnectClient cid), (DisconnectClient cid)
      Core -> Gui: (Uploaders num_list), (Pending num_list),
                   (Search search_request)
     GetSearches and GetSearch allow a GUI to query for former searches and
      to receive the results corresponding to a particular former search.
  * New console command "disconnect <client_id>"
  * FileTP:
     * New option 'remote_shells' to define, for each hostname, which
         remote shell to use and with which arguments (e.g. if you want
         to use rsh or ssh with username@hostname or a particular port).
         still no password allowed...
     * New version of 'get_range' that accepts a 'rangex' argument to
         send the data without base64 encoding (works for me, but I don't
         know for other shells). Set the 'get_range' option to set the
         path of the remote get_range command, and 'range_arg' to use
         either 'range' or 'rangex'.

2004/02/07: Fabrice (version 2.5.9, tag release-2-5-9)
  * Applied patches #2428, #2595, #2596
  * TcpBufferedSocket: 'exec_command' only creates one TcpBufferedSocket.t
     both for reading and writing.
  * FileTP:
     * Basic "remote shell" protocol (using ssh):
        use 'http <ssh://hostname/relative-filename>' to download the file
        hostname:~/relative-filename. ssh must be able to connect to the
        host without password exchange. The remote host must have the
        'get_range' utility in the PATH of ssh (use "make utils" to
        have 'get_range' compiled with in mldonkey). The transfer rate is
        not very good (30 KB/s, either because of too small
        tcpBufferedSocket buffers, or because of the base64 encoding).

4 files changed, 70 insertions, 16 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index de65606d802..f111568944f 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,19 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2004/02/07 20:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/10 15:49:56 wiz Exp $
 #
 
-DISTNAME=	mldonkey-source-${VER}
-VER=		2-5-8
-PKGNAME=	mldonkey-${VER:S/-/./g}
+DISTNAME=	mldonkey-2.5.10
 CATEGORIES=	net
-MASTER_SITES=	http://www.giga.or.at/pub/mldonkey/
-# not yet completely up again:
-# http://savannah.nongnu.org/download/mldonkey/release-${VER}/official/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/mldonkey/
 COMMENT=	Free peer-to-peer client with eDonkey support and more
 
-WRKSRC=			${WRKDIR}/mldonkey
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_GNU_TOOLS+=		make
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index f69dff1ac25..7c03c2d2d8b 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2004/02/07 20:39:43 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/02/10 15:49:56 wiz Exp $
 
-SHA1 (mldonkey-source-2-5-8.tar.gz) = 4e99bddd113fe5f6b5834761a3d01b30b5231ad6
-Size (mldonkey-source-2-5-8.tar.gz) = 3168222 bytes
-SHA1 (patch-aa) = a28be0c6cbd4e89f1d1d9331db228b068a31a53c
+SHA1 (mldonkey-2.5.10.tar.gz) = 5318cc2d90c72fc82e58717c7405f7570063fa77
+Size (mldonkey-2.5.10.tar.gz) = 3190624 bytes
+SHA1 (patch-aa) = 45b5393d06e53d0fc9383ae9aabcf3b09c447e3d
+SHA1 (patch-ab) = 93e6f19e9e03cfd44a670c553b998cd8fd904de7
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
index 994a9076837..a9fab00101b 100644
--- a/net/mldonkey/patches/patch-aa
+++ b/net/mldonkey/patches/patch-aa
@@ -1,9 +1,54 @@
-$NetBSD: patch-aa,v 1.2 2004/02/07 20:39:43 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/02/10 15:49:56 wiz Exp $
 
---- config/configure.orig	Sat Feb  7 20:58:04 2004
+--- config/configure.orig	Tue Feb 10 00:06:46 2004
 +++ config/configure
-@@ -9835,7 +9835,7 @@ s,@CAMLP4@,$CAMLP4,;t t
- s,@PERL@,$PERL,;t t
+@@ -8284,22 +8284,6 @@ if test `eval echo '${'$as_ac_Header'}'`
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+-else
+-
+-	  echo "Do you want this script to install endian.h to /usr/include (y/n)?"
+-	  read i
+-	  case "$i" in
+-	   y* | Y*)
+-		echo "Will now try to copy endian.h to /usr/include/"
+-		cp -i ../include/endian.h /usr/include
+-		mkdir -vp /usr/include/bits
+-		cp -i ../include/bits/endian.h /usr/include/bits/
+-                  ;;
+-	   *)
+-		exit 1
+-                  ;;
+-	  esac
+-
+ fi
+ 
+ done
+@@ -8443,21 +8427,6 @@ if test `eval echo '${'$as_ac_Header'}'`
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+-else
+-
+-	  echo "Do you want this script to install byteswap.h to /usr/include (y/n)?"
+-	  read i
+-	  case "$i" in
+-	   y* | Y*)
+-		echo "Will now try to copy byteswap.h to /usr/include/"
+-		cp -i ../include/byteswap.h /usr/include
+-		mkdir -vp /usr/include/bits
+-		cp -i ../include/bits/byteswap.h /usr/include/bits/
+-                  ;;
+-	   *)
+-		exit 1
+-                  ;;
+-	  esac
+ 
+ fi
+ 
+@@ -10725,7 +10694,7 @@ s,@PERL@,$PERL,;t t
+ s,@EGREP@,$EGREP,;t t
  s,@GTK_CONFIG@,$GTK_CONFIG,;t t
  s,@PTHREAD_CC@,$PTHREAD_CC,;t t
 -s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
diff --git a/net/mldonkey/patches/patch-ab b/net/mldonkey/patches/patch-ab
new file mode 100644
index 00000000000..b4b45a6082d
--- /dev/null
+++ b/net/mldonkey/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/02/10 15:49:56 wiz Exp $
+
+--- src/utils/lib/sha1_c.c.orig	Tue Feb 10 00:06:54 2004
++++ src/utils/lib/sha1_c.c
+@@ -78,7 +78,7 @@ extern "C"
+ #define BRG_BIG_ENDIAN      4321 /* byte 0 is most significant (mc68k) */
+ 
+ #if defined(__GNUC__) || defined(__GNU_LIBRARY__)
+-#  if defined(__FreeBSD__) || defined(__OpenBSD__)
++#  if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #    include <sys/endian.h>
+ #  elif defined( BSD ) && ( BSD >= 199103 )
+ #      include <machine/endian.h>