- Add --zero-delay option

- Bump PORTREVISION

PR:		94777
Submitted by:	Ben Allen <benjamin___umn.edu>
Approved by:	maintainer timeout (39 days)

5 files changed, 51 insertions, 8 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 9294ed9d0981..5df3fab2fa69 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/etherape/files/patch-src__capture.c b/net-mgmt/etherape/files/patch-src__capture.c
new file mode 100644
index 000000000000..6fb7bcd6ac45
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src__capture.c
@@ -0,0 +1,20 @@
+--- ./src/capture.c.orig	Sun Apr  6 10:45:41 2003
++++ ./src/capture.c	Sat Apr 29 11:48:08 2006
+@@ -527,7 +527,16 @@
+   this_time.tv_usec = phdr.ts.tv_usec;
+ 
+   diff = substract_times (this_time, last_time);
+-  ms_to_next = diff.tv_sec * 1000 + diff.tv_usec / 1000;
++
++  if (pref.zero_delay)
++    {
++      ms_to_next = 0;
++    }
++  else
++    {
++      ms_to_next = diff.tv_sec * 1000 + diff.tv_usec / 1000;
++    }
++
+ 
+   last_time = this_time;
+ 
diff --git a/net-mgmt/etherape/files/patch-src__globals.h b/net-mgmt/etherape/files/patch-src__globals.h
new file mode 100644
index 000000000000..0c67aebdcf13
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src__globals.h
@@ -0,0 +1,11 @@
+--- ./src/globals.h.orig	Sun Apr  6 10:45:41 2003
++++ ./src/globals.h	Sat Apr 29 11:48:08 2006
+@@ -342,6 +342,8 @@
+   gchar *interface;		/* Network interface to listen to */
+   gchar *filter;		/* Pcap filter to be used */
+ 
++  gboolean zero_delay;         /* no delay processing tcpdump files */
++
+ }
+ pref;
+ 
diff --git a/net-mgmt/etherape/files/patch-src__main.c b/net-mgmt/etherape/files/patch-src__main.c
new file mode 100644
index 000000000000..06898039f77d
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src__main.c
@@ -0,0 +1,12 @@
+--- ./src/main.c.orig	Sun Apr  6 10:45:42 2003
++++ ./src/main.c	Sat Apr 29 11:48:08 2006
+@@ -60,6 +60,9 @@
+      N_("set the node color"), N_("color")},
+     {"text-color", 'T', POPT_ARG_STRING, &(pref.text_color), 0,
+      N_("set the text color"), N_("color")},
++    {"zero-delay", 'z', POPT_ARG_NONE, &(pref.zero_delay), 0,
++     N_("zero delay for reading capture files [cli only]"), NULL},
++
+ 
+     POPT_AUTOHELP {NULL, 0, 0, NULL, 0}
+   };
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index b9f6d97e02a8..abcac2c47158 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,10 +1,10 @@
 bin/etherape
 etc/etherape/services
-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
+%%DATADIR%%/glade/etherape.glade2
+%%DATADIR%%/glade/etherape.png
+%%DATADIR%%/glade/pause.xpm
+%%DATADIR%%/glade/play.xpm
+%%DATADIR%%/glade/stop.xpm
 share/gnome/apps/Applications/etherape.desktop
 share/gnome/help/etherape/C/topic.dat
 share/locale/es/LC_MESSAGES/etherape.mo
@@ -13,8 +13,8 @@ share/locale/nl/LC_MESSAGES/etherape.mo
 share/locale/tr/LC_MESSAGES/etherape.mo
 share/pixmaps/etherape.png
 @dirrm etc/etherape
-@dirrm share/etherape/glade
-@dirrm share/etherape
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm share/gnome/help/etherape/C/stylesheet-images
 @dirrm share/gnome/help/etherape/C
 @dirrm share/gnome/help/etherape