5 files changed, 73 insertions, 15 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 1b8e29841958..9f42ff535913 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -6,16 +6,24 @@
 #
 
 PORTNAME=	etherape
-PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTVERSION=	0.7.8
 CATEGORIES=	net gnome
-MASTER_SITES=	http://prdownloads.sourceforge.net/etherape/ \
-		ftp://etherape.sourceforge.net/pub/etherape/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	holger@eit.uni-kl.de
+MAINTAINER=	petef@databits.net
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		gdk_pixbuf.2:${PORTSDIR}/x11/gnome
+
+GNU_CONFIGURE=	yes
 USE_GNOME=	yes
+USE_X_PREFIX=	yes
+
+MAN1=		etherape.1
 
-MAN8=		etherape.8
+post-patch:
+	@${PERL} -pi -e 's!^confdir = .*!confdir = ${PREFIX}/share/etherape!' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/etherape/distinfo b/net-mgmt/etherape/distinfo
index 720dc1e2a758..dadff37d0e62 100644
--- a/net-mgmt/etherape/distinfo
+++ b/net-mgmt/etherape/distinfo
@@ -1 +1 @@
-MD5 (etherape-0.5.7.tar.gz) = 4d59800707fb0c86c6c115c024544ba5
+MD5 (etherape-0.7.8.tar.gz) = 29f6ef56960b6fb2a9ba62b9f8ef8a4f
diff --git a/net-mgmt/etherape/files/patch-conversations.c b/net-mgmt/etherape/files/patch-conversations.c
new file mode 100644
index 000000000000..7c0673cf3983
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-conversations.c
@@ -0,0 +1,10 @@
+--- src/conversations.c.orig	Fri Jul  6 11:47:09 2001
++++ src/conversations.c	Fri Jul  6 11:47:18 2001
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include "globals.h"
+ #include "conversations.h"
diff --git a/net-mgmt/etherape/pkg-descr b/net-mgmt/etherape/pkg-descr
index 6490924d24c9..cd2cd85183ca 100644
--- a/net-mgmt/etherape/pkg-descr
+++ b/net-mgmt/etherape/pkg-descr
@@ -4,3 +4,8 @@ graphically. Hosts and links change in size with traffic. Color coded
 protocols display. It supports ethernet, fddi, ppp and slip devices. 
 It can filter traffic to be shown, and can read traffic from a
 file as well as live from the network.
+
+WWW: http://etherape.sourceforge.net/
+
+- Pete
+petef@databits.net
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index 0da0535f37b4..876de25d5984 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,11 +1,46 @@
+bin/etherape
+share/etherape/services
+share/gnome/etherape/glade/etherape.glade
+share/gnome/etherape/glade/etherape.png
+share/gnome/etherape/glade/pause.xpm
+share/gnome/etherape/glade/play.xpm
+share/gnome/etherape/glade/stop.xpm
+share/gnome/gnome/apps/Applications/etherape.desktop
+share/gnome/gnome/help/etherape/C/authors.html
+share/gnome/gnome/help/etherape/C/bugs.html
+share/gnome/gnome/help/etherape/C/docbook.css
+share/gnome/gnome/help/etherape/C/index.html
+share/gnome/gnome/help/etherape/C/license.html
+share/gnome/gnome/help/etherape/C/ln7.html
+share/gnome/gnome/help/etherape/C/prefs.html
+share/gnome/gnome/help/etherape/C/stylesheet-images/caution.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/home.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/important.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/next.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/note.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/prev.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/tip.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/toc-blank.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/toc-minus.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/toc-plus.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/up.gif
+share/gnome/gnome/help/etherape/C/stylesheet-images/warning.gif
+share/gnome/gnome/help/etherape/C/topic.dat
+share/gnome/gnome/help/etherape/C/usage.html
+share/gnome/pixmaps/etherape.png
 share/locale/es/LC_MESSAGES/etherape.mo
-share/locale/nl/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
-share/gnome/apps/Applications/etherape.desktop
-share/etherape/glade/etherape.glade
-@dirrm share/etherape/glade
+share/locale/nl/LC_MESSAGES/etherape.mo
+@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/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 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 2>/dev/null || true
+@dirrm share/gnome/gnome/help/etherape/C/stylesheet-images
+@dirrm share/gnome/gnome/help/etherape/C
+@dirrm share/gnome/gnome/help/etherape
+@dirrm share/gnome/etherape/glade
+@dirrm share/gnome/etherape
 @dirrm share/etherape
-share/pixmaps/etherape.png
-etc/etherape/services
-@dirrm etc/etherape
-sbin/etherape