Update to 2.04 rc1

Submitted by:	maintainer

8 files changed, 88 insertions, 18 deletions

diff --git a/net-p2p/mldonkey-gui-devel/Makefile b/net-p2p/mldonkey-gui-devel/Makefile
index d732741..c7fa0bd 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 c40dd20..4f411fb 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 0000000..c25fd62
--- /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 d732741..c7fa0bd 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 c40dd20..4f411fb 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 0000000..c25fd62
--- /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 f93ccbe..6f34dc3 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 f93ccbe..6f34dc3 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