From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 24 07:01:12 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EC7F0106566B;
	Tue, 24 Jul 2012 07:01:12 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D44D48FC1A;
	Tue, 24 Jul 2012 07:01:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6O71CWO098889;
	Tue, 24 Jul 2012 07:01:12 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6O71CI8098887;
	Tue, 24 Jul 2012 07:01:12 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201207240701.q6O71CI8098887@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Tue, 24 Jul 2012 07:01:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301440 - head/x11/terminator
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2012 07:01:13 -0000

Author: jgh
Date: Tue Jul 24 07:01:12 2012
New Revision: 301440
URL: http://svn.freebsd.org/changeset/ports/301440

Log:
  - adopt optionsNG
  
  PR:	ports/169788
  Submitted by:	jgh@ (myself)
  Approved by:	maintainer timeout, tom@hur.st ( 14 days )

Modified:
  head/x11/terminator/Makefile   (contents, props changed)

Modified: head/x11/terminator/Makefile
==============================================================================
--- head/x11/terminator/Makefile	Tue Jul 24 05:06:43 2012	(r301439)
+++ head/x11/terminator/Makefile	Tue Jul 24 07:01:12 2012	(r301440)
@@ -17,8 +17,9 @@ COMMENT=	Multiple GNOME terminals in one
 
 LICENSE=	GPLv2
 
-OPTIONS=	NLS	"Native language support" 	on \
-		GCONF	"Use GNOME Terminal settings"	on
+OPTIONS_DEFINE=	NLS GCONF
+GCONF_DESC=	Use GNOME Terminal settings
+OPTIONS_DEFAULT=	NLS GCONF
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
@@ -31,7 +32,7 @@ WANT_GNOME=	yes
 .include <bsd.port.pre.mk>
 
 PYSETUP+=	--without-icon-cache
-.ifdef(WITHOUT_NLS)
+.if empty(PORT_OPTIONS:MNLS)
 PLIST_SUB+=	NLS="@comment "
 PYSETUP+=	--without-gettext
 .else
@@ -40,7 +41,7 @@ PLIST_SUB+=	NLS=""
 .endif
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
-.if defined(WITH_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	pygnome2
 .endif
 USE_GNOME+=	pygtk2