4 files changed, 11 insertions, 61 deletions

diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index 2eec439fc145..558e9c75b2b0 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.0.a
 CATEGORIES=	net linux
-MASTER_SITES=	http://www.edonkey2000.com/files/
-DISTNAME=	ed2k_linux_gui_0.1alpha
+MASTER_SITES=	http://users.aber.ac.uk/tpm01/
 PKGNAMESUFFIX=	-gui-gtk
+DISTNAME=	linux_gui_alpha_unstable
+EXTRACT_SUFX=
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -19,14 +20,12 @@ RUN_DEPENDS=	donkey:${PORTSDIR}/net/edonkey-core \
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-WRKSRC=		${WRKDIR}/linux_gui_alpha
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 STRIP=
 
 STRIP_CMD=	${LINUXBASE}/usr/bin/strip
 
-DATA_FILES=	gui_lookuplist gui_options
-
 .if exists(/usr/bin/brandelf)
 BRANDELF?=	/usr/bin/brandelf
 .else
@@ -35,22 +34,13 @@ BRANDELF?=	brandelf
 
 BINARY_NAME=	ed2k_gui
 
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|;s|%%DATADIR%%|${DATADIR}|; \
-		s|%%DATAFILES%%|${DATA_FILES}|" \
-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${BINARY_NAME}
 
 do-install:
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/todo.txt ${DOCSDIR}
-.endif
-	${MKDIR} ${DATADIR}
-.for file in ${DATA_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin/${BINARY_NAME}-real
-	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${BINARY_NAME}
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-p2p/edonkey-gui-gtk/distinfo b/net-p2p/edonkey-gui-gtk/distinfo
index 4582cc64926b..ed9db36e0271 100644
--- a/net-p2p/edonkey-gui-gtk/distinfo
+++ b/net-p2p/edonkey-gui-gtk/distinfo
@@ -1 +1 @@
-MD5 (ed2k_linux_gui_0.1alpha.tar.gz) = 24b3b520980fdeb718bb84841c5bb03a
+MD5 (linux_gui_alpha_unstable) = 823ef0a3f9d02f138f4eab6f2da08639
diff --git a/net-p2p/edonkey-gui-gtk/files/wrapper.sh b/net-p2p/edonkey-gui-gtk/files/wrapper.sh
deleted file mode 100644
index f6ca8cb91daf..000000000000
--- a/net-p2p/edonkey-gui-gtk/files/wrapper.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-PREFIX="%%PREFIX%%"
-PROGRAM="${0}"
-DIRNAME=${HOME}/.edonkey2000-gui-gtk
-DATADIR="%%DATADIR%%"
-DATAFILES="%%DATAFILES%%"
-
-if [ ${#} -gt 1 ]
-then
-	shift
-fi
-
-if [ ! -d ${DIRNAME} ]
-then
-	mkdir -p ${DIRNAME}
-fi
-
-if [ ! -h ${DIRNAME}/${PROGRAM##*/} ]
-then
-	ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/}
-	for file in ${DATAFILES}
-	do
-		ln -sf "${DATADIR}/${file}" "${DIRNAME}/${file}"
-	done
-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-p2p/edonkey-gui-gtk/pkg-plist b/net-p2p/edonkey-gui-gtk/pkg-plist
index 480d5ed7c81a..52c6fb524cd2 100644
--- a/net-p2p/edonkey-gui-gtk/pkg-plist
+++ b/net-p2p/edonkey-gui-gtk/pkg-plist
@@ -1,7 +1 @@
 bin/ed2k_gui
-bin/ed2k_gui-real
-%%PORTDOCS%%share/doc/edonkey/todo.txt
-share/edonkey/gui_lookuplist
-share/edonkey/gui_options
-@dirrm share/edonkey
-%%PORTDOCS%%@dirrm share/doc/edonkey