4 files changed, 57 insertions, 28 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 3caa0e91da39..1d3ff567c5f4 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	etherape
-PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTVERSION=	0.9.9
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	SF
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	A graphical network traffic visualization tool for gnome
 
-USE_GETTEXT=	yes
 USE_GNOME=	libglade2 libgnomeui gnomehack gnomeprefix
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
@@ -24,4 +22,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		etherape.1
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/etherape/distinfo b/net-mgmt/etherape/distinfo
index 208730f7148c..5e4038951ea5 100644
--- a/net-mgmt/etherape/distinfo
+++ b/net-mgmt/etherape/distinfo
@@ -1,3 +1,3 @@
-MD5 (etherape-0.9.8.tar.gz) = ca770d23b825b1a39d4c3b27efd8cbd1
-SHA256 (etherape-0.9.8.tar.gz) = 408482f9b0295d6bf6f88201cef65c35e76485a981f66fdcd12156328f690774
-SIZE (etherape-0.9.8.tar.gz) = 856379
+MD5 (etherape-0.9.9.tar.gz) = 5ac4d386284fe8ed31860656cdfefb45
+SHA256 (etherape-0.9.9.tar.gz) = 2f9b5a2fdfd62940fd20cb2d2536255337eb9b0cfd210457844cc8ac5117feec
+SIZE (etherape-0.9.9.tar.gz) = 1301421
diff --git a/net-mgmt/etherape/files/patch-src_decode_proto.c b/net-mgmt/etherape/files/patch-src_decode_proto.c
new file mode 100644
index 000000000000..118528986c22
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src_decode_proto.c
@@ -0,0 +1,11 @@
+--- src/decode_proto.c.orig	2010-04-14 16:16:43.000000000 -0300
++++ src/decode_proto.c	2010-04-14 16:17:57.000000000 -0300
+@@ -165,7 +165,7 @@
+  {"WLAN",   DLT_IEEE802_11,    LINK6,   get_wlan }, 
+  /* Wireless with radiotap header */
+  {"WLAN+RTAP",  DLT_IEEE802_11_RADIO, LINK6, get_radiotap }, 
+- {"PPI",  DLT_PPI, LINK6, get_ppi }, /* PPI encapsulation */
++ /* {"PPI",  DLT_PPI, LINK6, get_ppi }, PPI encapsulation */
+  {NULL,   0, 0 } /* terminating entry, must be last */
+ };
+ 
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index f3e170be7cf3..072a155f309c 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,35 +1,47 @@
 bin/etherape
 etc/etherape/services
 share/applications/etherape.desktop
-%%DATADIR%%/doc/etherape/C/etherape.xml
-%%DATADIR%%/doc/etherape/C/figures/appmain.png
-%%DATADIR%%/doc/etherape/C/figures/capture_file_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/color_select_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/eth_toolbar.png
-%%DATADIR%%/doc/etherape/C/figures/link_info.png
-%%DATADIR%%/doc/etherape/C/figures/node_info.png
-%%DATADIR%%/doc/etherape/C/figures/pref_colors_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_diagram_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_timings_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/proto_info.png
-%%DATADIR%%/doc/etherape/C/figures/protocol_edit_dlg.png
+share/gnome/help/etherape/C/etherape.xml
+share/gnome/help/etherape/C/figures/all_nodes.eps
+share/gnome/help/etherape/C/figures/all_nodes.png
+share/gnome/help/etherape/C/figures/appmain.eps
+share/gnome/help/etherape/C/figures/appmain.png
+share/gnome/help/etherape/C/figures/capture_file_dlg.eps
+share/gnome/help/etherape/C/figures/capture_file_dlg.png
+share/gnome/help/etherape/C/figures/color_select_dlg.eps
+share/gnome/help/etherape/C/figures/color_select_dlg.png
+share/gnome/help/etherape/C/figures/eth_toolbar.eps
+share/gnome/help/etherape/C/figures/eth_toolbar.png
+share/gnome/help/etherape/C/figures/link_info.eps
+share/gnome/help/etherape/C/figures/link_info.png
+share/gnome/help/etherape/C/figures/node_info.eps
+share/gnome/help/etherape/C/figures/node_info.png
+share/gnome/help/etherape/C/figures/pref_colors_dlg.eps
+share/gnome/help/etherape/C/figures/pref_colors_dlg.png
+share/gnome/help/etherape/C/figures/pref_diagram_dlg.eps
+share/gnome/help/etherape/C/figures/pref_diagram_dlg.png
+share/gnome/help/etherape/C/figures/pref_timings_dlg.eps
+share/gnome/help/etherape/C/figures/pref_timings_dlg.png
+share/gnome/help/etherape/C/figures/protocol_edit_dlg.eps
+share/gnome/help/etherape/C/figures/protocol_edit_dlg.png
+share/gnome/help/etherape/C/figures/proto_info.eps
+share/gnome/help/etherape/C/figures/proto_info.png
+share/omf/etherape/etherape-C.omf
+share/pixmaps/etherape.png
 %%DATADIR%%/glade/etherape.glade
 %%DATADIR%%/glade/etherape.png
 %%DATADIR%%/glade/pause.xpm
 %%DATADIR%%/glade/play.xpm
 %%DATADIR%%/glade/stop.xpm
-share/omf/etherape/etherape-C.omf
-share/pixmaps/etherape.png
-share/locale/es/LC_MESSAGES/etherape.mo
-share/locale/fr/LC_MESSAGES/etherape.mo
-share/locale/nl/LC_MESSAGES/etherape.mo
-share/locale/tr/LC_MESSAGES/etherape.mo
+%%NLS%%share/locale/es/LC_MESSAGES/etherape.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/etherape.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/etherape.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/etherape.mo
 @dirrm share/omf/etherape
+@dirrm share/gnome/help/etherape/C/figures
+@dirrm share/gnome/help/etherape/C
+@dirrm share/gnome/help/etherape
 @dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/doc/etherape/C/figures
-@dirrm %%DATADIR%%/doc/etherape/C
-@dirrm %%DATADIR%%/doc/etherape
-@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
 @dirrm etc/etherape
 @dirrmtry share/applications