Index: head/net/mtr/Makefile
===================================================================
--- head/net/mtr/Makefile	(revision 522252)
+++ head/net/mtr/Makefile	(revision 522253)
@@ -1,45 +1,46 @@
 # Created by: Bill Fumerola <billf@chc-chimes.com>
 # $FreeBSD$
 
 PORTNAME=	mtr
 PORTVERSION=	0.93
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single network diagnostic tool
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf ncurses pkgconfig
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lncurses
 
 GH_ACCOUNT=	traviscross
 USE_GITHUB=	yes
 
 CONFLICTS_INSTALL?=	mtr-nox11
 
 OPTIONS_DEFINE=	IPV6 X11
 OPTIONS_DEFAULT=X11
 X11_DESC=	Build X11-enabled mtr
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 X11_CONFIGURE_WITH=	gtk
 X11_USE=		GNOME=gtk20
 X11_USES=		gnome
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])|${PORTVERSION}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "${PREFIX}/sbin/mtr is setuid \"root\" "
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please read about potential security issues"
 	@${ECHO_MSG} "in file ${WRKSRC}/SECURITY (not installed)"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
Index: head/net/mtr/files/patch-packet-probe.c
===================================================================
--- head/net/mtr/files/patch-packet-probe.c	(nonexistent)
+++ head/net/mtr/files/patch-packet-probe.c	(revision 522253)
@@ -0,0 +1,20 @@
+--- packet/probe.c.orig	2019-08-03 08:31:26 UTC
++++ packet/probe.c
+@@ -323,7 +323,7 @@ int find_source_addr(
+        anything to the port.
+      */
+     *sockaddr_port_offset(&dest_with_port) = htons(1);
+-    len = sockaddr_addr_size(&dest_with_port);
++    len = sockaddr_size(&dest_with_port);
+ 
+     sock = socket(destaddr->ss_family, SOCK_DGRAM, IPPROTO_UDP);
+     if (sock == -1) {
+@@ -364,7 +364,7 @@ int find_source_addr(
+        Zero the port, as we may later use this address to finding, and
+        we don't want to use the port from the socket we just created.
+      */
+-    *sockaddr_port_offset(&srcaddr) = 0;
++    *sockaddr_port_offset(srcaddr) = 0;
+ 
+     return 0;
+ }

Property changes on: head/net/mtr/files/patch-packet-probe.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/mtr/files/patch-packet-probe_unix.c
===================================================================
--- head/net/mtr/files/patch-packet-probe_unix.c	(revision 522252)
+++ head/net/mtr/files/patch-packet-probe_unix.c	(revision 522253)
@@ -1,25 +1,25 @@
 --- packet/probe_unix.c.orig	2019-08-03 08:31:26 UTC
 +++ packet/probe_unix.c
-@@ -798,6 +798,7 @@ void receive_replies_from_recv_socket(
- #endif
+@@ -795,7 +795,6 @@ void receive_replies_from_recv_socket(
+                 memcpy(&remote_addr, SO_EE_OFFENDER(ee), sizeof(remote_addr));
+             }
+         }
+-#endif
  
  #ifdef SO_PROTOCOL
-+#ifdef HAVE_LINUX_ERRQUEUE_H
          if (icmp_connrefused_received) {
-             /* using ICMP type ICMP_ECHOREPLY is not a bug, it is an
-                indication of successfully reaching dst host.
-@@ -815,11 +816,14 @@ void receive_replies_from_recv_socket(
+@@ -815,11 +814,14 @@ void receive_replies_from_recv_socket(
                      packet, packet_length, &timestamp);
          } else {
  #endif
 +#endif
              /* ICMP packets received from raw socket */
              handle_received_packet(net_state, &remote_addr, packet,
                                     packet_length, &timestamp);
  #ifdef SO_PROTOCOL
 +#ifdef HAVE_LINUX_ERRQUEUE_H
          }
 +#endif
  #endif
      }
  }