14 files changed, 170 insertions, 88 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index db104e3308f5..37c8c62d781f 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,57 +6,43 @@
 #
 
 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/
+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=	alpha i386
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
+DOCFILES=	AUTHORS BUGS ChangeLog Developers.txt FAQ.html \
+		Readme.txt TODO ed2k_links.txt
 
 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} ${WRKDIR}/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}
+.for file in ${DOCFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
 	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-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-devel/files/kill_mldonkey b/net-p2p/mldonkey-devel/files/kill_mldonkey
new file mode 100644
index 000000000000..17a7de100aad
--- /dev/null
+++ b/net-p2p/mldonkey-devel/files/kill_mldonkey
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2003
+# Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Holger Lamm <holger@e-gitt.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#!/bin/sh
+
+#
+# Add Username and password here
+# like this:
+#
+HTTPUSER="you"
+HTTPPASS="yourpassword"
+
+# Add location and port of mldonkey core
+HTTPURL="127.0.0.1:4080"
+
+# internal configuration
+HTTP_COMMAND="/usr/bin/fetch"
+HTTP_COMMAND_ARGS="-1 -q -s"
+
+if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
+then
+	export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS}
+fi
+
+${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill"
+
diff --git a/net-p2p/mldonkey-devel/pkg-comment b/net-p2p/mldonkey-devel/pkg-comment
index 985c930c3045..cb832da58948 100644
--- a/net-p2p/mldonkey-devel/pkg-comment
+++ b/net-p2p/mldonkey-devel/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
diff --git a/net-p2p/mldonkey-devel/pkg-descr b/net-p2p/mldonkey-devel/pkg-descr
index 470212b5f06b..a7cf4a8312ae 100644
--- a/net-p2p/mldonkey-devel/pkg-descr
+++ b/net-p2p/mldonkey-devel/pkg-descr
@@ -1,10 +1,12 @@
-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.
+brings a GTK GUI (see the separate mldonkey-gui port).
 
-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-devel/pkg-message b/net-p2p/mldonkey-devel/pkg-message
index 568af83e56c0..8f51f832d1f3 100644
--- a/net-p2p/mldonkey-devel/pkg-message
+++ b/net-p2p/mldonkey-devel/pkg-message
@@ -1,5 +1,8 @@
 	ATTENTIONATTENTION:
 
+- If you want to know how to use mldonkey, read "Readme.txt" 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).
 
@@ -7,14 +10,6 @@
   /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:
-
-     make install-user
-
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
+- 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!
diff --git a/net-p2p/mldonkey-devel/pkg-plist b/net-p2p/mldonkey-devel/pkg-plist
index dbe1cecdc4d7..6f7a26bf9180 100644
--- a/net-p2p/mldonkey-devel/pkg-plist
+++ b/net-p2p/mldonkey-devel/pkg-plist
@@ -1,7 +1,13 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_gui
 bin/mldonkey_previewer
+%%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/TODO
+%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
 %%PORTDOCS%%@dirrm share/doc/mldonkey
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index db104e3308f5..37c8c62d781f 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,57 +6,43 @@
 #
 
 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/
+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=	alpha i386
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-distrib
+WRKSRC=		${WRKDIR}/${PORTNAME}-distrib-${PORTVERSION}
 
 DIRNAME=	${HOME}/.mldonkey
 
-# do not strip, it breaks OCAML binaries
-STRIP=
+DOCFILES=	AUTHORS BUGS ChangeLog Developers.txt FAQ.html \
+		Readme.txt TODO ed2k_links.txt
 
 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} ${WRKDIR}/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}
+.for file in ${DOCFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
 	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-install-user: extract
-	@${TEST} -d ${DIRNAME} ||	${MKDIR} ${DIRNAME}
-	@${CP} ${WRKSRC}/servers.ini	${DIRNAME}/
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index a2660a36c994..c40dd20ec99f 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/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/files/kill_mldonkey b/net-p2p/mldonkey/files/kill_mldonkey
new file mode 100644
index 000000000000..17a7de100aad
--- /dev/null
+++ b/net-p2p/mldonkey/files/kill_mldonkey
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2003
+# Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Holger Lamm <holger@e-gitt.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#!/bin/sh
+
+#
+# Add Username and password here
+# like this:
+#
+HTTPUSER="you"
+HTTPPASS="yourpassword"
+
+# Add location and port of mldonkey core
+HTTPURL="127.0.0.1:4080"
+
+# internal configuration
+HTTP_COMMAND="/usr/bin/fetch"
+HTTP_COMMAND_ARGS="-1 -q -s"
+
+if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
+then
+	export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS}
+fi
+
+${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill"
+
diff --git a/net-p2p/mldonkey/pkg-comment b/net-p2p/mldonkey/pkg-comment
index 985c930c3045..cb832da58948 100644
--- a/net-p2p/mldonkey/pkg-comment
+++ b/net-p2p/mldonkey/pkg-comment
@@ -1 +1 @@
-A OCAML/GTK client for the eDonkey peer-to-peer network
+A OCAML client for eDonkey and Overnet peer-to-peer networks (core)
diff --git a/net-p2p/mldonkey/pkg-descr b/net-p2p/mldonkey/pkg-descr
index 470212b5f06b..a7cf4a8312ae 100644
--- a/net-p2p/mldonkey/pkg-descr
+++ b/net-p2p/mldonkey/pkg-descr
@@ -1,10 +1,12 @@
-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.
+brings a GTK GUI (see the separate mldonkey-gui port).
 
-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/pkg-message b/net-p2p/mldonkey/pkg-message
index 568af83e56c0..8f51f832d1f3 100644
--- a/net-p2p/mldonkey/pkg-message
+++ b/net-p2p/mldonkey/pkg-message
@@ -1,5 +1,8 @@
 	ATTENTIONATTENTION:
 
+- If you want to know how to use mldonkey, read "Readme.txt" 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).
 
@@ -7,14 +10,6 @@
   /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:
-
-     make install-user
-
-  this will set up your user config and install an 
-  initial server list.
-
-- You can import the downloads started with eDonkey
+- 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!
diff --git a/net-p2p/mldonkey/pkg-plist b/net-p2p/mldonkey/pkg-plist
index dbe1cecdc4d7..6f7a26bf9180 100644
--- a/net-p2p/mldonkey/pkg-plist
+++ b/net-p2p/mldonkey/pkg-plist
@@ -1,7 +1,13 @@
 bin/kill_mldonkey
 bin/mldonkey
 bin/mldonkey-real
-bin/mldonkey_gui
 bin/mldonkey_previewer
+%%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/TODO
+%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
 %%PORTDOCS%%@dirrm share/doc/mldonkey