ports/168808: [PATCH] net/mtr: Convert to new options framework

[Bryan Drewery]

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

From: Bryan Drewery <bryan at shatow.net>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/168808: [PATCH] net/mtr: Convert to new options framework
Date: Thu, 07 Jun 2012 10:19:56 -0500

 This is a multi-part message in MIME format.
 --------------040504000307090504050606
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Previous patch missed the OPTIONS_DEFAULT= IPV6. Not sure if it is
 intended to have X11 as the default. I left it out of my patch.
 Attached adds IPV6 to default.
 
 --------------040504000307090504050606
 Content-Type: text/plain; charset=windows-1252;
  name="patch-net-mtr-optionsng.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-net-mtr-optionsng.txt"
 
 --- Makefile.orig	2012-06-07 10:00:33.000000000 -0500
 +++ Makefile	2012-06-07 10:16:02.000000000 -0500
 @@ -16,7 +16,8 @@
  MAINTAINER=	sunpoet at FreeBSD.org
  COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
  
 -OPTIONS=	IPV6	"Build IPv6 support" on
 +OPTIONS_DEFINE=	IPV6 X11
 +OPTIONS_DEFAULT=	IPV6
  
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 @@ -26,20 +27,18 @@
  
  .include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_IPV6)
 +.if ${PORT_OPTIONS:MIPV6}
  CONFIGURE_ARGS+=--enable-ipv6
  CATEGORIES+=	ipv6
  .else
  CONFIGURE_ARGS+=--disable-ipv6
  .endif
  
 -.if !defined(WITHOUT_X11)
 +.if ${PORT_OPTIONS:MX11}
  CONFIGURE_ARGS+=--with-gtk
 -OPTIONS+=	X11	"Build X11-enabled mtr" on
  USE_GNOME=	gtk20
  .else
  CONFIGURE_ARGS+=--without-gtk
 -OPTIONS+=	X11	"Build X11-enabled mtr" off
  PKGNAMESUFFIX=	-nox11
  .endif
  
 
 --------------040504000307090504050606--