7 files changed, 47 insertions, 66 deletions

diff --git a/net/linux-edonkey-core/Makefile b/net/linux-edonkey-core/Makefile
index a28afa23396a..d05dda04e973 100644
--- a/net/linux-edonkey-core/Makefile
+++ b/net/linux-edonkey-core/Makefile
@@ -6,54 +6,50 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.50.1
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 PORTEPOCH=	1
 CATEGORIES=	net linux
-MASTER_SITES=	http://www.overnet.com/files/
+MASTER_SITES=	http://www.zen18864.zen.co.uk/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
 PKGNAMESUFFIX=	-core
-DISTNAME=	donkey${PORTVERSION}
+DISTNAME=	${PORTNAME}clc-${PORTVERSION}_${ARCH}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	eDonkey2000 'core' command line client
 
 ONLY_FOR_ARCHS=	i386
-USE_LINUX?=	yes
-NO_WRKSUBDIR=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 STRIP=
 
-STRIP_CMD=	${LINUXBASE}/usr/bin/strip
+BINARY_NAME_OLD?=	${PORTNAME}clc
+BINARY_NAME=	donkey
 
-.if exists(/usr/bin/brandelf)
-BRANDELF?=	/usr/bin/brandelf
-.else
-BRANDELF?=	brandelf
-.endif
+DOC_FILES=	ChangeLog LISEZMOI README changelog.Debian.gz
 
-BINARY_NAME_OLD?=	donkey${PORTVERSION}
-BINARY_NAME=	donkey
+pre-install:
 
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
+	@${BRANDELF} -t Linux ${WRKSRC}/usr/bin/${BINARY_NAME_OLD}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME_OLD} ${PREFIX}/sbin/${BINARY_NAME}-real
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
+	${INSTALL} -d ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/${BINARY_NAME_OLD} ${PREFIX}/sbin/${BINARY_NAME}
+	${INSTALL} -d ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/usr/share/${PORTNAME}clc/contact.dat ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/contact.dat
+	${INSTALL_DATA} ${WRKSRC}/usr/share/${PORTNAME}clc/server.met ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/server.met
+
+post-install:
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}${PKGNAMESUFFIX}
-.endif
-	@${SED} s!/usr/local/share/doc/edonkey-core!${DOCSDIR}${PKGNAMESUFFIX}! ${PKGMESSAGE}
+	${INSTALL} -d ${DOCSDIR}${PKGNAMESUFFIX}
 
-.include <bsd.port.pre.mk>
+.for file in ${DOC_FILES}
+	${INSTALL_MAN} ${WRKSRC}/usr/share/doc/${PORTNAME}clc/${file} ${DOCSDIR}${PKGNAMESUFFIX}
+.endfor
 
-pre-install:
-.if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD}
+	${INSTALL_MAN} ${FILESDIR}/README.FreeBSD ${DOCSDIR}${PKGNAMESUFFIX}
 .endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD}
+	@${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}${PKGNAMESUFFIX}|g' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/linux-edonkey-core/distinfo b/net/linux-edonkey-core/distinfo
index 3dadd4e5c560..399849b8d529 100644
--- a/net/linux-edonkey-core/distinfo
+++ b/net/linux-edonkey-core/distinfo
@@ -1,2 +1,2 @@
-MD5 (donkey0.50.1.tar.gz) = dcda1d56faf30e63765d4206faff1168
-SIZE (donkey0.50.1.tar.gz) = 593729
+MD5 (edonkeyclc-1.1.0_i386.tgz) = 943d92390f63b349853f1847109c1a47
+SIZE (edonkeyclc-1.1.0_i386.tgz) = 404786
diff --git a/net/linux-edonkey-core/files/README.FreeBSD b/net/linux-edonkey-core/files/README.FreeBSD
index 8fe970822fc3..b4e4c3d86f33 100644
--- a/net/linux-edonkey-core/files/README.FreeBSD
+++ b/net/linux-edonkey-core/files/README.FreeBSD
@@ -1,7 +1,3 @@
-[ HELP file resumed from FAQ at
-  http://users.aber.ac.uk/tpm01/ed2k_tools/faq.html ]
-
-	Read the aforementioned FAQ for complete instructions.
 
 	1) You have to configure the 'core' client and add a password
 
