net-mgmt/etherape: Update to 0.9.16

A number of port changes were required due to the upstream migration
away from the Gnome2 libraries. Refer to the 0.9.16 release notes.

Changes this release:
  http://etherape.sourceforge.net/NEWS.html

8 files changed, 94 insertions, 67 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index a1eef668ec0d..257a666f20bd 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -2,23 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	etherape
-PORTVERSION=	0.9.14
+PORTVERSION=	0.9.16
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	Graphical network traffic monitor tool modeled after Etherman
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gettext gmake iconv pathfix pkgconfig
-USE_GNOME=	gnomedocutils libglade2 libgnomeui
-GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		yelp-tools>=0:textproc/yelp-tools
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpopt.so:devel/popt
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gettext gmake iconv localbase pathfix pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 libglade2 libgnomecanvas
+GNU_CONFIGURE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog FAQ NEWS README README.bugs TODO
 
diff --git a/net-mgmt/etherape/distinfo b/net-mgmt/etherape/distinfo
index bf1b64fd79ed..b5fe3fe14ef3 100644
--- a/net-mgmt/etherape/distinfo
+++ b/net-mgmt/etherape/distinfo
@@ -1,2 +1,3 @@
-SHA256 (etherape-0.9.14.tar.gz) = 7447435ef64e569d8e10b6a0525806c01f527e76ae9eed5c84821f545f357ade
-SIZE (etherape-0.9.14.tar.gz) = 1438255
+TIMESTAMP = 1520232379
+SHA256 (etherape-0.9.16.tar.gz) = 18406a4e0e194a516b06063f160d08f7d04650f6901e6cae8225d12817c685c3
+SIZE (etherape-0.9.16.tar.gz) = 1435235
diff --git a/net-mgmt/etherape/files/patch-src_diagram.c b/net-mgmt/etherape/files/patch-src_diagram.c
deleted file mode 100644
index 62acd31ecebc..000000000000
--- a/net-mgmt/etherape/files/patch-src_diagram.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/diagram.c.orig	2016-01-25 20:19:16 UTC
-+++ src/diagram.c
-@@ -21,7 +21,18 @@
- #include <config.h>
- #endif
- 
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
- 
- #include <gnome.h>
- #include <regex.h>
diff --git a/net-mgmt/etherape/files/patch-src_names_eth__resolv.c b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c
new file mode 100644
index 000000000000..2d49761e3fc0
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c
@@ -0,0 +1,46 @@
+--- src/names/eth_resolv.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/eth_resolv.c
+@@ -26,8 +26,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/ethernet.h>
+-#include <netinet/ether.h>
+ 
+ #include <glib.h>
+ 
+@@ -48,8 +49,8 @@ static int ether_tree_cmp(gconstpointer ga, gconstpoin
+   const struct ether_addr *a = ga;
+   const struct ether_addr *b = gb;
+ 
+-  return memcmp(&a->ether_addr_octet, &b->ether_addr_octet,
+-                sizeof(a->ether_addr_octet));
++  return memcmp(&a->octet, &b->octet,
++                sizeof(a->octet));
+ }
+ 
+ static void add_ether_ent(const struct ether_addr *addr, const char *hostname)
+@@ -118,7 +119,7 @@ const char *get_ether_name(const unsigned char *addr_b
+   struct ether_ent *ent;
+   size_t addrstr_size;
+ 
+-  memcpy(&addr.ether_addr_octet, addr_bytes, sizeof(addr.ether_addr_octet));
++  memcpy(&addr.octet, addr_bytes, sizeof(addr.octet));
+ 
+   ent = g_tree_lookup(ethers, &addr);
+   if (ent)
+@@ -129,9 +130,9 @@ const char *get_ether_name(const unsigned char *addr_b
+   ent = g_malloc(sizeof(*ent) + addrstr_size);
+   ent->addr = addr;
+   snprintf(ent->hostname, addrstr_size, "%02x:%02x:%02x:%02x:%02x:%02x",
+-           addr.ether_addr_octet[0], addr.ether_addr_octet[1],
+-           addr.ether_addr_octet[2], addr.ether_addr_octet[3],
+-           addr.ether_addr_octet[4], addr.ether_addr_octet[5]);
++           addr.octet[0], addr.octet[1],
++           addr.octet[2], addr.octet[3],
++           addr.octet[4], addr.octet[5]);
+   g_tree_insert(ethers, &ent->addr, ent);
+   return ent->hostname;
+ }
diff --git a/net-mgmt/etherape/files/patch-src_names.c b/net-mgmt/etherape/files/patch-src_names_names.c
index 64b6aef2e5b8..42a45c2727b2 100644
--- a/net-mgmt/etherape/files/patch-src_names.c
+++ b/net-mgmt/etherape/files/patch-src_names_names.c
@@ -1,6 +1,6 @@
---- src/names.c.orig	2014-02-02 11:30:03 UTC
-+++ src/names.c
-@@ -21,7 +21,18 @@
+--- src/names/names.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/names.c
+@@ -19,7 +19,18 @@
  #include <config.h>
  #endif
  
