From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 20 19:13:15 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 CA9CE1065670;
	Thu, 20 Sep 2012 19:13:15 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DEF78FC14;
	Thu, 20 Sep 2012 19:13:15 +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 q8KJDFZn079208;
	Thu, 20 Sep 2012 19:13:15 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8KJDFDd079206;
	Thu, 20 Sep 2012 19:13:15 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201209201913.q8KJDFDd079206@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 20 Sep 2012 19:13:15 +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: r304591 - head/x11/nvidia-driver
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 20 Sep 2012 19:13:15 -0000

Author: eadler
Date: Thu Sep 20 19:13:15 2012
New Revision: 304591
URL: http://svn.freebsd.org/changeset/ports/304591

Log:
  Convert to OptionsNG
  
  Approved by:	danfe (maintainer)

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Thu Sep 20 18:25:52 2012	(r304590)
+++ head/x11/nvidia-driver/Makefile	Thu Sep 20 19:13:15 2012	(r304591)
@@ -70,11 +70,16 @@ EXTRA_PATCHES+=	${FILESDIR}/security-pat
 EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-4225
 .endif
 
-OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
-		ACPI_PM		"Enable support for ACPI Power Management" off \
-		LINUX		"Build with support for Linux compatibility" on
+OPTIONS_DEFINE=	FREEBSD_AGP ACPI_PM LINUX
+OPTIONS_DEFAULT=	LINUX
+
+FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
+ACPI_PM_DESC=		ACPI Power Management support
+LINUX_DESC=		Linux compatibility support
+
 .if ${NVVERSION} >= 1952200
-OPTIONS+=	WBINVD		"Enable heavy-weight cache-flush logic" off
+OPTIONS_DEFINE+=	WBINVD
+WBINVD_DESC=		Flush CPU caches directly with WBINVD
 .endif
 
 .include <bsd.port.pre.mk>
@@ -82,7 +87,7 @@ OPTIONS+=	WBINVD		"Enable heavy-weight c
 PLIST_SUB+=	LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 		MODULESDIR=${MODULESDIR}
 
-.if !defined(WITHOUT_LINUX)
+.if ${PORT_OPTIONS:MLINUX}
 CONFLICTS=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
 USE_LINUX=	yes
 PLIST_SUB+=	LINUX=""
@@ -116,19 +121,19 @@ post-patch: .SILENT
 		${WRKSRC}/src/nvidia_linux.c
 .endif
 # Process OPTIONS
-.if defined(WITH_FREEBSD_AGP)
+.if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-.if defined(WITH_ACPI_PM)
+.if ${PORT_OPTIONS:MACPI_PM}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-.if defined(WITHOUT_LINUX)
+.if ${PORT_OPTIONS:MLINUX}
 	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
-.if defined(WITH_WBINVD)
+.if ${PORT_OPTIONS:MWBINVD}
 	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif