Update to development version 2.5.28 patch kit s1

3 files changed, 3 insertions, 21 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index 0f7fce27a254..e9a6d8c778e5 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.28.p
+PORTVERSION=	2.5.28.s1
 PORTREVISION=	2
 CATEGORIES+=	net
 MASTER_SITES=	http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index 8df3464b5606..b08944cf6948 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,4 +1,4 @@
 MD5 (mldonkey-2.5.28.tar.bz2) = bee2811a76f83c543ca19e45a9d04ff4
 SIZE (mldonkey-2.5.28.tar.bz2) = 2767585
-MD5 (patch_pack28p.gz) = f08a21cc3f5f39cea741e054eed49f2c
-SIZE (patch_pack28p.gz) = 84638
+MD5 (patch_pack28s1.gz) = b1030e702611914f4104dff52889ec39
+SIZE (patch_pack28s1.gz) = 100551
diff --git a/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml b/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml
deleted file mode 100644
index f799021ca7bb..000000000000
--- a/net-p2p/mldonkey-devel/files/patch-src::networks::fileTP::fileTPInteractive.ml
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/networks/fileTP/fileTPInteractive.ml.orig	Mon Jan 31 00:29:00 2005
-+++ src/networks/fileTP/fileTPInteractive.ml	Mon Jan 31 00:32:08 2005
-@@ -354,13 +354,13 @@
- 
- let rec op_network_parse_url url = 
-   lprintf "filetp.op_network_parse_url\n";
--  let location_regexp = "Location: \([^\n]+\)\n" in
-+  let location_regexp = "Location: \\(.*\\)" in
-   let real_url = get_regexp_string url (Str.regexp location_regexp) in
-     lprintf "real url: %s\n" real_url;
-   if (is_http_torrent url real_url) then false else    
-     if (String2.check_prefix real_url "http://") then (
-       lprintf "http download\n";
--      let length_regexp = "Content-Length: \([0-9]+\)\n" in
-+      let length_regexp = "Content-Length: \\(.*\\)" in
-  try let length = get_regexp_int url (Str.regexp length_regexp) in
-    if (length > 0) then begin
-      download_file real_url; true