ports/71706: Update of net/linux-edonkey-core

Mon Sep 13 17:00:46 UTC 2004

>Number:         71706
>Category:       ports
>Synopsis:       Update of net/linux-edonkey-core
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 13 17:00:43 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     No Name
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD skatecity 4.10-STABLE FreeBSD 4.10-STABLE #0: Mon Aug 23 20:56:48 CEST 2004 arundel at skatecity:/usr/obj/usr/src/sys/ARUNDEL i386


	
>Description:
	Update of net/linux-edonkey-core to the newest version (1.0.2).

>How-To-Repeat:
	
>Fix:

--- output begins here ---
diff -ruN /usr/ports/net/linux-edonkey-core/Makefile /usr/ports/custom/linux-edonkey-core/Makefile
--- /usr/ports/net/linux-edonkey-core/Makefile	Sat Feb 14 07:09:12 2004
+++ /usr/ports/custom/linux-edonkey-core/Makefile	Mon Sep 13 18:03:34 2004
@@ -6,54 +6,50 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.50.1
+PORTVERSION=	1.0.2
 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}_compat
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lioux at FreeBSD.org
 COMMENT=	eDonkey2000 'core' command line client
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_SIZE=	yes
-NO_WRKSUBDIR=	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 -ruN /usr/ports/net/linux-edonkey-core/distinfo /usr/ports/custom/linux-edonkey-core/distinfo
--- /usr/ports/net/linux-edonkey-core/distinfo	Sat Feb 14 07:09:12 2004
+++ /usr/ports/custom/linux-edonkey-core/distinfo	Fri Sep 10 17:11:27 2004
@@ -1,2 +1,2 @@
-MD5 (donkey0.50.1.tar.gz) = dcda1d56faf30e63765d4206faff1168
-SIZE (donkey0.50.1.tar.gz) = 593729
+MD5 (edonkeyclc-1.0.2_i386_compat.tgz) = ec925ae264c09778f4239e2c7a970991
+SIZE (edonkeyclc-1.0.2_i386_compat.tgz) = 409391
diff -ruN /usr/ports/net/linux-edonkey-core/files/wrapper.sh /usr/ports/custom/linux-edonkey-core/files/wrapper.sh
--- /usr/ports/net/linux-edonkey-core/files/wrapper.sh	Fri Aug 16 04:18:13 2002
+++ /usr/ports/custom/linux-edonkey-core/files/wrapper.sh	Thu Jan  1 01:00:00 1970
@@ -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 -ruN /usr/ports/net/linux-edonkey-core/pkg-descr /usr/ports/custom/linux-edonkey-core/pkg-descr
--- /usr/ports/net/linux-edonkey-core/pkg-descr	Sat Feb 16 16:49:34 2002
+++ /usr/ports/custom/linux-edonkey-core/pkg-descr	Fri Sep 10 22:58:56 2004
@@ -5,6 +5,4 @@
 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 -ruN /usr/ports/net/linux-edonkey-core/pkg-message /usr/ports/custom/linux-edonkey-core/pkg-message
--- /usr/ports/net/linux-edonkey-core/pkg-message	Tue Apr 22 18:29:53 2003
+++ /usr/ports/custom/linux-edonkey-core/pkg-message	Mon Sep 13 18:03:24 2004
@@ -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 @@
 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 -ruN /usr/ports/net/linux-edonkey-core/pkg-plist /usr/ports/custom/linux-edonkey-core/pkg-plist
--- /usr/ports/net/linux-edonkey-core/pkg-plist	Mon May  6 18:56:30 2002
+++ /usr/ports/custom/linux-edonkey-core/pkg-plist	Mon Sep 13 17:55:23 2004
@@ -1,4 +1,10 @@
-bin/donkey
-sbin/donkey-real
-%%PORTDOCS%%share/doc/edonkey-core/README.FreeBSD
+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 share/doc/edonkey-core
+ at dirrm share/edonkey-core
--- output ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

