aboutsummaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2003-03-26 17:09:03 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2003-03-26 17:09:03 +0000
commit4dd481bc529ab76f6c64e0b1d21f3dfb9db9d241 (patch)
treee04c35551ccc8130bee6038657e32c25f8a1577c /net-p2p
parentd57aeca8a1cf878842c82d6849078d1574aaaade (diff)
downloadports-4dd481bc529ab76f6c64e0b1d21f3dfb9db9d241.tar.gz
ports-4dd481bc529ab76f6c64e0b1d21f3dfb9db9d241.zip
Update to 2.04 rc1
Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=77490
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/mldonkey-devel/Makefile11
-rw-r--r--net-p2p/mldonkey-devel/distinfo4
-rw-r--r--net-p2p/mldonkey-devel/pkg-plist1
-rw-r--r--net-p2p/mldonkey-gui-devel/Makefile26
-rw-r--r--net-p2p/mldonkey-gui-devel/distinfo4
-rw-r--r--net-p2p/mldonkey-gui-devel/files/wrapper.sh18
-rw-r--r--net-p2p/mldonkey-gui-devel/mldonkey-gui/Makefile26
-rw-r--r--net-p2p/mldonkey-gui-devel/mldonkey-gui/distinfo4
-rw-r--r--net-p2p/mldonkey-gui-devel/mldonkey-gui/files/wrapper.sh18
-rw-r--r--net-p2p/mldonkey-gui-devel/mldonkey-gui/pkg-plist5
-rw-r--r--net-p2p/mldonkey-gui-devel/pkg-plist5
-rw-r--r--net-p2p/mldonkey-gui/Makefile26
-rw-r--r--net-p2p/mldonkey-gui/distinfo4
-rw-r--r--net-p2p/mldonkey-gui/files/wrapper.sh18
-rw-r--r--net-p2p/mldonkey-gui/pkg-plist5
-rw-r--r--net-p2p/mldonkey/Makefile11
-rw-r--r--net-p2p/mldonkey/distinfo4
-rw-r--r--net-p2p/mldonkey/pkg-plist1
18 files changed, 144 insertions, 47 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