diff --git a/net-mgmt/etherape/files/patch-src_thread__resolve.c b/net-mgmt/etherape/files/patch-src_names_thread__resolve.c
index bc26055be7d7..f0b5a97138be 100644
--- a/net-mgmt/etherape/files/patch-src_thread__resolve.c
+++ b/net-mgmt/etherape/files/patch-src_names_thread__resolve.c
@@ -1,6 +1,6 @@
---- src/thread_resolve.c.orig	2015-06-06 07:18:29 UTC
-+++ src/thread_resolve.c
-@@ -161,6 +161,10 @@ thread_pool_routine(void *dt)
+--- src/names/thread_resolve.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/thread_resolve.c
+@@ -162,6 +162,10 @@ thread_pool_routine(void *dt)
  
        pthread_mutex_unlock(&resolvemtx);
     }
@@ -11,7 +11,7 @@
     return NULL;
  }
  
-@@ -279,9 +283,6 @@ thread_close(void)
+@@ -280,9 +284,6 @@ thread_close(void)
  {
    /* thread pool shutdown */ 
    stop_threads();
diff --git a/net-mgmt/etherape/files/patch-src_decode__proto.c b/net-mgmt/etherape/files/patch-src_stats_decode__proto.c
index 7c89891b9573..244f754f1199 100644
--- a/net-mgmt/etherape/files/patch-src_decode__proto.c
+++ b/net-mgmt/etherape/files/patch-src_stats_decode__proto.c
@@ -1,6 +1,6 @@
---- src/decode_proto.c.orig	2014-02-02 18:38:16 UTC
-+++ src/decode_proto.c
-@@ -27,6 +27,15 @@
+--- src/stats/decode_proto.c.orig	2017-03-18 16:11:42 UTC
++++ src/stats/decode_proto.c
+@@ -25,6 +25,15 @@
  #include "appdata.h"
  #include <ctype.h>
  #include <string.h>
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index 430560086d1b..cf35a4ce97c1 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -4,31 +4,31 @@ share/applications/etherape.desktop
 %%DATADIR%%/glade/etherape.glade
 %%DATADIR%%/glade/etherape.png
 %%DATADIR%%/glade/nodes.xpm
-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/help/C/etherape/figures/all_nodes.eps
+share/help/C/etherape/figures/all_nodes.png
+share/help/C/etherape/figures/appmain.eps
+share/help/C/etherape/figures/appmain.png
+share/help/C/etherape/figures/capture_file_dlg.eps
+share/help/C/etherape/figures/capture_file_dlg.png
+share/help/C/etherape/figures/color_select_dlg.eps
+share/help/C/etherape/figures/color_select_dlg.png
+share/help/C/etherape/figures/eth_toolbar.eps
+share/help/C/etherape/figures/eth_toolbar.png
+share/help/C/etherape/figures/link_info.eps
+share/help/C/etherape/figures/link_info.png
+share/help/C/etherape/figures/node_info.eps
+share/help/C/etherape/figures/node_info.png
+share/help/C/etherape/figures/pref_colors_dlg.eps
+share/help/C/etherape/figures/pref_colors_dlg.png
+share/help/C/etherape/figures/pref_diagram_dlg.eps
+share/help/C/etherape/figures/pref_diagram_dlg.png
+share/help/C/etherape/figures/pref_timings_dlg.eps
+share/help/C/etherape/figures/pref_timings_dlg.png
+share/help/C/etherape/figures/proto_info.eps
+share/help/C/etherape/figures/proto_info.png
+share/help/C/etherape/figures/protocol_edit_dlg.eps
+share/help/C/etherape/figures/protocol_edit_dlg.png
+share/help/C/etherape/index.docbook
 share/locale/de/LC_MESSAGES/etherape.mo
 share/locale/es/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
@@ -36,5 +36,4 @@ 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