update to 0.9.9

too many changes to list here - our last version was from 2006

5 files changed, 62 insertions, 31 deletions

diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 61597903df4..9e6862464f7 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/01/19 20:51:48 drochner Exp $
 
-DISTNAME=	etherape-0.9.7
-PKGREVISION=	7
+DISTNAME=	etherape-0.9.9
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
@@ -23,12 +22,16 @@ EGDIR=		${PREFIX}/share/examples/etherape
 
 CONF_FILES=	${EGDIR}/services ${PKG_SYSCONFDIR}/services
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/services ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/services ${DESTDIR}${EGDIR}
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/etherape/PLIST b/net/etherape/PLIST
index 2ec98434948..dc4da6be671 100644
--- a/net/etherape/PLIST
+++ b/net/etherape/PLIST
@@ -1,25 +1,38 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:09:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/01/19 20:51:48 drochner Exp $
 bin/etherape
 man/man1/etherape.1
 share/applications/etherape.desktop
-share/etherape/doc/etherape/C/etherape.xml
-share/etherape/doc/etherape/C/figures/appmain.png
-share/etherape/doc/etherape/C/figures/capture_file_dlg.png
-share/etherape/doc/etherape/C/figures/color_select_dlg.png
-share/etherape/doc/etherape/C/figures/eth_toolbar.png
-share/etherape/doc/etherape/C/figures/link_info.png
-share/etherape/doc/etherape/C/figures/node_info.png
-share/etherape/doc/etherape/C/figures/pref_colors_dlg.png
-share/etherape/doc/etherape/C/figures/pref_diagram_dlg.png
-share/etherape/doc/etherape/C/figures/pref_timings_dlg.png
-share/etherape/doc/etherape/C/figures/proto_info.png
-share/etherape/doc/etherape/C/figures/protocol_edit_dlg.png
-share/etherape/glade/etherape.glade2
+share/etherape/glade/etherape.glade
 share/etherape/glade/etherape.png
 share/etherape/glade/pause.xpm
 share/etherape/glade/play.xpm
 share/etherape/glade/stop.xpm
 share/examples/etherape/services
+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/proto_info.eps
+share/gnome/help/etherape/C/figures/proto_info.png
+share/gnome/help/etherape/C/figures/protocol_edit_dlg.eps
+share/gnome/help/etherape/C/figures/protocol_edit_dlg.png
 share/locale/es/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
 share/locale/nl/LC_MESSAGES/etherape.mo
diff --git a/net/etherape/distinfo b/net/etherape/distinfo
index 8ebaef78dd3..e35b42200a2 100644
--- a/net/etherape/distinfo
+++ b/net/etherape/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2007/02/08 20:12:25 drochner Exp $
+$NetBSD: distinfo,v 1.9 2010/01/19 20:51:48 drochner Exp $
 
-SHA1 (etherape-0.9.7.tar.gz) = 72e5e570530a89ea962a17e55723318010e9a8e5
-RMD160 (etherape-0.9.7.tar.gz) = e2e6ade6869d9472fd862c1b1d1b11f0d11789c3
-Size (etherape-0.9.7.tar.gz) = 860868 bytes
-SHA1 (patch-aa) = 3a8f8260fb1d9d410d40d452e242e240a4750d14
+SHA1 (etherape-0.9.9.tar.gz) = 8ff818d625a0c7fed4c1d5373ec5665ee0aa9f3d
+RMD160 (etherape-0.9.9.tar.gz) = 3349dd5a89a0715608800bca08dcec837a238174
+Size (etherape-0.9.9.tar.gz) = 1301421 bytes
+SHA1 (patch-aa) = 543227bdc60b172c1001bf7c0737f6230dc8e6d0
 SHA1 (patch-ab) = c3638bd0fb154b1f95be7253bb2f0fb944e8b8fb
+SHA1 (patch-ac) = 351e964ac890f6eebd3b452bc187df356a5db9b4
diff --git a/net/etherape/patches/patch-aa b/net/etherape/patches/patch-aa
index 85af01ac943..31100a9040c 100644
--- a/net/etherape/patches/patch-aa
+++ b/net/etherape/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2006/08/05 12:20:34 adam Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/19 20:51:48 drochner Exp $
 
---- Makefile.in.orig	2006-05-14 19:18:18.000000000 +0200
+--- Makefile.in.orig	2010-01-03 23:01:06.000000000 +0000
 +++ Makefile.in
-@@ -218,7 +218,7 @@ DATADIR = .
- # ignore bogus distcheck errors caused by scrollkeeper lazyness
- distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
+@@ -278,7 +278,7 @@ SUBDIRS = src doc glade m4 po
+ # standard props
+ DATADIR = .
  man_MANS = etherape.1
 -confdir = $(sysconfdir)/etherape
 +confdir = $(sysconfdir)
  conf_DATA = \
  	services
  
-@@ -740,7 +740,7 @@ info: info-recursive
+@@ -867,7 +867,7 @@ info: info-recursive
  
  info-am:
  
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.3 2006/08/05 12:20:34 adam Exp $
 +install-data-am: install-DevelopmentDATA install-man \
  	install-pixmapsDATA
  
- install-exec-am:
+ install-dvi: install-dvi-recursive
diff --git a/net/etherape/patches/patch-ac b/net/etherape/patches/patch-ac
new file mode 100644
index 00000000000..001cfb956de
--- /dev/null
+++ b/net/etherape/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2010/01/19 20:51:48 drochner Exp $
+
+--- src/decode_proto.c.orig	2010-01-04 11:31:11.000000000 +0000
++++ src/decode_proto.c
+@@ -165,7 +165,9 @@ static linktype_data_t linktypes[] = {
+  {"WLAN",   DLT_IEEE802_11,    LINK6,   get_wlan }, 
+  /* Wireless with radiotap header */
+  {"WLAN+RTAP",  DLT_IEEE802_11_RADIO, LINK6, get_radiotap }, 
++#if 0
+  {"PPI",  DLT_PPI, LINK6, get_ppi }, /* PPI encapsulation */
++#endif
+  {NULL,   0, 0 } /* terminating entry, must be last */
+ };
+