4 files changed, 44 insertions, 38 deletions

diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index 34ee52c102c3..53a43e00cc15 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -6,28 +6,41 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.23
+PORTVERSION=	2.5.28.j
 CATEGORIES+=	net
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/
+PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${DOWNLOADVERSION}
 
-PATCH_SITES=	http://www.schraegerpunkt.de/
-PATCHFILES=	mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz
+PATCH_SITES=	http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/
+PATCHFILES=	patch_pack${PORTVERSION:C/^.\..\.(.)/\1/:C/\.//}.gz
 
-MAINTAINER?=	holger@e-gitt.net
+MAINTAINER?=	lioux@FreeBSD.org
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		autoconf213:${PORTSDIR}/devel/autoconf213
+BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-DOWNLOADVERSION=2.5.22
+DOWNLOADVERSION=${PORTVERSION:R}
 
+NO_LATEST_LINK=	yes
+CONFLICTS=	mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]*
+
+USE_BZIP2=	yes
+USE_AUTOCONF_VER=	213
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	opt
+
 CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
+CONFIGURE_WRKSRC=	${WRKSRC}/config
+MAKE_ENV=	OCAMLRUNPARAM="l=256M"
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
-USE_GMAKE=	yes
-ALL_TARGET=	depend opt
+
+# XXX
+# filetp is known to be broken on version 2.5.28* and prior
+CONFIGURE_ARGS+=	--disable-filetp
 
 .if defined(WITHOUT_GUI)
 .if defined(WITHOUT_CORE)
@@ -36,7 +49,7 @@ ALL_TARGET=	depend opt
 # have no 'without-' flag
 CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
-PKGNAMESUFFIX=	-core
+PKGNAMESUFFIX=	-core-devel
 .else
 PLIST_SUB+=	GUI=""
 BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
@@ -44,7 +57,7 @@ BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
 USE_GNOME=	gtk12
 .if defined(WITHOUT_CORE)
-PKGNAMESUFFIX=	-gui
+PKGNAMESUFFIX=	-gui-devel
 PLIST_SUB+=	CORE="@comment " GUICORE="@comment "
 .else
 PLIST_SUB+=	CORE=""	GUICORE=""
@@ -53,6 +66,7 @@ PLIST_SUB+=	CORE=""	GUICORE=""
 
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 		Install.txt Readme.txt Todo.txt ed2k_links.txt
+PORTDOCS=	${DOCFILES}
 
 .include <bsd.port.pre.mk>
 
@@ -62,12 +76,12 @@ pre-everything::
 	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
 .endif
 
-pre-configure:
-	@cd ${WRKSRC}/config && ${AUTOCONF}
-
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
+	@${REINPLACE_CMD} -E \
+		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
+		${BUILD_WRKSRC}/${MAKEFILE}
 
 do-install:
 .ifndef(WITHOUT_CORE)
diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo
index 5561d6c3ebf4..32dfb9e501ce 100644
--- a/net/mldonkey-devel/distinfo
+++ b/net/mldonkey-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (mldonkey-2.5.22.tar.gz) = 958ffb63dbcfcb0f6e48788774dfbb42
-SIZE (mldonkey-2.5.22.tar.gz) = 3474104
-MD5 (mldonkey-2.5.22-23.patch.gz) = 091c77f0dd29be7443ac62e99cc41dc0
-SIZE (mldonkey-2.5.22-23.patch.gz) = 88210
+MD5 (mldonkey-2.5.28.tar.bz2) = bee2811a76f83c543ca19e45a9d04ff4
+SIZE (mldonkey-2.5.28.tar.bz2) = 2767585
+MD5 (patch_pack28j.gz) = 96d5ec71cdd0a539c56fb247241e5942
+SIZE (patch_pack28j.gz) = 74696
diff --git a/net/mldonkey-devel/pkg-descr b/net/mldonkey-devel/pkg-descr
index 0506b1d6be6d..f40f085e7d79 100644
--- a/net/mldonkey-devel/pkg-descr
+++ b/net/mldonkey-devel/pkg-descr
@@ -5,13 +5,15 @@ It is separated into a core with telnet and web interfaces, and
 a GTK GUI. 
 
 The following protocols are supported:
-- eDonkey        (http://www.edonkey2000.com/)
-- Overnet        (http://www.overnet.com/)
-- Bittorrent     (http://bitconjurer.org/BitTorrent/)
-- Gnutella       (http://www.gnutella.org/)
-- Gnutella2      (http://www.shareaza.com/)
-- Soulseek       (http://www.slsk.org/)
-- Direct-Connect (http://www.neo-modus.com/)
-- Opennap        (http://opennap.sourceforge.net/)
+- eDonkey		(http://www.edonkey2000.com/)
+- Overnet		(http://www.overnet.com/)
+- Bittorrent		(http://bitconjurer.org/BitTorrent/)
+- Gnutella		(http://www.gnutella.org/)
+- Gnutella2		(http://www.shareaza.com/)
+- Fasttrack
+- Soulseek		(http://www.slsk.org/)
+- Direct-Connect	(http://www.neo-modus.com/)
+- Opennap		(http://opennap.sourceforge.net/)
+- Kademlia
 
 WWW: http://www.nongnu.org/mldonkey/
diff --git a/net/mldonkey-devel/pkg-plist b/net/mldonkey-devel/pkg-plist
index 46567757a145..a2ce1f94ec95 100644
--- a/net/mldonkey-devel/pkg-plist
+++ b/net/mldonkey-devel/pkg-plist
@@ -7,13 +7,3 @@
 %%GUI%%bin/mlchat
 %%GUI%%bin/mlgui
 %%GUI%%bin/mlim
-%%PORTDOCS%%share/doc/mldonkey/Authors.txt
-%%PORTDOCS%%share/doc/mldonkey/Bugs.txt
-%%PORTDOCS%%share/doc/mldonkey/ChangeLog
-%%PORTDOCS%%share/doc/mldonkey/Developers.txt
-%%PORTDOCS%%share/doc/mldonkey/FAQ.html
-%%PORTDOCS%%share/doc/mldonkey/Install.txt
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%share/doc/mldonkey/Todo.txt
-%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey