Update to 2.7.2

8 files changed, 4 insertions, 156 deletions

diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index 68be3e90ee49..23e5c17460f8 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTVERSION=	2.7.2
 CATEGORIES+=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo
index 8a816cf06f89..aefe7f6e9378 100644
--- a/net/mldonkey-devel/distinfo
+++ b/net/mldonkey-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mldonkey-2.7.1.tar.bz2) = c7eaf255c60f11358e024300a942f3d7
-SHA256 (mldonkey-2.7.1.tar.bz2) = 7cbab4e5346ac3dc397601a8c753c23b50b6e50c0d1523b42aab23ba1aee42a5
-SIZE (mldonkey-2.7.1.tar.bz2) = 2793841
+MD5 (mldonkey-2.7.2.tar.bz2) = b9413047c5c543920b2842844a48beb1
+SHA256 (mldonkey-2.7.2.tar.bz2) = 64cb31cae05cab54d9cd2f0abf7713153e3ec33dddbf0a9cc4ccb0ebdc49459c
+SIZE (mldonkey-2.7.2.tar.bz2) = 2795408
diff --git a/net/mldonkey-devel/files/patch-config__Makefile.in b/net/mldonkey-devel/files/patch-config__Makefile.in
deleted file mode 100644
index 370ec93a3486..000000000000
--- a/net/mldonkey-devel/files/patch-config__Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../mldonkey.orig/config/Makefile.in	Wed Nov 30 21:46:02 2005
-+++ config/Makefile.in	Sat Dec 10 17:44:06 2005
-@@ -19,7 +19,7 @@
- 
- ##################################################################
- 
--DEVFLAGS= -warn-error Am 
-+DEVFLAGS= #-warn-error Am 
- # -dtypes
- 
- NO_LIBS_byte=
-@@ -1722,7 +1722,7 @@
- PA_ZOG_FILES=tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
- 
- pa_zog.cma: $(PA_ZOG_FILES)
--	$(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo" -a -o pa_zog.cma  $(PA_ZOG_FILES)
-+	$(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo -loc loc" -a -o pa_zog.cma  $(PA_ZOG_FILES)
- 
- 
- OCAMLPP=./ocamlpp.byte
diff --git a/net/mldonkey-devel/files/patch-config__configure.in b/net/mldonkey-devel/files/patch-config__configure.in
deleted file mode 100644
index 3cc74a1998c1..000000000000
--- a/net/mldonkey-devel/files/patch-config__configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- ../mldonkey.orig/config/configure.in	Tue Dec  6 18:43:02 2005
-+++ config/configure.in	Sat Dec 10 17:44:06 2005
-@@ -133,9 +133,9 @@
- if test ! -z "$SUB_VERSION3"; then
-   MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
- fi
--REQUIRED_OCAML=3.08.4
--DOWNLOAD_OCAML_MAJOR=3.08
--DOWNLOAD_OCAML=3.08.4
-+REQUIRED_OCAML=3.09.0
-+DOWNLOAD_OCAML_MAJOR=3.09
-+DOWNLOAD_OCAML=3.09.0
- 
- REQUIRED_LABLGTK=1.2.7
- 
-@@ -332,6 +332,7 @@
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
-+    3.08.4*) ;;
-     3.08.3*) ;;
-     3.08.2*)
-         if test "$system" = "rhapsody"; then
-@@ -503,6 +504,7 @@
- REBUILD_OCAML=no
- case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
-+    3.08.4*) ;;
-     3.08.3*) ;;
-     3.08.2*)
-         if test "$system" = "rhapsody"; then
diff --git a/net/mldonkey-devel/files/patch-src__daemon__common__commonInteractive.ml b/net/mldonkey-devel/files/patch-src__daemon__common__commonInteractive.ml
deleted file mode 100644
index 85a1bdf20571..000000000000
--- a/net/mldonkey-devel/files/patch-src__daemon__common__commonInteractive.ml
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../mldonkey.orig/src/daemon/common/commonInteractive.ml	Fri Dec  2 10:08:04 2005
-+++ src/daemon/common/commonInteractive.ml	Fri Dec  9 21:23:18 2005
-@@ -106,7 +106,7 @@
-   let file_id = Filename.basename temp_name in
-   let size = Int64.to_string (file_size file) in
-   let duration =
--    Date.time_to_string_long ((BasicSocket.last_time ()) - info.G.file_age)
-+    string_of_int ((BasicSocket.last_time ()) - info.G.file_age)
-   in
-   let network = network_find_by_num info.G.file_network in
-   let filename = Filename.basename new_name in
-@@ -117,6 +117,7 @@
-         (Int64.to_string (file_size file))
-         (Md4.to_string info.G.file_md4)
-   in
-+  begin try
-   MlUnix.fork_and_exec !!file_completed_cmd
-       [|  (* keep those for compatibility *)
-       "";
-@@ -133,6 +134,10 @@
- 	    ("INCOMING",  incoming);
- 	    ("NETWORK",   network.network_name);
- 	    ("ED2K_HASH", ed2k_hash)]
-+  with e -> 
-+      lprintf_nl "[cInt] Exception %s while executing %s"
-+        (Printexc2.to_string e) !!file_completed_cmd
-+  end
- 
- (********
- These two functions 'file_commit' and 'file_cancel' should be the two only
diff --git a/net/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml b/net/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml
deleted file mode 100644
index 4aef1903a742..000000000000
--- a/net/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/daemon/common/commonMultimedia.ml.orig	Sat Dec 10 04:03:38 2005
-+++ src/daemon/common/commonMultimedia.ml	Sat Dec 10 04:05:46 2005
-@@ -764,14 +764,31 @@
-  *	be done, then convert back.
-  */
- 
-+#if defined(HAVE_SYS_PARAM_H) || ((defined(__unix__) || defined(unix)) && !defined(USG))
-+#include <sys/param.h>
-+#endif
-+
- #include <inttypes.h>
- #include <netinet/in.h>
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+# include <sys/endian.h>
-+# if (__FreeBSD_version >= 500000)
-+#  define bswap_16(x) (bswap16(x))
-+#  define bswap_32(x) (bswap32(x))
-+# else
-+#  define bswap_16(x) (be16toh(x))
-+#  define bswap_32(x) (be32toh(x))
-+# endif
-+#else
-+
- #define bswap_16(x) \
-      ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
- #define bswap_32(x) \
-      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |  \
-       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-+
-+#endif
- 
- #define htoles(x) bswap_16(htons(x))
- #define htolel(x) bswap_32(htonl(x))
diff --git a/net/mldonkey-devel/files/patch-src__utils__lib__fst_hash.c b/net/mldonkey-devel/files/patch-src__utils__lib__fst_hash.c
deleted file mode 100644
index 734763f18da4..000000000000
--- a/net/mldonkey-devel/files/patch-src__utils__lib__fst_hash.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../mldonkey.orig/src/utils/lib/fst_hash.c	Mon Aug  1 20:53:33 2005
-+++ src/utils/lib/fst_hash.c	Sat Dec 10 17:44:06 2005
-@@ -181,9 +181,9 @@
- #include "caml/mlvalues.h"
- 
- /* returns checksum of fzhash */
--uint16 fst_hash_checksum (unsigned char *hash)
-+unsigned short fst_hash_checksum (unsigned char *hash)
- {
--        uint16 sum = 0;
-+        unsigned short sum = 0;
-         int i;
- 
-         /* calculate 2 byte checksum used in the URL from 20 byte fthash */
diff --git a/net/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c b/net/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c
deleted file mode 100644
index 1579d7967750..000000000000
--- a/net/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/utils/lib/sha1_c.c.orig	Sat Dec 10 03:57:38 2005
-+++ src/utils/lib/sha1_c.c	Sat Dec 10 04:02:54 2005
-@@ -62,6 +62,19 @@
- #  include <byteswap.h>
- #endif
- 
-+#if defined(HAVE_SYS_PARAM_H) || ((defined(__unix__) || defined(unix)) && !defined(USG))
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+# include <sys/endian.h>
-+# if (__FreeBSD_version >= 500000)
-+#  define bswap_32(x) (bswap32(x))
-+# else
-+#  define bswap_32(x) (be32toh(x))
-+# endif
-+#endif
-+
- #define BRG_LITTLE_ENDIAN   1234 /* byte 0 is least significant (i386) */
- #define BRG_BIG_ENDIAN      4321 /* byte 0 is most significant (mc68k) */
-