diff --git a/net/linux-edonkey-core/files/wrapper.sh b/net/linux-edonkey-core/files/wrapper.sh
deleted file mode 100644
index a1cbdc0258a2..000000000000
--- a/net/linux-edonkey-core/files/wrapper.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PREFIX="%%PREFIX%%"
-PROGRAM="${0}"
-DIRNAME=${HOME}/.edonkey2000-core
-
-if [ ! -d ${DIRNAME} ]
-then
-	mkdir -p ${DIRNAME}
-fi
-
-if [ ! -h ${DIRNAME}/${PROGRAM##*/} ]
-then
-	ln -sf ${PREFIX}/sbin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/}
-fi
-
-echo " ${*} " | grep " \-createdironly " ||
-{
-	cd ${DIRNAME} &&
-	echo Running under ${DIRNAME} &&
-	exec ./${PROGRAM##*/} "${@}" ||
-	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
-}
diff --git a/net/linux-edonkey-core/pkg-descr b/net/linux-edonkey-core/pkg-descr
index 16c9c6962ea4..646b12ef345f 100644
--- a/net/linux-edonkey-core/pkg-descr
+++ b/net/linux-edonkey-core/pkg-descr
@@ -5,6 +5,4 @@ downloading, uploading, all that stuff.
 The 'core' comes with a very simple text interface (=command line
 client), where you can tell it what to do by typing in commands.
 
-Check http://www.edonkey2000.com/ and the WWW site below.
-
-WWW: http://users.aber.ac.uk/tpm01/guihome.html
+WWW: http://www.edonkey2000.com/
diff --git a/net/linux-edonkey-core/pkg-message b/net/linux-edonkey-core/pkg-message
index e67c43fee822..20694f402081 100644
--- a/net/linux-edonkey-core/pkg-message
+++ b/net/linux-edonkey-core/pkg-message
@@ -1,7 +1,7 @@
 	ATTENTIONATTENTION:
 
 Please make sure that you read
-/usr/local/share/doc/edonkey-core/README.FreeBSD.
+%%DOCSDIR%%/README.FreeBSD.
 It contains important information about both configuring and running
 edonkey2000 under FreeBSD. You will have problems running it if you
 do not read it.
@@ -10,3 +10,11 @@ eDonkey2000 version 0.46 and later store downloads in a different
 format. Therefore, they are not compatible with either lmule or
 older eDonkey2000 clients.
 
+eDonkey2000 version 1.0.2 requires edonkey-gui-gtk version 0.6.3 or higher.
+Older gui versions will not work with this version. Also the standard directory
+in which eDonkey2000 stores the user settings has been changed from
+~/.edonkey2000-core to ~/.eDonkey2000. That's why eDonkey2000 will NOT
+recognise your settings and downloads until you rename the old directory.
+
+Finally, this port doesn't come with a wrapper anymore, because eDonkey2000
+keeps user settings in a directory that is hardcoded into the executable.
diff --git a/net/linux-edonkey-core/pkg-plist b/net/linux-edonkey-core/pkg-plist
index b500e2c37b31..200c6e792f70 100644
--- a/net/linux-edonkey-core/pkg-plist
+++ b/net/linux-edonkey-core/pkg-plist
@@ -1,4 +1,10 @@
-bin/donkey
-sbin/donkey-real
-%%PORTDOCS%%share/doc/edonkey-core/README.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/edonkey-core
+sbin/donkey
+share/edonkey-core/contact.dat
+share/edonkey-core/server.met
+%%PORTDOCS%%%%DOCSDIR%%-core/README.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%-core/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%-core/LISEZMOI
+%%PORTDOCS%%%%DOCSDIR%%-core/README
+%%PORTDOCS%%%%DOCSDIR%%-core/changelog.Debian.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-core
+@dirrm share/edonkey-core