ports/148524: net/mtr 0.79 -- RES_INIT macro conflict and unused variables on systems w/out IPv6

[Sunpoet Po-Chuan Hsieh]

The following reply was made to PR ports/148524; it has been noted by GNATS.

From: Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net>
To: bug-followup at FreeBSD.org, Jeremy Chadwick <freebsd at jdc.parodius.com>,
	Edwin Groothuis <edwin at FreeBSD.org>
Cc:  
Subject: Re: ports/148524: net/mtr 0.79 -- RES_INIT macro conflict and
 unused variables on systems w/out IPv6
Date: Tue, 13 Jul 2010 01:58:33 +0800

 Hi,
 
 The updated patch is attached.
 Thanks for Jeremy's notification to the author. :)
 
 Regards,
 Sunpoet
 
 --- mtr-0.79.patch begins here ---
 diff -ruN --exclude=CVS /usr/ports/net/mtr/Makefile /usr/ports/sunpoet/mtr/Makefile
 --- /usr/ports/net/mtr/Makefile	2010-07-12 17:57:40.000000000 +0800
 +++ /usr/ports/sunpoet/mtr/Makefile	2010-07-13 01:55:54.000000000 +0800
 @@ -7,6 +7,7 @@
  
  PORTNAME=	mtr
  PORTVERSION=	0.79
 +PORTREVISION=	1
  CATEGORIES=	net ipv6
  MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
  		http://mirrors.evolva.ro/util/mtr/ \
 diff -ruN --exclude=CVS /usr/ports/net/mtr/files/patch-dns.c /usr/ports/sunpoet/mtr/files/patch-dns.c
 --- /usr/ports/net/mtr/files/patch-dns.c	1970-01-01 08:00:00.000000000 +0800
 +++ /usr/ports/sunpoet/mtr/files/patch-dns.c	2010-07-13 01:25:41.000000000 +0800
 @@ -0,0 +1,26 @@
 +--- dns.c.orig	2010-06-07 14:58:23.000000000 +0800
 ++++ dns.c	2010-07-13 01:25:19.000000000 +0800
 +@@ -310,12 +310,12 @@
 + int use_dns = 1;
 + 
 + #ifdef res_ninit
 +-#define RES_INIT() res_ninit(&myres);
 ++#define MTR_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 RES_INIT() res_init();
 ++#define MTR_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)
 + #define myres _res
 +@@ -495,7 +495,7 @@
 +   int option,i;
 + 
 +   if (!dns) return;
 +-  RES_INIT();
 ++  MTR_RES_INIT();
 +   if (!myres.nscount) {
 +     fprintf(stderr,"No nameservers defined.\n");
 +     exit(-1);
 diff -ruN --exclude=CVS /usr/ports/net/mtr/files/patch-net.c /usr/ports/sunpoet/mtr/files/patch-net.c
 --- /usr/ports/net/mtr/files/patch-net.c	1970-01-01 08:00:00.000000000 +0800
 +++ /usr/ports/sunpoet/mtr/files/patch-net.c	2010-07-13 01:26:54.000000000 +0800
 @@ -0,0 +1,13 @@
 +--- net.c.orig	2010-06-07 14:58:25.000000000 +0800
 ++++ net.c	2010-07-13 01:26:43.000000000 +0800
 +@@ -297,8 +297,10 @@
 + 
 +   ttl = index + 1;
 + 
 ++#ifdef ENABLE_IPV6
 +   /* offset for ipv6 checksum calculation */
 +   int offset = 6;
 ++#endif
 + 
 +   if ( packetsize < MINPACKET ) packetsize = MINPACKET;
 +   if ( packetsize > MAXPACKET ) packetsize = MAXPACKET;
 --- mtr-0.79.patch ends here ---