o Update to 0.4.0.1 now available in source code form which enables

  us to support all our platforms
o Add a warning to PKGMESSAGE about missing new configuration files
  with older ones

4 files changed, 147 insertions, 53 deletions

diff --git a/net/edonkey-gui-gtk/Makefile b/net/edonkey-gui-gtk/Makefile
index 8fad5a1014fe..873d591a53f2 100644
--- a/net/edonkey-gui-gtk/Makefile
+++ b/net/edonkey-gui-gtk/Makefile
@@ -6,62 +6,36 @@
 #
 
 PORTNAME=	edonkey
-PORTVERSION=	0.2.0.a.2002080400
+PORTVERSION=	0.4.0.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	lioux
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	ed2k-gtk-gui
 PKGNAMESUFFIX=	-gui-gtk
-DISTFILES=	ed2k_gui-${PORTVERSION}.freebsd-stable-i386.gz
-EXTRACT_ONLY=
+DISTNAME=	ed2k-gtk-gui_0.4.0-1
 
 MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	gnet.1:${PORTSDIR}/net/gnet
 RUN_DEPENDS=	donkey:${PORTSDIR}/net/edonkey-core
 
-ONLY_FOR_ARCHS=	i386
-XFREE86_VERSION=	4
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-DOC_VERSION=	0.2.0.a.2002061600
-
-BINARY_NAME=	ed2k_gui
-DOC_FILES=	faq.html faq_german.html
-
-.ifndef(NOPORTDOCS)
-DISTFILES+=	ed2k_gui-${DOC_VERSION}.doc.tar.gz
-.endif
-
-post-extract:
-.ifndef(NOPORTDOCS)
-	@cd ${WRKSRC} && ${TAR} xzf \
-		${DISTDIR}/ed2k_gui-${DOC_VERSION}.doc.tar.gz
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
+WRKSRC=	${WRKDIR}/ed2k_gui-0.4.0
+
+post-patch:
+# CFLAGS safeness
+	@${REINPLACE_CMD} -E -e 's|-O2||' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.ifdef(NOPORTDOCS)
+	@${REINPLACE_CMD} -E -e 's|^(SUBDIRS.*)docs|\1|' \
+		${WRKSRC}/ed2k_gui/Makefile.in
 .endif
-	@${GZCAT} ${DISTDIR}/ed2k_gui-${PORTVERSION}.freebsd-stable-i386.gz \
-		> ${WRKSRC}/${BINARY_NAME}
-
-do-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} \
-		${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-.endfor
-.endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY_NAME} ${PREFIX}/bin
-	@${LN} -s ${BINARY_NAME} ${PREFIX}/bin/edonkey-gui-gtk
 
 post-install:
