From owner-svn-ports-head@FreeBSD.ORG  Thu Oct 10 14:36:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 76E52F1A;
 Thu, 10 Oct 2013 14:36:50 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6398F20FE;
 Thu, 10 Oct 2013 14:36:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AEaoNZ070238;
 Thu, 10 Oct 2013 14:36:50 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AEaoCn070237;
 Thu, 10 Oct 2013 14:36:50 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201310101436.r9AEaoCn070237@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 10 Oct 2013 14:36:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330010 - head/net/mtr
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 14:36:50 -0000

Author: sunpoet
Date: Thu Oct 10 14:36:49 2013
New Revision: 330010
URL: http://svnweb.freebsd.org/changeset/ports/330010

Log:
  - Convert to new OPTIONS helper
  - Support STAGEDIR

Modified:
  head/net/mtr/Makefile

Modified: head/net/mtr/Makefile
==============================================================================
--- head/net/mtr/Makefile	Thu Oct 10 14:36:32 2013	(r330009)
+++ head/net/mtr/Makefile	Thu Oct 10 14:36:49 2013	(r330010)
@@ -21,31 +21,19 @@ X11_DESC=	Build X11-enabled mtr
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 
-MAN8=		mtr.8
-PLIST_FILES=	sbin/mtr
+PLIST_FILES=	man/man8/mtr.8.gz \
+		sbin/mtr
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGLIB}
-CONFIGURE_ARGS+=--with-glib
-USE_GNOME=	glib20
-.else
-CONFIGURE_ARGS+=--without-glib
-.endif
+GLIB_CONFIGURE_WITH=	glib
+GLIB_USE=		GNOME=glib20
+IPV6_CATEGORIES=	ipv6
+IPV6_CONFIGURE_ENABLE=	ipv6
+X11_CONFIGURE_WITH=	gtk
+X11_USE=		GNOME=gtk20
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--enable-ipv6
-CATEGORIES+=	ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=--with-gtk
-USE_GNOME=	gtk20
-.else
-CONFIGURE_ARGS+=--without-gtk
+.if !${PORT_OPTIONS:MX11}
 PKGNAMESUFFIX+=	-nox11
 .endif