From eba0950b8ed2abe6196f0c95d302f55ebb6bf031 Mon Sep 17 00:00:00 2001
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Thu, 22 Nov 2012 04:51:11 +0000
Subject: [PATCH] - Use new options framework.

Feature safe:	yes
---
 cad/netgen/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 8d1edae1f940..945df6b6d77f 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -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} --with-tk=${TK_LIBDIR} --enable-jpegli
 
 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_VER}	\
 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
 		MACHINE=${MACHINE} MAKE=${GMAKE}	\
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"