From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 22 04:51:11 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 D96DCB61;
 Thu, 22 Nov 2012 04:51:11 +0000 (UTC)
 (envelope-from stephen@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 A5AFE8FC12;
 Thu, 22 Nov 2012 04:51:11 +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 qAM4pBI2096366;
 Thu, 22 Nov 2012 04:51:11 GMT (envelope-from stephen@svn.freebsd.org)
Received: (from stephen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM4pBrJ096365;
 Thu, 22 Nov 2012 04:51:11 GMT (envelope-from stephen@svn.freebsd.org)
Message-Id: <201211220451.qAM4pBrJ096365@svn.freebsd.org>
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Thu, 22 Nov 2012 04:51:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307638 - head/cad/netgen
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, 22 Nov 2012 04:51:12 -0000

Author: stephen
Date: Thu Nov 22 04:51:11 2012
New Revision: 307638
URL: http://svnweb.freebsd.org/changeset/ports/307638

Log:
  - Use new options framework.
  
  Feature safe:	yes

Modified:
  head/cad/netgen/Makefile

Modified: head/cad/netgen/Makefile
==============================================================================
--- head/cad/netgen/Makefile	Thu Nov 22 04:02:13 2012	(r307637)
+++ head/cad/netgen/Makefile	Thu Nov 22 04:51:11 2012	(r307638)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  netgen
-# Date created:               29 April 2004
-# Whom:                       Thierry Thomas <thierry@FreeBSD.org>
-#
+# Created by: Thierry Thomas <thierry@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	netgen
 PORTVERSION=	4.9.13
@@ -31,18 +27,20 @@ CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR
 
 FETCH_BEFORE_ARGS+=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
-OPTIONS=	OCC	"Compile with OpenCascade geometry kernel" 	on \
-		FFMPEG  "video recording with FFmpeg"		off
+OPTIONS_DEFINE=	OCC FFMPEG
+OCC_DESC=	Compile with OpenCascade geometry kernel
+FFMPEG_DESC=	video recording with FFmpeg
+OPTIONS_DEFAULTS=	OCC
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OCC)
+.if ${PORT_OPTIONS:MOCC}
 LIB_DEPENDS+=	TKernel.0:${PORTSDIR}/cad/opencascade
 CXXFLAGS+=	-DOCCGEOMETRY -DOCC63 -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/OpenCAS/ros/inc
 CONFIGURE_ARGS+=	--enable-occ
 .endif
 
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-ffmpeg
 .endif
@@ -56,6 +54,7 @@ MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL
 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
 		MACHINE=${MACHINE} MAKE=${GMAKE}	\
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"