21 files changed, 46 insertions, 90 deletions

diff --git a/emulators/mupen64-base/Makefile b/emulators/mupen64-base/Makefile
index 16c92d986d2f..719a627ad258 100644
--- a/emulators/mupen64-base/Makefile
+++ b/emulators/mupen64-base/Makefile
@@ -25,11 +25,12 @@ MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MUPEN64VERSION=	0.5
 FIXFILES?=	r4300/r4300.c memory/dma.c r4300/recomp.c r4300/x86/assemble.c
 
-OPTIONS?=	GTK2	"Use gtk20 instead of gtk12" off 
+OPTIONS_DEFINE=	GTK2
+GTK2_DESC=	Use gtk20 instead of gtk12
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 HAVE_GTK2=	true
 .endif
 
diff --git a/emulators/mupen64-dummyaudio/Makefile b/emulators/mupen64-dummyaudio/Makefile
index 4aac7c0d350e..540fd5825777 100644
--- a/emulators/mupen64-dummyaudio/Makefile
+++ b/emulators/mupen64-dummyaudio/Makefile
@@ -10,6 +10,6 @@ PLUGIN_NAME=	dummyaudio
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-glide/Makefile b/emulators/mupen64-glide/Makefile
index 89fb979054af..c957ef58914e 100644
--- a/emulators/mupen64-glide/Makefile
+++ b/emulators/mupen64-glide/Makefile
@@ -17,6 +17,6 @@ PLUGIN_NAME=	Glide64
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-gln64/Makefile b/emulators/mupen64-gln64/Makefile
index 639d90f2689d..226c11530a78 100644
--- a/emulators/mupen64-gln64/Makefile
+++ b/emulators/mupen64-gln64/Makefile
@@ -16,6 +16,6 @@ PLUGIN_NAME=	glN64
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-input/Makefile b/emulators/mupen64-input/Makefile
index 931f0b2d22ba..bb5674d84014 100644
--- a/emulators/mupen64-input/Makefile
+++ b/emulators/mupen64-input/Makefile
@@ -13,6 +13,6 @@ PLUGIN_NAME=	mupen64_input
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-rsp/Makefile b/emulators/mupen64-rsp/Makefile
index 7f793c87743d..886055226a6b 100644
--- a/emulators/mupen64-rsp/Makefile
+++ b/emulators/mupen64-rsp/Makefile
@@ -10,6 +10,6 @@ PLUGIN_NAME=	mupen64_hle_rsp_azimer
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-sdlaudio/Makefile b/emulators/mupen64-sdlaudio/Makefile
index 7edf4e4a050a..c0207a80073d 100644
--- a/emulators/mupen64-sdlaudio/Makefile
+++ b/emulators/mupen64-sdlaudio/Makefile
@@ -14,6 +14,6 @@ PLUGIN_NAME=	jttl_audio
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index e7e6f03cf732..d916c292f05d 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -16,6 +16,6 @@ PLUGIN_NAME=	blight_input
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-softgfx/Makefile b/emulators/mupen64-softgfx/Makefile
index 7b4bc94fd912..c34c804a1047 100644
--- a/emulators/mupen64-softgfx/Makefile
+++ b/emulators/mupen64-softgfx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64-softgfx
-# Date created:		2007-10-08
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	1
 PKGNAMESUFFIX=	-softgfx
@@ -18,6 +14,6 @@ PLUGIN_NAME=	mupen64_soft_gfx
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-sound/Makefile b/emulators/mupen64-sound/Makefile
index a4af561bd511..50662d86c78f 100644
--- a/emulators/mupen64-sound/Makefile
+++ b/emulators/mupen64-sound/Makefile
@@ -10,6 +10,6 @@ PLUGIN_NAME=	mupen64_audio
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64-tr64/Makefile b/emulators/mupen64-tr64/Makefile
index c9cfd7017e84..d61283b710fc 100644
--- a/emulators/mupen64-tr64/Makefile
+++ b/emulators/mupen64-tr64/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64-tr64
-# Date created:		2007-10-09
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTVERSION=	0.7.8
 PORTREVISION=	3
@@ -20,6 +16,6 @@ PLUGIN_NAME=	tr64gl
 
 MASTERDIR=	${.CURDIR}/../mupen64-base
 
-OPTIONS=	#
+OPTIONS_OVERRIDE=	GTK2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-audio-sdl/Makefile b/emulators/mupen64plus-audio-sdl/Makefile
index 0b473d741cc9..6ff9827bf0ba 100644
--- a/emulators/mupen64plus-audio-sdl/Makefile
+++ b/emulators/mupen64plus-audio-sdl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-audio-sdl
-# Date created:		2008-05-16
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-audio-sdl
 
@@ -13,6 +9,6 @@ USE_SDL=	sdl
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-input-sdl/Makefile b/emulators/mupen64plus-input-sdl/Makefile
index f1e32e2e0b3b..eaaed1624360 100644
--- a/emulators/mupen64plus-input-sdl/Makefile
+++ b/emulators/mupen64plus-input-sdl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-input-sdl
-# Date created:		2008-05-16
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-input-sdl
 
