update to 0.9.12

changes:
-added IPv6 support
-more statistics, can be exported as XML
-minor feature additions
-bugfixes

5 files changed, 10 insertions, 122 deletions

diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 8fedf734996..fa1fdd7654c 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2011/04/22 13:44:21 obache Exp $
+# $NetBSD: Makefile,v 1.59 2011/06/09 16:55:30 drochner Exp $
 
-DISTNAME=	etherape-0.9.9
-PKGREVISION=	5
+DISTNAME=	etherape-0.9.12
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
diff --git a/net/etherape/PLIST b/net/etherape/PLIST
index dc4da6be671..c9b82c9268a 100644
--- a/net/etherape/PLIST
+++ b/net/etherape/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2010/01/19 20:51:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/06/09 16:55:30 drochner Exp $
 bin/etherape
 man/man1/etherape.1
 share/applications/etherape.desktop
 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/etherape/glade/nodes.xpm
 share/examples/etherape/services
 share/gnome/help/etherape/C/etherape.xml
 share/gnome/help/etherape/C/figures/all_nodes.eps
@@ -35,7 +33,9 @@ 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/it/LC_MESSAGES/etherape.mo
 share/locale/nl/LC_MESSAGES/etherape.mo
+share/locale/sv/LC_MESSAGES/etherape.mo
 share/locale/tr/LC_MESSAGES/etherape.mo
 share/omf/etherape/etherape-C.omf
 share/pixmaps/etherape.png
diff --git a/net/etherape/distinfo b/net/etherape/distinfo
index e35b42200a2..d2bb38a9bbd 100644
--- a/net/etherape/distinfo
+++ b/net/etherape/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2010/01/19 20:51:48 drochner Exp $
+$NetBSD: distinfo,v 1.10 2011/06/09 16:55:30 drochner Exp $
 
-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 (etherape-0.9.12.tar.gz) = 8e9cc85e73e44eccb236f488111e02f418ab095d
+RMD160 (etherape-0.9.12.tar.gz) = 8ac83923c2dc9c9f82917bbb0a7bde9c1edd8d7a
+Size (etherape-0.9.12.tar.gz) = 1384124 bytes
 SHA1 (patch-aa) = 543227bdc60b172c1001bf7c0737f6230dc8e6d0
-SHA1 (patch-ab) = c3638bd0fb154b1f95be7253bb2f0fb944e8b8fb
-SHA1 (patch-ac) = 351e964ac890f6eebd3b452bc187df356a5db9b4
diff --git a/net/etherape/patches/patch-ab b/net/etherape/patches/patch-ab
deleted file mode 100644
index d9f9ab494a8..00000000000
--- a/net/etherape/patches/patch-ab
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/08/05 12:20:34 adam Exp $
-
---- src/direct_resolve.c.orig	2006-04-29 09:58:35.000000000 +0200
-+++ src/direct_resolve.c
-@@ -42,7 +42,6 @@
- #include <sys/time.h>
- #include <sys/select.h>
- #include <sys/stat.h>
--#include <sys/errno.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -72,8 +71,17 @@ extern char *sys_errlist[];
- #define strerror(errno) (((errno) >= 0 && (errno) < sys_nerr) ? sys_errlist[errno] : "unlisted error")
- #endif
- 
--/*  Hmm, it seems Irix requires this  */
--extern int errno;
-+#ifdef res_ninit
-+#define RES_INIT() res_ninit(&myres);
-+#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \
-+	res_nmkquery(&myres, a, b, c, d, e, f, g, h, i)
-+struct __res_state myres;
-+#else
-+#define myres _res
-+#define RES_INIT() res_init();
-+#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \
-+	res_mkquery(a, b, c, d, e, f, g, h, i)
-+#endif
- 
- /* Defines */
- #define HostnameLength 255	/* From RFC */
-@@ -254,15 +262,15 @@ void
- direct_open (void)
- {
-   int option, i;
--  res_init ();
--  if (!_res.nscount)
-+  RES_INIT();
-+  if (!myres.nscount)
-     {
-       fprintf (stderr, "No nameservers defined.\n");
-       exit (-1);
-     }
--  _res.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH;
--  for (i = 0; i < _res.nscount; i++)
--    _res.nsaddr_list[i].sin_family = AF_INET;
-+  myres.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH;
-+  for (i = 0; i < myres.nscount; i++)
-+    myres.nsaddr_list[i].sin_family = AF_INET;
-   resfd = socket (AF_INET, SOCK_DGRAM, 0);
-   if (resfd == -1)
-     {
-@@ -320,7 +328,7 @@ dorequest (char *s, int type, word id)
-   int buf[(MaxPacketsize / sizeof (int)) + 1];
- 
-   restell ("dorequest().");
--  r = res_mkquery (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf,
-+  r = RES_MKQUERY (QUERY, s, C_IN, type, NULL, 0, NULL, (u_char *) buf,
- 		   MaxPacketsize);
-   if (r == -1)
-     {
-@@ -329,9 +337,9 @@ dorequest (char *s, int type, word id)
-     }
-   hp = (packetheader *) buf;
-   hp->id = id;			/* htons() deliberately left out (redundant) */
--  for (i = 0; i < _res.nscount; i++)
-+  for (i = 0; i < myres.nscount; i++)
-     (void) sendto (resfd, buf, r, 0,
--		   (struct sockaddr *) &_res.nsaddr_list[i],
-+		   (struct sockaddr *) &myres.nsaddr_list[i],
- 		   sizeof (struct sockaddr));
- }
- 
-@@ -735,15 +743,15 @@ direct_ack ()
-       /* Check to see if this server is actually one we sent to */
-       if (from.sin_addr.s_addr == localhost)
- 	{
--	  for (i = 0; i < _res.nscount; i++)
--	    if ((_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || (!_res.nsaddr_list[i].sin_addr.s_addr))	/* 0.0.0.0 replies as 127.0.0.1 */
-+	  for (i = 0; i < myres.nscount; i++)
-+	    if ((myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr) || (!myres.nsaddr_list[i].sin_addr.s_addr))	/* 0.0.0.0 replies as 127.0.0.1 */
- 	      break;
- 	}
-       else
--	for (i = 0; i < _res.nscount; i++)
--	  if (_res.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
-+	for (i = 0; i < myres.nscount; i++)
-+	  if (myres.nsaddr_list[i].sin_addr.s_addr == from.sin_addr.s_addr)
- 	    break;
--      if (i == _res.nscount)
-+      if (i == myres.nscount)
- 	{
- 	  snprintf (tempstring, sizeof (tempstring),
- 		    "Resolver error: Received reply from unknown source: %s",
diff --git a/net/etherape/patches/patch-ac b/net/etherape/patches/patch-ac
deleted file mode 100644
index 001cfb956de..00000000000
--- a/net/etherape/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$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 */
- };
-