From owner-svn-ports-head@FreeBSD.ORG  Sat Dec  1 09:37:24 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9C1A5459;
 Sat,  1 Dec 2012 09:37:24 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6860B8FC13;
 Sat,  1 Dec 2012 09:37:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB19bOMw075813;
 Sat, 1 Dec 2012 09:37:24 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB19bOsf075812;
 Sat, 1 Dec 2012 09:37:24 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201212010937.qB19bOsf075812@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 1 Dec 2012 09:37:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308067 - head/games/xbill
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: Sat, 01 Dec 2012 09:37:24 -0000

Author: amdmi3
Date: Sat Dec  1 09:37:23 2012
New Revision: 308067
URL: http://svnweb.freebsd.org/changeset/ports/308067

Log:
  - OptionsNG
  - Trim header
  
  Feature safe:	yes

Modified:
  head/games/xbill/Makefile

Modified: head/games/xbill/Makefile
==============================================================================
--- head/games/xbill/Makefile	Sat Dec  1 09:07:39 2012	(r308066)
+++ head/games/xbill/Makefile	Sat Dec  1 09:37:23 2012	(r308067)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  xbill
-# Date created:			  12 September 1995
-# Whom:				  asami
-#
+# Created by: asami
 # $FreeBSD$
-#
 
 PORTNAME=	xbill
 PORTVERSION=	2.1
@@ -32,25 +27,27 @@ DESKTOP_ENTRIES="xBill" \
 		"Game;ArcadeGame;" \
 		false
 
-OPTIONS=	ATHENA	"Build with Athena widget set" off \
-		GTK	"Build with GTK widget set" on \
-		MOTIF	"Build with Motif widget set" off
+OPTIONS_SINGLE=	WIDGETSET
+OPTIONS_SINGLE_WIDGETSET=	ATHENA GTK MOTIF
+OPTIONS_DEFAULT=	GTK
+
+ATHENA_DESC=	Athena widget set
+GTK_DESC=	GTK widget set
+MOTIF_DESC=	Motif widget set
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
+.if ${PORT_OPTIONS:MATHENA}
 CONFIGURE_ARGS+=	--disable-gtk --disable-motif
 USE_XORG=	xaw xmu xt x11 sm ice
-.elif !defined(WITH_ATHENA) && defined(WITH_GTK) && !defined(WITH_MOTIF)
-CONFIGURE_ARGS+=	--disable-athena --disable-motif
-USE_GNOME=	gtk12
-USE_XORG=	sm ice
-.elif !defined(WITH_ATHENA) && !defined(WITH_GTK) && defined(WITH_MOTIF)
+.elif ${PORT_OPTIONS:MMOTIF}
 CONFIGURE_ARGS+=	--disable-athena --disable-gtk
 USE_XORG=	xt x11 sm ice xpm
 USE_MOTIF=	yes
-.else
-IGNORE=		can't be build: please rerun 'make config' and chose exactly one widget set
+.else # ${PORT_OPTIONS:MGTK}
+CONFIGURE_ARGS+=	--disable-athena --disable-motif
+USE_GNOME=	gtk12
+USE_XORG=	sm ice
 .endif
 
 post-patch: