Update to 2.04 rc1

Submitted by:	maintainer

39 files changed, 306 insertions, 108 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index ba074c1fa5b4..63449034c786 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
-PORTREVISION=	1
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
@@ -19,7 +17,7 @@ COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
 ONLY_FOR_ARCHS=	alpha i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
@@ -33,7 +31,6 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net-p2p/mldonkey-devel/pkg-plist b/net-p2p/mldonkey-devel/pkg-plist
index 6f7a26bf9180..2fc8284978db 100644
--- a/net-p2p/mldonkey-devel/pkg-plist
+++ b/net-p2p/mldonkey-devel/pkg-plist
@@ -1,7 +1,6 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_previewer
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog
diff --git a/net-p2p/mldonkey-gui-devel/Makefile b/net-p2p/mldonkey-gui-devel/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net-p2p/mldonkey-gui-devel/Makefile
+++ b/net-p2p/mldonkey-gui-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net-p2p/mldonkey-gui-devel/distinfo b/net-p2p/mldonkey-gui-devel/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net-p2p/mldonkey-gui-devel/distinfo
+++ b/net-p2p/mldonkey-gui-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net-p2p/mldonkey-gui-devel/files/wrapper.sh b/net-p2p/mldonkey-gui-devel/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net-p2p/mldonkey-gui-devel/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile b/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo b/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh b/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net-p2p/mldonkey-gui-devel/pkg-plist b/net-p2p/mldonkey-gui-devel/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net-p2p/mldonkey-gui-devel/pkg-plist
+++ b/net-p2p/mldonkey-gui-devel/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net-p2p/mldonkey-gui/Makefile b/net-p2p/mldonkey-gui/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net-p2p/mldonkey-gui/Makefile
+++ b/net-p2p/mldonkey-gui/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net-p2p/mldonkey-gui/distinfo b/net-p2p/mldonkey-gui/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net-p2p/mldonkey-gui/distinfo
+++ b/net-p2p/mldonkey-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net-p2p/mldonkey-gui/files/wrapper.sh b/net-p2p/mldonkey-gui/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net-p2p/mldonkey-gui/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net-p2p/mldonkey-gui/pkg-plist b/net-p2p/mldonkey-gui/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net-p2p/mldonkey-gui/pkg-plist
+++ b/net-p2p/mldonkey-gui/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index ba074c1fa5b4..63449034c786 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
-PORTREVISION=	1
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
@@ -19,7 +17,7 @@ COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
 ONLY_FOR_ARCHS=	alpha i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
@@ -33,7 +31,6 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net-p2p/mldonkey/pkg-plist b/net-p2p/mldonkey/pkg-plist
index 6f7a26bf9180..2fc8284978db 100644
--- a/net-p2p/mldonkey/pkg-plist
+++ b/net-p2p/mldonkey/pkg-plist
@@ -1,7 +1,6 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_previewer
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index ba074c1fa5b4..63449034c786 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
-PORTREVISION=	1
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
@@ -19,7 +17,7 @@ COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
 ONLY_FOR_ARCHS=	alpha i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
@@ -33,7 +31,6 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net/mldonkey-devel/distinfo
+++ b/net/mldonkey-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net/mldonkey-devel/pkg-plist b/net/mldonkey-devel/pkg-plist
index 6f7a26bf9180..2fc8284978db 100644
--- a/net/mldonkey-devel/pkg-plist
+++ b/net/mldonkey-devel/pkg-plist
@@ -1,7 +1,6 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_previewer
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog
diff --git a/net/mldonkey-gui-devel/Makefile b/net/mldonkey-gui-devel/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net/mldonkey-gui-devel/Makefile
+++ b/net/mldonkey-gui-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net/mldonkey-gui-devel/distinfo b/net/mldonkey-gui-devel/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net/mldonkey-gui-devel/distinfo
+++ b/net/mldonkey-gui-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net/mldonkey-gui-devel/files/wrapper.sh b/net/mldonkey-gui-devel/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net/mldonkey-gui-devel/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/Makefile b/net/mldonkey-gui-devel/mldonkey-gui/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui-devel/mldonkey-gui/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/distinfo b/net/mldonkey-gui-devel/mldonkey-gui/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/distinfo
+++ b/net/mldonkey-gui-devel/mldonkey-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh b/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist b/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
+++ b/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net/mldonkey-gui-devel/pkg-plist b/net/mldonkey-gui-devel/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net/mldonkey-gui-devel/pkg-plist
+++ b/net/mldonkey-gui-devel/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index d7327418d5e2..c7fa0bd0a68e 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
 PKGNAMESUFFIX=	-gui
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML/GTK GUI for the mldonkey peer-to-peer network client
@@ -21,16 +20,29 @@ USE_BZIP2=	yes
 USE_GNOMENG=    yes
 USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin/mldonkey+gui-real
+	@if [ -e ${PREFIX}/bin/mldonkey ]; then \
+	  ${LN}	${PREFIX}/bin/mldonkey		${PREFIX}/bin/mldonkey+gui; \
+	else \
+	  ${INSTALL_SCRIPT}  ${WRKDIR}/wrapper.sh	${PREFIX}/bin/mldonkey+gui; \
+	fi
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_SCRIPT}  ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 
 post-install:
-	@${FMT} < ${PKGMESSAGE}
+	@${CAT}  ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +53,7 @@ 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
diff --git a/net/mldonkey-gui/distinfo b/net/mldonkey-gui/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net/mldonkey-gui/distinfo
+++ b/net/mldonkey-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net/mldonkey-gui/files/wrapper.sh b/net/mldonkey-gui/files/wrapper.sh
new file mode 100644
index 000000000000..c25fd62bc133
--- /dev/null
+++ b/net/mldonkey-gui/files/wrapper.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%/bin"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
diff --git a/net/mldonkey-gui/pkg-plist b/net/mldonkey-gui/pkg-plist
index f93ccbe9f786..6f34dc315995 100644
--- a/net/mldonkey-gui/pkg-plist
+++ b/net/mldonkey-gui/pkg-plist
@@ -1,2 +1,7 @@
 bin/mldonkey_gui
 bin/mldonkey_gui2
+bin/mldonkey+gui
+bin/mldonkey+gui-real
+bin/mldonkey_previewer
+bin/mldonkey_guistarter
+bin/mlim
diff --git a/net/mldonkey-src/Makefile b/net/mldonkey-src/Makefile
index 9da5184fbeea..f57a45a1df5f 100644
--- a/net/mldonkey-src/Makefile
+++ b/net/mldonkey-src/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
-PORTREVISION=	1
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-${PORTVERSION:S/.r/rc/}/
 PKGNAMESUFFIX=	-src
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.sources
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}.sources
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks
@@ -20,18 +18,20 @@ COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-multinet
+CONFIGURE_ARGS=	--disable-multinet \
+		--enable-pthread
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
 ALL_TARGET=	depend all
 
 .if defined(WITHOUT_GUI)
 # have no 'without-' flag
-CONFIGURE_ENV=	GTK_CONFIG=no
+CONFIGURE_ARGS+=	--disable-gui
 PLIST_SUB+=	GUI="@comment "
 .else
 PLIST_SUB+=	GUI=""
-BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
+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_GNOMENG=	yes
 USE_GNOME=	gtk12
@@ -51,14 +51,16 @@ post-patch:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
-	@${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
 .ifndef(WITHOUT_GUI)
+	@${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_guistarter	${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey+gui	${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mlchat		${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mlim		${PREFIX}/bin
 .endif
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -73,9 +75,9 @@ post-install:
 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 !"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
-	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+	@${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\
 		${HOME}/.mldonkey_gui_messages.ini
 .endif
 
diff --git a/net/mldonkey-src/distinfo b/net/mldonkey-src/distinfo
index 3d5f29f75eca..da6a2d346f9d 100644
--- a/net/mldonkey-src/distinfo
+++ b/net/mldonkey-src/distinfo
@@ -1 +1 @@
-MD5 (mldonkey-2.02-0.sources.tar.gz) = 9db7855e811d1bf2ffab23ebd565efc1
+MD5 (mldonkey-2.04rc1.sources.tar.gz) = ea7a2320fd7d89c994de5a098e0e119a
diff --git a/net/mldonkey-src/pkg-plist b/net/mldonkey-src/pkg-plist
index bd38360c8a4c..1e5026a7f90d 100644
--- a/net/mldonkey-src/pkg-plist
+++ b/net/mldonkey-src/pkg-plist
@@ -1,11 +1,13 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_guistarter
-bin/mldonkey_previewer
+%%GUI%%bin/mldonkey_guistarter
+%%GUI%%bin/mldonkey_previewer
 %%GUI%%bin/mlchat
+%%GUI%%bin/mldonkey+gui
 %%GUI%%bin/mldonkey_gui
 %%GUI%%bin/mldonkey_gui2
+%%GUI%%bin/mlim
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index ba074c1fa5b4..63449034c786 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.02.0
-PORTREVISION=	1
+PORTVERSION=	2.04.r1
 CATEGORIES=	net
-MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
-		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
+MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/release-2.04rc1/contributed/holger/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}-0.shared.${ARCH}-${OPSYS}-hl
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
@@ -19,7 +17,7 @@ COMMENT=	A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
 ONLY_FOR_ARCHS=	alpha i386
 USE_BZIP2=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:C/.(.)$/-\1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION:S/.r/rc/}-0
 
 DIRNAME=	${HOME}/.mldonkey
 
@@ -33,7 +31,6 @@ post-patch:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index c40dd20ec99f..4f411fb1a72f 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,2 +1,2 @@
-MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
-MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
+MD5 (mldonkey-2.04rc1-0.shared.alpha-FreeBSD-hl.tar.bz2) = 41dcb32d1d982de203388d83b18ff3c1
+MD5 (mldonkey-2.04rc1-0.shared.i386-FreeBSD-hl.tar.bz2) = af85d3aed07256e5c3568de2a25d25fb
diff --git a/net/mldonkey/pkg-plist b/net/mldonkey/pkg-plist
index 6f7a26bf9180..2fc8284978db 100644
--- a/net/mldonkey/pkg-plist
+++ b/net/mldonkey/pkg-plist
@@ -1,7 +1,6 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_previewer
 %%PORTDOCS%%share/doc/mldonkey/AUTHORS
 %%PORTDOCS%%share/doc/mldonkey/BUGS
 %%PORTDOCS%%share/doc/mldonkey/ChangeLog