Update to 0.88

- Use PLIST

Changes:	https://github.com/traviscross/mtr/blob/master/NEWS

4 files changed, 10 insertions, 74 deletions

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index e2cbf2e02c47..cc180fad741b 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mtr
-PORTVERSION=	0.87
+PORTVERSION=	0.88
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		LOCAL/sunpoet
@@ -23,9 +23,6 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-lncurses
 USES=		autoreconf ncurses pkgconfig
 
-PLIST_FILES=	man/man8/mtr.8.gz \
-		sbin/mtr
-
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_ENABLE=	ipv6
 X11_CONFIGURE_WITH=	gtk
@@ -33,7 +30,7 @@ X11_USE=		GNOME=gtk20
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|getopt.*$$(OBJEXT)||g; s|getopt.*[ch]||g; /getopt.*Po/d' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/mtr.c
+	@${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/ui/mtr.c
 
 post-install:
 	@${ECHO_MSG} ""
diff --git a/net/mtr/distinfo b/net/mtr/distinfo
index 6c122e0edf55..4807f7c0e4dd 100644
--- a/net/mtr/distinfo
+++ b/net/mtr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479482650
-SHA256 (mtr-0.87.tar.gz) = 193947c61d23b154c8dc03677e90e8fd912f8f18567ab76ce619b7856c4af19f
-SIZE (mtr-0.87.tar.gz) = 184645
+TIMESTAMP = 1496418328
+SHA256 (mtr-0.88.tar.gz) = 1e1fe4972cd972f9e5362226ebd16643ab763e6ece3b135b0f60c27e50e51e20
+SIZE (mtr-0.88.tar.gz) = 296225
diff --git a/net/mtr/files/patch-net.c b/net/mtr/files/patch-net.c
deleted file mode 100644
index a9143eaf54d3..000000000000
--- a/net/mtr/files/patch-net.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- net.c.orig	2016-08-01 13:07:58 UTC
-+++ net.c
-@@ -320,9 +320,11 @@ void net_send_tcp(int index)
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
--  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-+  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -437,9 +439,11 @@ void net_send_sctp(int index)
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
--  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-+  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -726,8 +730,12 @@ void net_send_query(int index) 
- 
-   /* sendto() assumes packet length includes the IPv4 header but not the 
-      IPv6 header. */
--  spacketsize = abs(packetsize)	-
--		( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
-+  spacketsize = abs(packetsize)
-+#ifdef ENABLE_IPV6
-+                - ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) )
-+#endif
-+                ;
-+
-   rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
-   if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
-     /* Try the first packet again using host byte order. */
-@@ -1529,17 +1537,17 @@ void net_reset(void) 
- 
- int net_set_interfaceaddress_udp()
- {
-+  struct sockaddr_in *  sa4;
-+  struct sockaddr_storage remote;
-+  struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
- #ifdef ENABLE_IPV6
-   struct sockaddr_storage name_struct;
-+  struct sockaddr_in6 * sa6;
-+  struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
- #else
-   struct sockaddr_in name_struct;
- #endif
--  struct sockaddr_in *  sa4;
--  struct sockaddr_in6 * sa6;
-   struct sockaddr * name = (struct sockaddr *) &name_struct;
--  struct sockaddr_storage remote;
--  struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
--  struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-   socklen_t len;
-   int s;
- 
diff --git a/net/mtr/pkg-plist b/net/mtr/pkg-plist
new file mode 100644
index 000000000000..4b0d7b258180
--- /dev/null
+++ b/net/mtr/pkg-plist
@@ -0,0 +1,5 @@
+man/man8/mtr-packet.8.gz
+man/man8/mtr.8.gz
+sbin/mtr
+sbin/mtr-packet
+share/bash-completion/completions/mtr