-	${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 450006 || ${OSVERSION} >= 500000
-BROKEN=	"only available for 4.X-STABLE (post 4.6 Release)"
-.endif
+	@${LN} -s ed2k_gui ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/edonkey-gui-gtk/distinfo b/net/edonkey-gui-gtk/distinfo
index f4e46e40d53e..c4b4971eecfd 100644
--- a/net/edonkey-gui-gtk/distinfo
+++ b/net/edonkey-gui-gtk/distinfo
@@ -1,2 +1 @@
-MD5 (ed2k_gui-0.2.0.a.2002080400.freebsd-stable-i386.gz) = 4d62b772e80eacb02b204aaf9578bd9c
-MD5 (ed2k_gui-0.2.0.a.2002061600.doc.tar.gz) = 25a37a2bc514613a53443e2ab85314d6
+MD5 (ed2k-gtk-gui_0.4.0-1.tar.gz) = 8251a071e5e4dcde5bddff6a029e56a8
diff --git a/net/edonkey-gui-gtk/pkg-message b/net/edonkey-gui-gtk/pkg-message
index 3d92e94ed260..f6ef9e64df91 100644
--- a/net/edonkey-gui-gtk/pkg-message
+++ b/net/edonkey-gui-gtk/pkg-message
@@ -10,7 +10,6 @@ If it does not work for you, you can always try the Linux version
 of this port available at /usr/ports/net/linux-edonkey-gui-gtk. It
 might work.
 
-Currently, this native version is restricted to the following FreeBSD
-platforms:
-
-- i386 FreeBSD 4.x-STABLE (post 4.6R Release); OSVERSION=450006
+However, before trying the Linux version, try removing old configuration
+files. The newer versions of the eDonkey GTK GUI are incompatible
+with older configuration files.
diff --git a/net/edonkey-gui-gtk/pkg-plist b/net/edonkey-gui-gtk/pkg-plist
index 31799176b713..b629aa33b393 100644
--- a/net/edonkey-gui-gtk/pkg-plist
+++ b/net/edonkey-gui-gtk/pkg-plist
@@ -1,5 +1,127 @@
 bin/ed2k_gui
 bin/edonkey-gui-gtk
-%%PORTDOCS%%share/doc/edonkey-gui-gtk/faq.html
-%%PORTDOCS%%share/doc/edonkey-gui-gtk/faq_german.html
-%%PORTDOCS%%@dirrm share/doc/edonkey-gui-gtk
+%%PORTDOCS%%share/doc/ed2k_gui/index-1.html
+%%PORTDOCS%%share/doc/ed2k_gui/index-2.html
+%%PORTDOCS%%share/doc/ed2k_gui/index-3.html
+%%PORTDOCS%%share/doc/ed2k_gui/index-4.html
+%%PORTDOCS%%share/doc/ed2k_gui/index-5.html
+%%PORTDOCS%%share/doc/ed2k_gui/index-6.html
+%%PORTDOCS%%share/doc/ed2k_gui/index.html
+%%PORTDOCS%%share/doc/ed2k_gui/index.sgml
+share/ed2k_gui/icons/default/200more.xpm
+share/ed2k_gui/icons/default/about.xpm
+share/ed2k_gui/icons/default/app.xpm
+share/ed2k_gui/icons/default/app_alternative_1.xpm
+share/ed2k_gui/icons/default/cancel.xpm
+share/ed2k_gui/icons/default/columnhide.xpm
+share/ed2k_gui/icons/default/columnshow.xpm
+share/ed2k_gui/icons/default/connect.xpm
+share/ed2k_gui/icons/default/core.xpm
+share/ed2k_gui/icons/default/disconnect.xpm
+share/ed2k_gui/icons/default/dotblue.xpm
+share/ed2k_gui/icons/default/dotgreen.xpm
+share/ed2k_gui/icons/default/dotpurple.xpm
+share/ed2k_gui/icons/default/dotred.xpm
+share/ed2k_gui/icons/default/dotwhite.xpm
+share/ed2k_gui/icons/default/dotyellow.xpm
+share/ed2k_gui/icons/default/download.xpm
+share/ed2k_gui/icons/default/exit.xpm
+share/ed2k_gui/icons/default/extend.xpm
+share/ed2k_gui/icons/default/eyes.xpm
+share/ed2k_gui/icons/default/faq.xpm
+share/ed2k_gui/icons/default/fetch.xpm
+share/ed2k_gui/icons/default/folder.xpm
+share/ed2k_gui/icons/default/ignition.xpm
+share/ed2k_gui/icons/default/mail.xpm
+share/ed2k_gui/icons/default/mainlogo.xpm
+share/ed2k_gui/icons/default/mainlogo_notgreen.xpm
+share/ed2k_gui/icons/default/monitor.xpm
+share/ed2k_gui/icons/default/ok.xpm
+share/ed2k_gui/icons/default/onestar.xpm
+share/ed2k_gui/icons/default/optionoff.xpm
+share/ed2k_gui/icons/default/optionon.xpm
+share/ed2k_gui/icons/default/options.xpm
+share/ed2k_gui/icons/default/pause.xpm
+share/ed2k_gui/icons/default/pauseall.xpm
+share/ed2k_gui/icons/default/refresh.xpm
+share/ed2k_gui/icons/default/resume.xpm
+share/ed2k_gui/icons/default/resumeall.xpm
+share/ed2k_gui/icons/default/search.xpm
+share/ed2k_gui/icons/default/servers.xpm
+share/ed2k_gui/icons/default/skull.xpm
+share/ed2k_gui/icons/default/status.xpm
+share/ed2k_gui/icons/default/threestars.xpm
+share/ed2k_gui/icons/default/tux.xpm
+share/ed2k_gui/icons/default/twostars.xpm
+share/ed2k_gui/icons/default/updown.xpm
+share/ed2k_gui/icons/default/upload.xpm
+share/ed2k_gui/icons/default/wizard.xpm
+share/ed2k_gui/icons/default/wizard_off.xpm
+share/ed2k_gui/icons/gnome2/200more.xpm
+share/ed2k_gui/icons/gnome2/about.xpm
+share/ed2k_gui/icons/gnome2/app.xpm
+share/ed2k_gui/icons/gnome2/cancel.xpm
+share/ed2k_gui/icons/gnome2/columnhide.xpm
+share/ed2k_gui/icons/gnome2/columnshow.xpm
+share/ed2k_gui/icons/gnome2/connect.xpm
+share/ed2k_gui/icons/gnome2/core.xpm
+share/ed2k_gui/icons/gnome2/disconnect.xpm
+share/ed2k_gui/icons/gnome2/dotblue.xpm
+share/ed2k_gui/icons/gnome2/dotgreen.xpm
+share/ed2k_gui/icons/gnome2/dotpurple.xpm
+share/ed2k_gui/icons/gnome2/dotred.xpm
+share/ed2k_gui/icons/gnome2/dotwhite.xpm
+share/ed2k_gui/icons/gnome2/dotyellow.xpm
+share/ed2k_gui/icons/gnome2/download.xpm
+share/ed2k_gui/icons/gnome2/exit.xpm
+share/ed2k_gui/icons/gnome2/extend.xpm
+share/ed2k_gui/icons/gnome2/eyes.xpm
+share/ed2k_gui/icons/gnome2/faq.xpm
+share/ed2k_gui/icons/gnome2/fetch.xpm
+share/ed2k_gui/icons/gnome2/folder.xpm
+share/ed2k_gui/icons/gnome2/ignition.xpm
+share/ed2k_gui/icons/gnome2/mail.xpm
+share/ed2k_gui/icons/gnome2/mainlogo.xpm
+share/ed2k_gui/icons/gnome2/mainlogo_notgreen.xpm
+share/ed2k_gui/icons/gnome2/monitor.xpm
+share/ed2k_gui/icons/gnome2/ok.xpm
+share/ed2k_gui/icons/gnome2/onestar.xpm
+share/ed2k_gui/icons/gnome2/optionoff.xpm
+share/ed2k_gui/icons/gnome2/optionon.xpm
+share/ed2k_gui/icons/gnome2/options.xpm
+share/ed2k_gui/icons/gnome2/pause.xpm
+share/ed2k_gui/icons/gnome2/pauseall.xpm
+share/ed2k_gui/icons/gnome2/refresh.xpm
+share/ed2k_gui/icons/gnome2/resume.xpm
+share/ed2k_gui/icons/gnome2/resumeall.xpm
+share/ed2k_gui/icons/gnome2/search.xpm
+share/ed2k_gui/icons/gnome2/servers.xpm
+share/ed2k_gui/icons/gnome2/skull.xpm
+share/ed2k_gui/icons/gnome2/status.xpm
+share/ed2k_gui/icons/gnome2/threestars.xpm
+share/ed2k_gui/icons/gnome2/tux.xpm
+share/ed2k_gui/icons/gnome2/twostars.xpm
+share/ed2k_gui/icons/gnome2/updown.xpm
+share/ed2k_gui/icons/gnome2/upload.xpm
+share/ed2k_gui/icons/gnome2/wizard.xpm
+share/ed2k_gui/icons/gnome2/wizard_off.xpm
+share/locale/de/LC_MESSAGES/ed2k_gui.mo
+share/locale/es/LC_MESSAGES/ed2k_gui.mo
+share/locale/fr/LC_MESSAGES/ed2k_gui.mo
+share/locale/nl/LC_MESSAGES/ed2k_gui.mo
+share/locale/sl/LC_MESSAGES/ed2k_gui.mo
+@unexec rmdir %D/rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@dirrm share/ed2k_gui/icons/gnome2
+@dirrm share/ed2k_gui/icons/default
+@dirrm share/ed2k_gui/icons
+@dirrm share/ed2k_gui
+%%PORTDOCS%%@dirrm share/doc/ed2k_gui