Update to 2.5.30.5

4 files changed, 38 insertions, 8 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index ba9182291cac..4b5b1dd2ce1a 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.30.1
+PORTVERSION=	2.5.30.5
 CATEGORIES+=	net
 MASTER_SITES=	http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/ \
 		ftp://ftp.berlios.de/pub/mldonkey/spiralvoice/cvs/
@@ -22,21 +22,28 @@ COMMENT?=	A OCAML client for multiple peer-to-peer networks
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 #DOWNLOADVERSION=${PORTVERSION:R}
-DOWNLOADVERSION=2.5.30-1
+DOWNLOADVERSION=2.5.30.5
 
 NO_LATEST_LINK=	yes
 CONFLICTS=	mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]*
 
 USE_BZIP2=	yes
+USE_ICONV=	yes
 WANT_AUTOCONF_VER=	259
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	opt
 
-CONFIGURE_ARGS=	--disable-pthread --enable-ocamlver=3
+CONFIGURE_ARGS+=\
+		--disable-pthread \
+		--enable-ocamlver=3 \
+		--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ENV+=	\
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
 
 .if defined(WITHOUT_GUI)
 .if defined(WITHOUT_CORE)
@@ -79,6 +86,7 @@ post-patch:
 		${WRKDIR}/wrapper.sh
 	@${REINPLACE_CMD} -E \
 		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${BUILD_WRKSRC}/config/Makefile.in
 
 pre-configure:
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index aeb74faefa60..8cdabdcd6988 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.5.30-1.tar.bz2) = b41531257d898ef5b27d99ac6b6a0520
-SIZE (mldonkey-2.5.30-1.tar.bz2) = 3012781
+MD5 (mldonkey-2.5.30.5.tar.bz2) = 7645dfe8ef15403358ad8cdee49896e1
+SIZE (mldonkey-2.5.30.5.tar.bz2) = 3062614
diff --git a/net-p2p/mldonkey-devel/files/patch-Makefile b/net-p2p/mldonkey-devel/files/patch-Makefile
index 70a82ad39143..aa3b48d869b4 100644
--- a/net-p2p/mldonkey-devel/files/patch-Makefile
+++ b/net-p2p/mldonkey-devel/files/patch-Makefile
@@ -1,5 +1,14 @@
---- config/Makefile.in.orig	Wed Sep  8 22:54:44 2004
-+++ config/Makefile.in	Wed Sep  8 22:54:54 2004
+--- config/Makefile.in.orig	Wed Apr 13 18:52:02 2005
++++ config/Makefile.in	Sun Apr 17 00:44:57 2005
+@@ -150,7 +150,7 @@
+ endif
+ 
+ ifneq ("$(ICONV_LIB)", "")
+-  LIBS_flags += -cclib "$(ICONV_LIB)"
++  LIBS_flags += -ccopt "-I%%LOCALBASE%%/include" -ccopt "-L%%LOCALBASE%%/lib" -cclib "$(ICONV_LIB)"
+ endif
+ 
+ ifeq ("$(BROOSNET)", "yes")
 @@ -280,7 +280,7 @@
  all: Makefile config/Makefile.config $(TARGET_TYPE)
  
diff --git a/net-p2p/mldonkey-devel/files/patch-src::utils::lib::charsetstubs.c b/net-p2p/mldonkey-devel/files/patch-src::utils::lib::charsetstubs.c
new file mode 100644
index 000000000000..dc9871989d61
--- /dev/null
+++ b/net-p2p/mldonkey-devel/files/patch-src::utils::lib::charsetstubs.c
@@ -0,0 +1,13 @@
+--- src/utils/lib/charsetstubs.c.orig	Sun Apr 17 04:11:30 2005
++++ src/utils/lib/charsetstubs.c	Sun Apr 17 04:14:49 2005
+@@ -44,6 +44,10 @@
+ #endif
+ #include <iconv.h>
+ 
++#ifdef __FreeBSD__
++#include <locale.h>
++#endif
++
+ #ifdef WIN32
+ #define STRICT			/* Strict typing, please */
+ #include <windows.h>