From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 18 13:43:14 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 D6B9C824;
 Tue, 18 Dec 2012 13:43:13 +0000 (UTC)
 (envelope-from rene@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 F17F68FC15;
 Tue, 18 Dec 2012 13:43:12 +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 qBIDhC71053634;
 Tue, 18 Dec 2012 13:43:12 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIDhCI7053633;
 Tue, 18 Dec 2012 13:43:12 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212181343.qBIDhCI7053633@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 18 Dec 2012 13:43:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309183 - head/sysutils/thefish
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: Tue, 18 Dec 2012 13:43:14 -0000

Author: rene
Date: Tue Dec 18 13:43:12 2012
New Revision: 309183
URL: http://svnweb.freebsd.org/changeset/ports/309183

Log:
  - Convert to optionsNG
    Use OPTIONS_SINGLE to let the user choose between the GTK2 (default) or
    QT3 interface if X11 support (default) is enabled.
  - Remove explicit inclusion of ${PORT_DBDIR}/${LATEST_LINK}/options which
    crept in with the update to 0.6.1
  - Drop support for the (non-existent) NO_GUI knob.

Modified:
  head/sysutils/thefish/Makefile   (contents, props changed)

Modified: head/sysutils/thefish/Makefile
==============================================================================
--- head/sysutils/thefish/Makefile	Tue Dec 18 13:43:02 2012	(r309182)
+++ head/sysutils/thefish/Makefile	Tue Dec 18 13:43:12 2012	(r309183)
@@ -15,30 +15,25 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 WANT_GNOME=	yes
 
-OPTIONS=	CONSOLE "Disable X11 support" off \
-		GTK	"Use GTK+ for the X11 interface" on \
-		QT	"Use Qt for the X11 interface" off
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+OPTIONS_DEFINE=	X11
+OPTIONS_SINGLE=	X11
+OPTIONS_SINGLE_X11=	GTK2 QT3
+OPTIONS_DEFAULT=	X11 GTK2
 
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
+QT3_DESC=	Use Qt3 for the X11 interface
+
+.include <bsd.port.options.mk>
 
-# Honour legacy WITHOUT_X11 and NO_GUI and support new options
-.if defined(WITHOUT_X11) || defined(NO_GUI) || defined(WITH_CONSOLE)
-NO_GUI=		yes
+.if ! ${PORT_OPTIONS:MX11}
 MAKE_ENV+=	NO_GUI=yes
 .endif
 
-.if defined(WITH_GTK) || !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MGTK2}
 USE_GNOME=	gtk20
 MAKE_ENV+=	WITH_GTK=yes
 .endif
 
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MQT3}
 USE_QT_VER=	3
 MAKE_ENV+=	WITH_QT=yes
 CXXFLAGS+=	-Wall -DWITH_QT -I${LOCALBASE}/include
@@ -51,10 +46,8 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/thefish ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/thefish.1 ${PREFIX}/man/man1
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 900000
 BROKEN=		does not build
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>