--- devel/fpc-bfd/Makefile	(revision 314122)
+++ devel/fpc-bfd/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal Compiler
-# Date created: 			2006-06-05
-# Whom: 				Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	devel lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	LIBBFD	"Install Universal BFD library from GNU binutils"	on
+OPTIONS_DEFINE=	LIBBFD
+LIBBFD_DESC=	Install Universal BFD library from GNU binutils
+OPTIONS_DEFAULT=	LIBBFD
 
 .include "${MASTERDIR}/Makefile"
--- devel/fpc-dbus/Makefile	(revision 314122)
+++ devel/fpc-dbus/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	fpc-dbus
-# Date created:		2010-04-22
-# Whom:			Christopher Key <cjk32@cam.ac.uk>
-#
+# Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	devel lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	DBUS	"Install dbus library"	on
+OPTIONS_DEFINE=	DBUS
+DBUS_DESC=	Install dbus library
+OPTIONS_DEFAULT=	DBUS
 
 .include "${MASTERDIR}/Makefile"
--- devel/fpc-newt/Makefile	(revision 314122)
+++ devel/fpc-newt/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	fpc-newt
-# Date created:		2010-04-22
-# Whom:			Christopher Key <cjk32@cam.ac.uk>
-#
+# Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
-#
 
 PORTREVISION=	1
 CATEGORIES=	devel lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	NEWT   "Install newt library"     on
+OPTIONS_DEFINE=	NEWT
+NEWT_DESC=	Install newt library
+OPTIONS_DEFAULT=	NEWT
 
 .include "${MASTERDIR}/Makefile"
--- devel/fpc-sdl/Makefile	(revision 314122)
+++ devel/fpc-sdl/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	fpc-sdl
-# Date created:		2009-01-06
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTVERSION=	0
 PORTREVISION=	3
@@ -19,6 +15,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	SDL   "Install SDL library"     on
+OPTIONS_DEFINE=	SDL
+SDL_DESC=	Install SDL library
+OPTIONS_DEFAULT=	SDL
 
 .include "${MASTERDIR}/Makefile"