6 files changed, 21 insertions, 36 deletions

diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile
index a29b56d3d6a7..72919d8a5b5c 100644
--- a/net-p2p/linux-edonkey-core/Makefile
+++ b/net-p2p/linux-edonkey-core/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.2000.16.16.59.3
-PORTREVISION=	1
+PORTVERSION=	16.16.58.2
 CATEGORIES=	net linux
 MASTER_SITES=	http://users.aber.ac.uk/tpm01/
 PKGNAMESUFFIX=	-core
-DISTNAME=	donkey_s_59-3
-EXTRACT_SUFX=	.gz
-EXTRACT_ONLY=
+DISTNAME=	donkey_s_1658-gaps-2
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -31,17 +28,15 @@ BRANDELF?=	/usr/bin/brandelf
 BRANDELF?=	brandelf
 .endif
 
+BINARY_NAME_OLD=	donkey_s_1658-gaps-2b
 BINARY_NAME=	donkey
 
-post-extract:
-	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
-
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME_OLD} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
@@ -53,8 +48,8 @@ do-install:
 
 pre-install:
 .if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD}
 .endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/linux-edonkey-core/distinfo b/net-p2p/linux-edonkey-core/distinfo
index d39a7a81dbf9..19f4d7469cfe 100644
--- a/net-p2p/linux-edonkey-core/distinfo
+++ b/net-p2p/linux-edonkey-core/distinfo
@@ -1 +1 @@
-MD5 (donkey_s_59-3.gz) = 7e1e293491ad4eb74b692c2125732f72
+MD5 (donkey_s_1658-gaps-2.tar.gz) = ff3a5f80451136e207b744599ef75cc4
diff --git a/net/edonkey-core/Makefile b/net/edonkey-core/Makefile
index a29b56d3d6a7..72919d8a5b5c 100644
--- a/net/edonkey-core/Makefile
+++ b/net/edonkey-core/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.2000.16.16.59.3
-PORTREVISION=	1
+PORTVERSION=	16.16.58.2
 CATEGORIES=	net linux
 MASTER_SITES=	http://users.aber.ac.uk/tpm01/
 PKGNAMESUFFIX=	-core
-DISTNAME=	donkey_s_59-3
-EXTRACT_SUFX=	.gz
-EXTRACT_ONLY=
+DISTNAME=	donkey_s_1658-gaps-2
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -31,17 +28,15 @@ BRANDELF?=	/usr/bin/brandelf
 BRANDELF?=	brandelf
 .endif
 
+BINARY_NAME_OLD=	donkey_s_1658-gaps-2b
 BINARY_NAME=	donkey
 
-post-extract:
-	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
-
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME_OLD} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
@@ -53,8 +48,8 @@ do-install:
 
 pre-install:
 .if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD}
 .endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD}
 
 .include <bsd.port.post.mk>
diff --git a/net/edonkey-core/distinfo b/net/edonkey-core/distinfo
index d39a7a81dbf9..19f4d7469cfe 100644
--- a/net/edonkey-core/distinfo
+++ b/net/edonkey-core/distinfo
@@ -1 +1 @@
-MD5 (donkey_s_59-3.gz) = 7e1e293491ad4eb74b692c2125732f72
+MD5 (donkey_s_1658-gaps-2.tar.gz) = ff3a5f80451136e207b744599ef75cc4
diff --git a/net/linux-edonkey-core/Makefile b/net/linux-edonkey-core/Makefile
index a29b56d3d6a7..72919d8a5b5c 100644
--- a/net/linux-edonkey-core/Makefile
+++ b/net/linux-edonkey-core/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.2000.16.16.59.3
-PORTREVISION=	1
+PORTVERSION=	16.16.58.2
 CATEGORIES=	net linux
 MASTER_SITES=	http://users.aber.ac.uk/tpm01/
 PKGNAMESUFFIX=	-core
-DISTNAME=	donkey_s_59-3
-EXTRACT_SUFX=	.gz
-EXTRACT_ONLY=
+DISTNAME=	donkey_s_1658-gaps-2
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -31,17 +28,15 @@ BRANDELF?=	/usr/bin/brandelf
 BRANDELF?=	brandelf
 .endif
 
+BINARY_NAME_OLD=	donkey_s_1658-gaps-2b
 BINARY_NAME=	donkey
 
-post-extract:
-	@${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKSRC}/${BINARY_NAME}
-
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/sbin/${BINARY_NAME}-real
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME_OLD} ${PREFIX}/sbin/${BINARY_NAME}-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
@@ -53,8 +48,8 @@ do-install:
 
 pre-install:
 .if exists(${STRIP_CMD})
-	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME}
+	@${STRIP_CMD} ${WRKSRC}/${BINARY_NAME_OLD}
 .endif
-	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME}
+	@${BRANDELF} -t Linux ${WRKSRC}/${BINARY_NAME_OLD}
 
 .include <bsd.port.post.mk>
diff --git a/net/linux-edonkey-core/distinfo b/net/linux-edonkey-core/distinfo
index d39a7a81dbf9..19f4d7469cfe 100644
--- a/net/linux-edonkey-core/distinfo
+++ b/net/linux-edonkey-core/distinfo
@@ -1 +1 @@
-MD5 (donkey_s_59-3.gz) = 7e1e293491ad4eb74b692c2125732f72
+MD5 (donkey_s_1658-gaps-2.tar.gz) = ff3a5f80451136e207b744599ef75cc4