42 files changed, 210 insertions, 480 deletions

diff --git a/net-p2p/mldonkey-gui-devel/Makefile b/net-p2p/mldonkey-gui-devel/Makefile
index db104e3308f5..205fbaf8d975 100644
--- a/net-p2p/mldonkey-gui-devel/Makefile
+++ b/net-p2p/mldonkey-gui-devel/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/mldonkey-gui-devel/distinfo b/net-p2p/mldonkey-gui-devel/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net-p2p/mldonkey-gui-devel/distinfo
+++ b/net-p2p/mldonkey-gui-devel/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net-p2p/mldonkey-gui-devel/files/wrapper.sh b/net-p2p/mldonkey-gui-devel/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net-p2p/mldonkey-gui-devel/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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 db104e3308f5..205fbaf8d975 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo b/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh b/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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-comment b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-comment
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-descr b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-descr
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-message b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-message
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
+++ b/net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2
diff --git a/net-p2p/mldonkey-gui-devel/pkg-comment b/net-p2p/mldonkey-gui-devel/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net-p2p/mldonkey-gui-devel/pkg-comment
+++ b/net-p2p/mldonkey-gui-devel/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net-p2p/mldonkey-gui-devel/pkg-descr b/net-p2p/mldonkey-gui-devel/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net-p2p/mldonkey-gui-devel/pkg-descr
+++ b/net-p2p/mldonkey-gui-devel/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net-p2p/mldonkey-gui-devel/pkg-message b/net-p2p/mldonkey-gui-devel/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net-p2p/mldonkey-gui-devel/pkg-message
+++ b/net-p2p/mldonkey-gui-devel/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net-p2p/mldonkey-gui-devel/pkg-plist b/net-p2p/mldonkey-gui-devel/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net-p2p/mldonkey-gui-devel/pkg-plist
+++ b/net-p2p/mldonkey-gui-devel/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2
diff --git a/net-p2p/mldonkey-gui/Makefile b/net-p2p/mldonkey-gui/Makefile
index db104e3308f5..205fbaf8d975 100644
--- a/net-p2p/mldonkey-gui/Makefile
+++ b/net-p2p/mldonkey-gui/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/mldonkey-gui/distinfo b/net-p2p/mldonkey-gui/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net-p2p/mldonkey-gui/distinfo
+++ b/net-p2p/mldonkey-gui/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net-p2p/mldonkey-gui/files/wrapper.sh b/net-p2p/mldonkey-gui/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net-p2p/mldonkey-gui/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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-comment b/net-p2p/mldonkey-gui/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net-p2p/mldonkey-gui/pkg-comment
+++ b/net-p2p/mldonkey-gui/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net-p2p/mldonkey-gui/pkg-descr b/net-p2p/mldonkey-gui/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net-p2p/mldonkey-gui/pkg-descr
+++ b/net-p2p/mldonkey-gui/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net-p2p/mldonkey-gui/pkg-message b/net-p2p/mldonkey-gui/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net-p2p/mldonkey-gui/pkg-message
+++ b/net-p2p/mldonkey-gui/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net-p2p/mldonkey-gui/pkg-plist b/net-p2p/mldonkey-gui/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net-p2p/mldonkey-gui/pkg-plist
+++ b/net-p2p/mldonkey-gui/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2
diff --git a/net/mldonkey-gui-devel/Makefile b/net/mldonkey-gui-devel/Makefile
index db104e3308f5..205fbaf8d975 100644
--- a/net/mldonkey-gui-devel/Makefile
+++ b/net/mldonkey-gui-devel/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/mldonkey-gui-devel/distinfo b/net/mldonkey-gui-devel/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net/mldonkey-gui-devel/distinfo
+++ b/net/mldonkey-gui-devel/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net/mldonkey-gui-devel/files/wrapper.sh b/net/mldonkey-gui-devel/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net/mldonkey-gui-devel/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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 db104e3308f5..205fbaf8d975 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui-devel/mldonkey-gui/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/distinfo b/net/mldonkey-gui-devel/mldonkey-gui/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/distinfo
+++ b/net/mldonkey-gui-devel/mldonkey-gui/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh b/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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-comment b/net/mldonkey-gui-devel/mldonkey-gui/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/pkg-comment
+++ b/net/mldonkey-gui-devel/mldonkey-gui/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/pkg-descr b/net/mldonkey-gui-devel/mldonkey-gui/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/pkg-descr
+++ b/net/mldonkey-gui-devel/mldonkey-gui/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/pkg-message b/net/mldonkey-gui-devel/mldonkey-gui/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/pkg-message
+++ b/net/mldonkey-gui-devel/mldonkey-gui/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist b/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
+++ b/net/mldonkey-gui-devel/mldonkey-gui/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2
diff --git a/net/mldonkey-gui-devel/pkg-comment b/net/mldonkey-gui-devel/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net/mldonkey-gui-devel/pkg-comment
+++ b/net/mldonkey-gui-devel/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net/mldonkey-gui-devel/pkg-descr b/net/mldonkey-gui-devel/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net/mldonkey-gui-devel/pkg-descr
+++ b/net/mldonkey-gui-devel/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net/mldonkey-gui-devel/pkg-message b/net/mldonkey-gui-devel/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net/mldonkey-gui-devel/pkg-message
+++ b/net/mldonkey-gui-devel/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net/mldonkey-gui-devel/pkg-plist b/net/mldonkey-gui-devel/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net/mldonkey-gui-devel/pkg-plist
+++ b/net/mldonkey-gui-devel/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index db104e3308f5..205fbaf8d975 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,62 +1,47 @@
 # New ports collection makefile for:	mldonkey
