Index: math/fpc-fftw/Makefile
===================================================================
--- math/fpc-fftw/Makefile	(revision 314130)
+++ math/fpc-fftw/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fpc-fftw
-# Date created:		2006-09-05
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	math lang
@@ -18,6 +14,8 @@
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	FFTW3	"Install FFTW3 library"	on
+OPTIONS_DEFINE=	FFTW3
+FFTW3_DESC=	Install FFTW3 library
+OPTIONS_DEFAULT=	FFTW3
 
 .include "${MASTERDIR}/Makefile"
Index: math/fpc-gmp/Makefile
===================================================================
--- math/fpc-gmp/Makefile	(revision 314130)
+++ math/fpc-gmp/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fpc-gmp
-# Date created:		2010-04-22
-# Whom: 		Christopher Key <cjk32@cam.ac.uk>
-#
+# Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	math lang
@@ -18,6 +14,8 @@
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	GMP	"Install gmp library"	on
+OPTIONS_DEFINE=	GMP
+GMP_DESC=	Install gmp library
+OPTIONS_DEFAULT=	GMP
 
 .include "${MASTERDIR}/Makefile"