Update to 2.5.11.

Patches accepted back.
2004/02/10: Fabrice (version 2.5.11, tag release-2-5-11)
  - New GUI protocol 24, all times in relative-time.
  - Re-applied patch #2603
  - ./config/configure.in: select former or new implementation of sha1
      depending on the presence of byteswap.h and endian.h.
  - Applied patches #2611, #2612, #2613, #2614

4 files changed, 10 insertions, 69 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index f111568944f..6f4e601bf02 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/02/10 15:49:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/11 16:27:03 wiz Exp $
 #
 
-DISTNAME=	mldonkey-2.5.10
+DISTNAME=	mldonkey-2.5.11
 CATEGORIES=	net
 MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
 
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 7c03c2d2d8b..b69fa8f883f 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/02/10 15:49:56 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/02/11 16:27:03 wiz Exp $
 
-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
+SHA1 (mldonkey-2.5.11.tar.gz) = 90d391c22ba1bd82b092c5ff69168523e7a3c88c
+Size (mldonkey-2.5.11.tar.gz) = 3201826 bytes
+SHA1 (patch-aa) = 10ba9bd3cc2cfc0d43d279e13b6511bfa8203122
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
index a9fab00101b..c1ee43d82d0 100644
--- a/net/mldonkey/patches/patch-aa
+++ b/net/mldonkey/patches/patch-aa
@@ -1,54 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2004/02/10 15:49:56 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/11 16:27:03 wiz Exp $
 
---- config/configure.orig	Tue Feb 10 00:06:46 2004
+--- config/configure.orig	Wed Feb 11 00:26:18 2004
 +++ config/configure
-@@ -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
+@@ -9961,7 +9961,7 @@ s,@CAMLP4@,$CAMLP4,;t t
+ s,@PERL@,$PERL,;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
deleted file mode 100644
index b4b45a6082d..00000000000
--- a/net/mldonkey/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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>