-# Date created:		21 August 2002
+# Date created:		19 December 2002
 # Whom:			Holger Lamm <holger@e-gitt.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	1.16
+PORTVERSION=	2.02.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.schraegerpunkt.de/ \
-		http://ernie.eit.uni-kl.de/mldonkey/
-	
-DISTNAME=	${PORTNAME}-${PORTVERSION}.static.${ARCH}-FreeBSD
+MASTER_SITES=	http://ernie.eit.uni-kl.de/mldonkey/ \
+		http://savannah.nongnu.org/download/mldonkey/stable/contributed/
+PKGNAMESUFFIX=	-gui
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.0$/-0/}.shared.${ARCH}-${OPSYS}
 
 MAINTAINER=	holger@e-gitt.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS= i386 alpha
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=    yes
+USE_GNOME=      gtk12
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/kill_mldonkey
-
-pre-install:
-# we can strip the GTK binary
-	@${STRIP_CMD} ${WRKSRC}/mldonkey_gui
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey		${PREFIX}/bin/mldonkey-real
 	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/kill_mldonkey	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/mldonkey_previewer	${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mldonkey
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/mldonkey_gui2	${PREFIX}/bin
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+	@${FMT} < ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
+.if !defined(LANG)
+	@${ECHO_MSG} "Please call as:  make install-user LANG=<lang>"
+	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents !"
+.else
+	@${CP} ${WRKSRC}/i18n/gui_messages.ini.${LANG}\
+		${HOME}/.mldonkey_gui_messages.ini
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/mldonkey-gui/distinfo b/net/mldonkey-gui/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net/mldonkey-gui/distinfo
+++ b/net/mldonkey-gui/distinfo
@@ -1 +1,2 @@
-MD5 (mldonkey-1.16.static.i386-FreeBSD.tar.bz2) = b15aeabf1b0496f225f62baca7b0077c
+MD5 (mldonkey-2.02-0.shared.i386-FreeBSD.tar.bz2) = 76682acd24eedcca5be4f24b26abc7c0
+MD5 (mldonkey-2.02-0.shared.alpha-FreeBSD.tar.bz2) = 8ab6ba3a147fb72f8ce75e079b33b084
diff --git a/net/mldonkey-gui/files/wrapper.sh b/net/mldonkey-gui/files/wrapper.sh
deleted file mode 100644
index c25fd62bc133..000000000000
--- a/net/mldonkey-gui/files/wrapper.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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-comment b/net/mldonkey-gui/pkg-comment
index 985c930c3045..69a9dbd071ca 100644
--- a/net/mldonkey-gui/pkg-comment
+++ b/net/mldonkey-gui/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML/GTK GUI for the mldonkey peer-to-peer network client
diff --git a/net/mldonkey-gui/pkg-descr b/net/mldonkey-gui/pkg-descr
index 470212b5f06b..c7cba37abb6c 100644
--- a/net/mldonkey-gui/pkg-descr
+++ b/net/mldonkey-gui/pkg-descr
@@ -1,10 +1,13 @@
-mldonkey is a OCAML/GTK client for the eDonkey peer-to-peer network
-(see http://www.edonkey2000.com/ and the 'edonkey' ports).
+mldonkey is a OCAML/GTK client for both eDonkey and Overnet
+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.
+This is the official GTK GUI that comes along with the port.
+Like all other control methods (telnet, web), it can run on
+another box than the client does.
 
-Other features over the original client are:
+Other features over the original eDonkey client are:
 - better stability
 - faster operation
 - much better control
diff --git a/net/mldonkey-gui/pkg-message b/net/mldonkey-gui/pkg-message
index 568af83e56c0..8a3ec7b65f21 100644
--- a/net/mldonkey-gui/pkg-message
+++ b/net/mldonkey-gui/pkg-message
@@ -1,20 +1,9 @@
 	ATTENTIONATTENTION:
 
-- 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. 
-
 - If this is the first time you install mldonkey,
-  please go to the mldonkey ports dir as a user and enter:
+  please go to the mldonkey-gui port's dir as the user who will run
+  mldonkey and enter:
 
      make install-user
 
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
-  (try "import /home/directory/path/.edonkey2000-core"
-  on the console), but you can NOT go back!
+  this will set up your user config.
diff --git a/net/mldonkey-gui/pkg-plist b/net/mldonkey-gui/pkg-plist
index dbe1cecdc4d7..f93ccbe9f786 100644
--- a/net/mldonkey-gui/pkg-plist
+++ b/net/mldonkey-gui/pkg-plist
@@ -1,7 +1,2 @@
-bin/kill_mldonkey
-bin/mldonkey
-bin/mldonkey-real
 bin/mldonkey_gui
-bin/mldonkey_previewer
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
+bin/mldonkey_gui2