From 5de6ddcb6da8db11bdd78d21c2dbb97ab9f87db8 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 30 May 2012 12:47:52 +0000
Subject: [PATCH] Convert to new options framework

---
 multimedia/mkvtoolnix/Makefile | 5 +++--
 multimedia/mpeg2codec/Makefile | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 164054f53513..dd259d0e253e 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -43,7 +43,8 @@ MAKE_JOBS_SAFE=	yes
 MANLANG=	"" ja zh_CN nl
 MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1
 
-OPTIONS=	WXGTK "build wxGTK2 based GUI" on
+OPTIONS_DEFINE=	WXGTK
+OPTIONS_DEFAULT=	WXGTK
 
 .include <bsd.port.pre.mk>
 
@@ -55,7 +56,7 @@ BROKEN=		Does not install on sparc64
 MAKE_ENV+=	V=1
 .endif
 
-.ifndef(WITHOUT_WXGTK)
+.if ${PORT_OPTIONS:MWXGTK}
 USE_WX=		2.8+
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index af0454c780ff..d712d1050ace 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -18,7 +18,8 @@ DISTNAME=	mpeg2vidcodec_v12
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	An MPEG-2 Encoder and Decoder
 
-OPTIONS=	X11 "Support for X11" on
+OPTIONS_DEFINE=	X11 DOCS
+OPTIONS_DEFAULT=	X11
 
 WRKSRC=		${WRKDIR}/mpeg2
 
@@ -38,7 +39,7 @@ PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	xext
 MAKE_ARGS+=	USE_DISP="-DDISPLAY" \
 		USE_SHMEM="-DSH_MEM" \
@@ -52,7 +53,7 @@ do-install:
 .endfor
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/par/* ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/mpeg2enc.doc ${DOCSDIR}
 .endif