5 files changed, 35 insertions, 55 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 8fc91d13efe2..ac8e5fc5ede1 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	etherape
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	0.9.0
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	petef@FreeBSD.org
+MAINTAINER=	samy@kerneled.com
 COMMENT=	A graphical network traffic visualization tool for gnome
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-USE_GNOME=	yes
+USE_GNOME=	libglade2 libgnomeui
+USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -25,15 +25,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		etherape.1
 
-CFLAGS+=	`${X11BASE}/bin/libglade-config --cflags`
-
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-	@${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 49c01e2d27ef..c125d8bb7c6a 100644
--- a/net-mgmt/etherape/distinfo
+++ b/net-mgmt/etherape/distinfo
@@ -1 +1 @@
-MD5 (etherape-0.8.2.tar.gz) = 30244b1e4d24f7e1154d789002caa1e9
+MD5 (etherape-0.9.0.tar.gz) = a712f4cb04897d1a02ce988cffbf254c
diff --git a/net-mgmt/etherape/files/patch-src::Makefile.in b/net-mgmt/etherape/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..e75803879e4e
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src::Makefile.in
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/Makefile.in.orig	Mon Jun 16 21:46:20 2003
++++ src/Makefile.in	Mon Jun 16 21:46:32 2003
+@@ -170,7 +170,7 @@
+ 
+ etherape_LDADD = $(ETHERAPE_LIBS) $(PCAP_LIBS) 
+ etherape_LDFLAGS = 
+-etherape_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++etherape_LINK = libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+ subdir = src
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/net-mgmt/etherape/pkg-descr b/net-mgmt/etherape/pkg-descr
index cd2cd85183ca..f26741ea2b51 100644
--- a/net-mgmt/etherape/pkg-descr
+++ b/net-mgmt/etherape/pkg-descr
@@ -6,6 +6,3 @@ 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 b9384986cbbc..afb6a42dc4cb 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,39 +1,20 @@
 bin/etherape
-share/etherape/services
+etc/etherape/services
+lib/locale/es/LC_MESSAGES/etherape.mo
+lib/locale/fr/LC_MESSAGES/etherape.mo
+lib/locale/nl/LC_MESSAGES/etherape.mo
+lib/locale/tr/LC_MESSAGES/etherape.mo
+share/etherape/glade/etherape.glade2
+share/etherape/glade/etherape.png
+share/etherape/glade/pause.xpm
+share/etherape/glade/play.xpm
+share/etherape/glade/stop.xpm
 share/gnome/apps/Applications/etherape.desktop
-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/help/etherape/C/authors.html
-share/gnome/help/etherape/C/bugs.html
-share/gnome/help/etherape/C/docbook.css
-share/gnome/help/etherape/C/index.html
-share/gnome/help/etherape/C/license.html
-share/gnome/help/etherape/C/ln7.html
-share/gnome/help/etherape/C/prefs.html
-share/gnome/help/etherape/C/stylesheet-images/caution.gif
-share/gnome/help/etherape/C/stylesheet-images/home.gif
-share/gnome/help/etherape/C/stylesheet-images/important.gif
-share/gnome/help/etherape/C/stylesheet-images/next.gif
-share/gnome/help/etherape/C/stylesheet-images/note.gif
-share/gnome/help/etherape/C/stylesheet-images/prev.gif
-share/gnome/help/etherape/C/stylesheet-images/tip.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-blank.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-minus.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-plus.gif
-share/gnome/help/etherape/C/stylesheet-images/up.gif
-share/gnome/help/etherape/C/stylesheet-images/warning.gif
-share/gnome/help/etherape/C/topic.dat
-share/gnome/help/etherape/C/usage.html
-share/gnome/pixmaps/etherape.png
-share/locale/es/LC_MESSAGES/etherape.mo
-share/locale/fr/LC_MESSAGES/etherape.mo
-share/locale/nl/LC_MESSAGES/etherape.mo
-@dirrm share/gnome/help/etherape/C/stylesheet-images
-@dirrm share/gnome/help/etherape/C
-@dirrm share/gnome/help/etherape
-@dirrm share/gnome/etherape/glade
-@dirrm share/gnome/etherape
+share/pixmaps/etherape.png
+@dirrm share/etherape/glade
 @dirrm share/etherape
+@dirrm lib/locale/tr/LC_MESSAGES
+@dirrm lib/locale/nl/LC_MESSAGES
+@dirrm lib/locale/fr/LC_MESSAGES
+@dirrm lib/locale/es/LC_MESSAGES
+@dirrm etc/etherape