Update to 2.7.1

5 files changed, 86 insertions, 22 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index 38afaf30df90..12e2d65ffd8c 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.7.0
+PORTVERSION=	2.7.1
 CATEGORIES+=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -122,6 +122,32 @@ post-patch:
 
 pre-configure:
 	cd ${WRKSRC}/config && ${AUTOCONF}
+# use lang/ocaml308 instead of lang/ocaml
+.if exists(${LOCALBASE}/libexec/ocaml-3.08/ocamlc.opt)
+	@${REINPLACE_CMD} -E \
+		-e 's|@OCAMLC@|${LOCALBASE}/libexec/ocaml-3.08/ocamlc.opt|' \
+		-e 's|@OCAMLLIB@|${LOCALBASE}/lib/ocaml-3.08|' \
+		-e 's|@OCAMLOPT@|${LOCALBASE}/libexec/ocaml-3.08/ocamlopt.opt|' \
+		-e 's|@OCAMLLEX@|${LOCALBASE}/libexec/ocaml-3.08/ocamllex.opt|' \
+		-e 's|@OCAMLDEP@|${LOCALBASE}/libexec/ocaml-3.08/ocamldep|' \
+		-e 's|@OCAMLYACC@|${LOCALBASE}/libexec/ocaml-3.08/ocamlyacc|' \
+		-e 's|@CAMLP4@|${LOCALBASE}/libexec/ocaml-3.08/camlp4|' \
+		-e 's|@OCAMLLEX@|${LOCALBASE}/libexec/ocaml-3.08/ocamllex.opt|' \
+		-e 's|@OCAMLMKTOP@|${LOCALBASE}/libexec/ocaml-3.08/ocamlmktop|' \
+		${WRKSRC}/config/Makefile.config.in
+.else
+	@${REINPLACE_CMD} -E \
+		-e 's|@OCAMLC@|${LOCALBASE}/libexec/ocaml-3.08/ocamlc|' \
+		-e 's|@OCAMLLIB@|${LOCALBASE}/lib/ocaml-3.08|' \
+		-e 's|@OCAMLOPT@|${LOCALBASE}/libexec/ocaml-3.08/ocamlopt|' \
+		-e 's|@OCAMLLEX@|${LOCALBASE}/libexec/ocaml-3.08/ocamllex|' \
+		-e 's|@OCAMLDEP@|${LOCALBASE}/libexec/ocaml-3.08/ocamldep|' \
+		-e 's|@OCAMLYACC@|${LOCALBASE}/libexec/ocaml-3.08/ocamlyacc|' \
+		-e 's|@CAMLP4@|${LOCALBASE}/libexec/ocaml-3.08/camlp4|' \
+		-e 's|@OCAMLLEX@|${LOCALBASE}/libexec/ocaml-3.08/ocamllex|' \
+		-e 's|@OCAMLMKTOP@|${LOCALBASE}/libexec/ocaml-3.08/ocamlmktop|' \
+		${WRKSRC}/config/Makefile.config.in
+.endif
 
 post-configure:
 	@${REINPLACE_CMD} -E \
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index c6d150df21fc..8a816cf06f89 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mldonkey-2.7.0.tar.bz2) = ede2bba27d9ea4dff5e439db5e08d100
-SHA256 (mldonkey-2.7.0.tar.bz2) = a561b09cf39df6560226c8ebe4604894098c41230896b59a42155528612b4c04
-SIZE (mldonkey-2.7.0.tar.bz2) = 2791993
+MD5 (mldonkey-2.7.1.tar.bz2) = c7eaf255c60f11358e024300a942f3d7
+SHA256 (mldonkey-2.7.1.tar.bz2) = 7cbab4e5346ac3dc397601a8c753c23b50b6e50c0d1523b42aab23ba1aee42a5
+SIZE (mldonkey-2.7.1.tar.bz2) = 2793841
diff --git a/net-p2p/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml b/net-p2p/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml
new file mode 100644
index 000000000000..4aef1903a742
--- /dev/null
+++ b/net-p2p/mldonkey-devel/files/patch-src__daemon__common__commonMultimedia.ml
@@ -0,0 +1,34 @@
+--- 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-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c
new file mode 100644
index 000000000000..1579d7967750
--- /dev/null
+++ b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1_c.c
@@ -0,0 +1,22 @@
+--- 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) */
+ 
diff --git a/net-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1new_c.c b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1new_c.c
deleted file mode 100644
index 843082dec0d9..000000000000
--- a/net-p2p/mldonkey-devel/files/patch-src__utils__lib__sha1new_c.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/utils/lib/sha1new_c.c.orig	Sun Nov 27 21:34:48 2005
-+++ src/utils/lib/sha1new_c.c	Sun Nov 27 22:10:11 2005
-@@ -152,6 +152,7 @@
- 
- #if   defined( __alpha__ ) || defined( __alpha ) || defined( i386 )       || \
-       defined( __i386__ )  || defined( _M_I86 )  || defined( _M_IX86 )    || \
-+      defined(__amd64__)   || defined(__ia64__)  || \
-       defined( __OS2__ )   || defined( sun386 )  || defined( __TURBOC__ ) || \
-       defined( vax )       || defined( vms )     || defined( VMS )        || \
-       defined( __VMS )
-@@ -162,6 +163,7 @@
-       defined( ibm370 )   || defined( mc68000 ) || defined( m68k )       || \
-       defined( __MRC__ )  || defined( __MVS__ ) || defined( __MWERKS__ ) || \
-       defined( sparc )    || defined( __sparc)  || defined( SYMANTEC_C ) || \
-+      defined(__sparc64__) || \
-       defined( __TANDEM ) || defined( THINK_C ) || defined( __VMCMS__ )
- #  define PLATFORM_BYTE_ORDER BRG_BIG_ENDIAN
-