@@ -11,6 +7,6 @@ COMMENT=	Input plugin for Mupen64plus
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTION_DEFINE=	#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-plugins/Makefile b/emulators/mupen64plus-plugins/Makefile
index 6664ee926d22..5a1d1ea371eb 100644
--- a/emulators/mupen64plus-plugins/Makefile
+++ b/emulators/mupen64plus-plugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    mupen64plus-plugins
-# Date created:         2011-12-20
-# Whom:                 Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mupen64plus
 PORTVERSION=	1.99.4
@@ -16,28 +12,31 @@ EXTRACT_ONLY=	# empty
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT=	Third party plugins for Mupen64plus
 
-OPTIONS=	VIDEO_ARACHNOID		"Arachnoid video plugin"	on \
-		VIDEO_GLIDE64		"Glide64 video plugin"	on \
-		VIDEO_Z64		"z64 video plugin"	on \
-		RSP_Z64			"z64 RSP plugin"	on
+OPTIONS_DEFINE=	VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64
+VIDEO_ARACHNOID_DESC=	Arachnoid video plugin
+VIDEO_GLIDE64_DESC=	Glide64 video plugin
+VIDEO_Z64_DESC=	z64 video plugin
+RSP_Z64_DESC=	z64 RSP plugin
+
+OPTIONS_DEFAULT=	VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64
 
 .include <bsd.port.pre.mk>
-		
+
 # Graphics plugins
-.if defined(WITH_VIDEO_ARACHNOID)
+.if ${PORT_OPTIONS:MVIDEO_ARACHNOID}
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-arachnoid.so:${PORTSDIR}/emulators/mupen64plus-video-arachnoid
 .endif
 
-.if defined(WITH_VIDEO_GLIDE64)
+.if ${PORT_OPTIONS:MVIDEO_GLIDE64}
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64.so:${PORTSDIR}/emulators/mupen64plus-video-glide64
 .endif
 
-.if defined(WITH_VIDEO_Z64)
+.if ${PORT_OPTIONS:MVIDEO_Z64}
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-z64.so:${PORTSDIR}/emulators/mupen64plus-video-z64
 .endif
 
 # RSP plugins
-.if defined(WITH_RSP_Z64)
+.if ${PORT_OPTIONS:MRSP_Z64}
 RUN_DEPENDS+=	${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-z64.so:${PORTSDIR}/emulators/mupen64plus-rsp-z64
 .endif
 
diff --git a/emulators/mupen64plus-rsp-hle/Makefile b/emulators/mupen64plus-rsp-hle/Makefile
index 8e0d5d2e5471..2bd280e7330a 100644
--- a/emulators/mupen64plus-rsp-hle/Makefile
+++ b/emulators/mupen64plus-rsp-hle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-rsp-hle
-# Date created:		2008-05-16
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-rsp-hle
 
@@ -11,6 +7,6 @@ COMMENT=	RSP plugin for Mupen64plus
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile
index 91dcf05a6cdb..4c6950b58322 100644
--- a/emulators/mupen64plus-rsp-z64/Makefile
+++ b/emulators/mupen64plus-rsp-z64/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-rsp-z64
-# Date created:		2011-12-20
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	2
 PKGNAMESUFFIX=	-rsp-z64
@@ -18,7 +14,7 @@ USE_SDL=	#
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/emulators/mupen64plus-ui-console/Makefile b/emulators/mupen64plus-ui-console/Makefile
index 18a51ae8edc7..510aea8b43cb 100644
--- a/emulators/mupen64plus-ui-console/Makefile
+++ b/emulators/mupen64plus-ui-console/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-ui-console
-# Date created:		2010-11-28
-# Whom:			Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-ui-console
 
@@ -11,6 +7,6 @@ COMMENT=	UI for Mupen64plus
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index ded04bd40bf3..9e7c3d860916 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-video-arachnoid
-# Date created:		2011-12-20
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	2
 PKGNAMESUFFIX=	-video-arachnoid
@@ -18,7 +14,7 @@ USE_SDL=	#
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index 8b3caee2989d..ebedda1784d1 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-video-glide64
-# Date created:		2011-12-20
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	2
 PKGNAMESUFFIX=	-video-glide64
@@ -18,7 +14,7 @@ USE_SDL=	yes
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/emulators/mupen64plus-video-rice/Makefile b/emulators/mupen64plus-video-rice/Makefile
index 30c3a277b005..3c8480bc61ce 100644
--- a/emulators/mupen64plus-video-rice/Makefile
+++ b/emulators/mupen64plus-video-rice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-video-rice
-# Date created:		2008-05-16
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-video-rice
 
@@ -13,6 +9,6 @@ USE_GL=		yes
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index 750361357662..b60b0d58b5bf 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mupen64plus-video-z64
-# Date created:		2011-12-20
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	2
 PKGNAMESUFFIX=	-video-z64
@@ -18,7 +14,7 @@ USE_SDL=	yes
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
-OPTIONS=	#
+OPTIONS_DEFINE=	#
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib