5 files changed, 105 insertions, 43 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 63449034c786..a523ea49fff6 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -6,46 +6,90 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.04.r1
+PORTVERSION=	2.5.3
 CATEGORIES=	net
-MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:C/\.(.)$/-\1/}/official/
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}.sources
 
 MAINTAINER=	holger@e-gitt.net
-COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
+COMMENT=	A OCAML client for multiple peer-to-peer networks
 
-ONLY_FOR_ARCHS=	alpha i386
-USE_BZIP2=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
+BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-DIRNAME=	${HOME}/.mldonkey
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-pthread
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
+USE_GMAKE=	yes
+ALL_TARGET=	depend opt
 
-DOCFILES=	AUTHORS BUGS ChangeLog Developers.txt FAQ.html \
-		Readme.txt TODO ed2k_links.txt
+.if defined(WITHOUT_GUI)
+.if defined(WITHOUT_CORE)
+.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing."
+.endif
+# have no 'without-' flag
+CONFIGURE_ARGS+=--disable-gui
+PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
+PKGNAMESUFFIX=	-core
+.else
+PLIST_SUB+=	GUI=""
+BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
+		${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
+# we don't need lablgtk as RUN dependency, but we need gtk+glib
+USE_GNOME=	gtk12
+.if defined(WITHOUT_CORE)
+PKGNAMESUFFIX=	-gui
+PLIST_SUB+=	CORE="@comment " GUICORE="@comment "
+.else
+PLIST_SUB+=	CORE=""	GUICORE=""
+.endif
+.endif
+
+DOCFILES=	AUTHORS BUGS ChangeLog FAQ.html \
+		INSTALL TODO ed2k_links.txt
+
+pre-everything::
+.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
+	@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
+	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
+.endif
 
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
+.ifndef(WITHOUT_CORE)
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet		${PREFIX}/bin/mlnet-real
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mlnet
+.endif
+.ifndef(WITHOUT_GUI)
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlchat		${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui		${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
+.endif
+.ifndef(WITHOUT_CORE && WITHOUT_GUI)
+	@${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui		${PREFIX}/bin
+.endif
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/distrib/${file} ${DOCSDIR}
 .endfor
 .endif
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
+	@${CAT} ${PKGMESSAGE}
 
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+install-user: extract
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
+.else
+	@${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 4f411fb1a72f..1598703cf88a 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,2 +1 @@
-MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
-MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
+MD5 (mldonkey-2.5-3.sources.tar.gz) = d11504a6dd1e8b5f955951d1f73236ed
diff --git a/net/mldonkey/pkg-descr b/net/mldonkey/pkg-descr
index a7cf4a8312ae..4fdcee9c079e 100644
--- a/net/mldonkey/pkg-descr
+++ b/net/mldonkey/pkg-descr
@@ -1,16 +1,18 @@
-mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+mldonkey is a OCAML/GTK client for a number of
 peer-to-peer networks.
-(see http://www.edonkey2000.com/ and the 'edonkey' ports)
-(see http://www.overnet.com/)
 
 It is separated into a core with telnet and web interfaces, and
-brings a GTK GUI (see the separate mldonkey-gui port).
+a GTK GUI. 
 
-Other features over the original eDonkey client are:
-- better stability
-- faster operation
-- much better control
-- saves its current state, checksums and known peers 
-  (instead of starting from scratch every time)
+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/)
 
-WWW: http://www.freesoftware.fsf.org/mldonkey/
+WWW: http://www.mldonkey.org/
+     http://www.nongnu.org/mldonkey/
diff --git a/net/mldonkey/pkg-message b/net/mldonkey/pkg-message
index 8f51f832d1f3..9ec1ee80b84c 100644
--- a/net/mldonkey/pkg-message
+++ b/net/mldonkey/pkg-message
@@ -1,15 +1,27 @@
 	ATTENTIONATTENTION:
 
-- If you want to know how to use mldonkey, read "Readme.txt" or
+- If you want to know how to use mldonkey, read "INSTALL" or
   "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey)
 
 - It is not a bad idea to install mplayer. You will be able
   to preview half-downloaded files (if you have the beginning).
 
-- Please make sure that you read
-  /usr/local/share/doc/mldonkey/Readme.txt.
-  It contains important information about how to run mldonkey. 
-
 - You can import the downloads you started with eDonkey
   (try "import /home/directory/path/.edonkey2000-core"
   on the console), but you can NOT go back!
+
+- If this is the first time you install mldonkey,
+  please go to the mldonkey-gui ports dir as a user and enter:
+
+     make install-user
+
+  this will set up your user config.
+
+- You have to enable the different protocols on the client
+  console. Go to the (mldonkey-) console, and try the commands
+  'set enable_<protocol> true' (try 'voo' for reference).
+
++------------------------------------------------------------+
+|- For upgraders: The names of the binaries have changed.    |
+|  Core and GUI are called "mlnet" and "mlgui", respectively.|
++------------------------------------------------------------+
diff --git a/net/mldonkey/pkg-plist b/net/mldonkey/pkg-plist
index 2fc8284978db..4805dcf325d6 100644
--- a/net/mldonkey/pkg-plist
+++ b/net/mldonkey/pkg-plist
@@ -1,12 +1,17 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
+%%CORE%%bin/kill_mldonkey
+%%CORE%%bin/mlnet
+%%CORE%%bin/mlnet-real
+%%GUICORE%%bin/mlguistarter
+%%GUICORE%%bin/mldonkey_previewer
+%%GUICORE%%bin/mlnet+gui
+%%GUI%%bin/mlchat
+%%GUI%%bin/mlgui
+%%GUI%%bin/mlim
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog
-%%PORTDOCS%%share/doc/mldonkey/Developers.txt
 %%PORTDOCS%%share/doc/mldonkey/FAQ.html
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
+%%PORTDOCS%%share/doc/mldonkey/INSTALL
 %%PORTDOCS%%share/doc/mldonkey/TODO
 %%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
 %%PORTDOCS%%@dirrm share/doc/mldonkey