diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile index 91b6f5ae7938..9d43cdd3917b 100644 --- a/net-mgmt/etherape/Makefile +++ b/net-mgmt/etherape/Makefile @@ -1,40 +1,36 @@ PORTNAME= etherape -PORTVERSION= 0.9.20 -PORTREVISION= 3 +DISTVERSION= 0.9.21 CATEGORIES= net-mgmt gnome MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dnpowers@me.com COMMENT= Graphical network traffic monitor tool modeled after Etherman WWW= http://etherape.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool \ yelp-tools>=0:textproc/yelp-tools -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgoocanvas-2.0.so:graphics/goocanvas2 \ - libpopt.so:devel/popt +LIB_DEPENDS= libpopt.so:devel/popt -USES= gettext gmake gnome iconv localbase pathfix pkgconfig +USES= gettext-runtime gmake gnome iconv localbase pkgconfig USE_GNOME= atk cairo gdkpixbuf gtk30 pango GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +CONFIGURE_ARGS= pcap_CFLAGS="-I/usr/include" \ + pcap_LIBS="-lpcap" +LDFLAGS+= -L/usr/lib PORTDOCS= AUTHORS ChangeLog FAQ NEWS README README.bugs TODO -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e \ - 's|char \*argv)|char **argv)|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|__EXPORT__|__EXPORT_H__|' ${WRKSRC}/src/export.h +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +DOCS_MAKE_ARGS_OFF= SUBDIRS="src glade m4 po" +NLS_USES= gettext-tools +NLS_CONFIGURE_ENABLE= nls post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include diff --git a/net-mgmt/etherape/distinfo b/net-mgmt/etherape/distinfo index 10c36dbb1f5c..08bcb7c829cb 100644 --- a/net-mgmt/etherape/distinfo +++ b/net-mgmt/etherape/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629758699 -SHA256 (etherape-0.9.20.tar.gz) = f54b10b56397075c98a1f192e2b30817e212581b0929dd0304e15fa8eaf59f96 -SIZE (etherape-0.9.20.tar.gz) = 1480790 +TIMESTAMP = 1774976642 +SHA256 (etherape-0.9.21.tar.gz) = 49c90df3bb880d3c60dfac4444ca8fc5d68ba8f36b820ed5f877381c9a07175c +SIZE (etherape-0.9.21.tar.gz) = 1505682 diff --git a/net-mgmt/etherape/files/patch-src_names_eth__resolv.c b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c index 2d49761e3fc0..b4f8d9c5e1bb 100644 --- a/net-mgmt/etherape/files/patch-src_names_eth__resolv.c +++ b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c @@ -1,46 +1,46 @@ ---- src/names/eth_resolv.c.orig 2017-03-18 16:11:42 UTC +--- src/names/eth_resolv.c.orig 2025-09-09 13:34:51 UTC +++ src/names/eth_resolv.c @@ -26,8 +26,9 @@ #include #include +#include +#include #include -#include #include -@@ -48,8 +49,8 @@ static int ether_tree_cmp(gconstpointer ga, gconstpoin +@@ -50,8 +51,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_names.c b/net-mgmt/etherape/files/patch-src_names_names.c index 42a45c2727b2..984bd26aaae2 100644 --- a/net-mgmt/etherape/files/patch-src_names_names.c +++ b/net-mgmt/etherape/files/patch-src_names_names.c @@ -1,21 +1,21 @@ ---- src/names/names.c.orig 2017-03-18 16:11:42 UTC +--- src/names/names.c.orig 2025-09-09 13:34:51 UTC +++ src/names/names.c @@ -19,7 +19,18 @@ - #include + #include "config.h" #endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist index 63b0133cda2e..fdff06f370cc 100644 --- a/net-mgmt/etherape/pkg-plist +++ b/net-mgmt/etherape/pkg-plist @@ -1,39 +1,39 @@ bin/etherape -share/man/man1/etherape.1.gz share/applications/etherape.desktop %%DATADIR%%/glade/etherape.ui %%DATADIR%%/glade/etherape.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 -share/locale/it/LC_MESSAGES/etherape.mo -share/locale/nl/LC_MESSAGES/etherape.mo -share/locale/ru/LC_MESSAGES/etherape.mo -share/locale/sv/LC_MESSAGES/etherape.mo -share/locale/tr/LC_MESSAGES/etherape.mo +%%PORTDOCS%%share/help/C/etherape/figures/all_nodes.eps +%%PORTDOCS%%share/help/C/etherape/figures/all_nodes.png +%%PORTDOCS%%share/help/C/etherape/figures/appmain.eps +%%PORTDOCS%%share/help/C/etherape/figures/appmain.png +%%PORTDOCS%%share/help/C/etherape/figures/capture_file_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/capture_file_dlg.png +%%PORTDOCS%%share/help/C/etherape/figures/color_select_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/color_select_dlg.png +%%PORTDOCS%%share/help/C/etherape/figures/eth_toolbar.eps +%%PORTDOCS%%share/help/C/etherape/figures/eth_toolbar.png +%%PORTDOCS%%share/help/C/etherape/figures/link_info.eps +%%PORTDOCS%%share/help/C/etherape/figures/link_info.png +%%PORTDOCS%%share/help/C/etherape/figures/node_info.eps +%%PORTDOCS%%share/help/C/etherape/figures/node_info.png +%%PORTDOCS%%share/help/C/etherape/figures/pref_colors_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/pref_colors_dlg.png +%%PORTDOCS%%share/help/C/etherape/figures/pref_diagram_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/pref_diagram_dlg.png +%%PORTDOCS%%share/help/C/etherape/figures/pref_timings_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/pref_timings_dlg.png +%%PORTDOCS%%share/help/C/etherape/figures/proto_info.eps +%%PORTDOCS%%share/help/C/etherape/figures/proto_info.png +%%PORTDOCS%%share/help/C/etherape/figures/protocol_edit_dlg.eps +%%PORTDOCS%%share/help/C/etherape/figures/protocol_edit_dlg.png +%%PORTDOCS%%share/help/C/etherape/index.docbook +%%NLS%%share/locale/de/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/es/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/fr/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/it/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/nl/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/ru/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/sv/LC_MESSAGES/etherape.mo +%%NLS%%share/locale/tr/LC_MESSAGES/etherape.mo +share/man/man1/etherape.1.gz share/pixmaps/etherape.png