--- 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@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