--- databases/fpc-gdbm/Makefile	(revision 314122)
+++ databases/fpc-gdbm/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	fpc-gdbm
-# 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=	databases lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	GDBM	"Install the GNU database manager"	on
+OPTIONS_DEFINE=	GDBM
+GDBM_DESC=	Install the GNU database manager
+OPTIONS_DEFAULT=	GDBM
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-ibase/Makefile	(revision 314122)
+++ databases/fpc-ibase/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal ibase Unit
-# Date created: 			9 February 2004
-# Whom: 				John Merryweather Cooper
-#
+# Created by: John Merryweather Cooper
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	databases lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	IBASE	"Install Interbase/Firebird client"	on
+OPTIONS_DEFINE=	IBASE
+IBASE_DESC=	Install Interbase/Firebird client
+OPTIONS_DEFAULT=	IBASE
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-mysql/Makefile	(revision 314122)
+++ databases/fpc-mysql/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal mysql Unit
-# Date created: 			9 February 2004
-# Whom: 				John Merryweather Cooper
-#
+# Created by: John Merryweather Cooper
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	databases lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	MYSQL	"Install MySQL client"	on
+OPTIONS_DEFINE=	MYSQL
+MYSQL_DESC=	Install MySQL client
+OPTIONS_DEFAULT=	MYSQL
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-odbc/Makefile	(revision 314122)
+++ databases/fpc-odbc/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal Compiler
-# Date created: 			8 January 2004
-# Whom: 				John Merryweather Cooper
-#
+# Created by: John Merryweather Cooper
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	databases lang
@@ -18,6 +14,7 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	ODBC	"Install ODBC library suite for Unix"	off
+OPTIONS_DEFINE=	ODBC
+ODBC_DESC=	Install ODBC library suite for Unix
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-oracle/Makefile	(revision 314122)
+++ databases/fpc-oracle/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal Compiler
-# Date created: 			28 November 2001
-# Whom: 				John Merryweather Cooper et al
-#
+# Created by: John Merryweather Cooper et al
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	databases lang
@@ -18,6 +14,7 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	ORACLE	"Install oracle client"	off
+OPTIONS_DEFINE=	ORACLE
+ORACLE_DESC=	Install oracle client
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-postgres/Makefile	(revision 314122)
+++ databases/fpc-postgres/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	Free Pascal Compiler
-# Date created: 			28 November 2001
-# Whom: 				John Merryweather Cooper et al
-#
+# Created by: John Merryweather Cooper et al
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	databases lang
@@ -18,6 +14,8 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	PGSQL	"Install PostgreSQL client"	on
+OPTIONS_DEFINE=	PGSQL
+PGSQL_DESC=	Install PostgreSQL client
+OPTIONS_DEFAULT=	PGSQL
 
 .include "${MASTERDIR}/Makefile"
--- databases/fpc-sqlite/Makefile	(revision 314122)
+++ databases/fpc-sqlite/Makefile	(working copy)
@@ -1,9 +1,5 @@ 
-# New ports collection makefile for:	fpc-sqlite
-# 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=	databases lang
@@ -18,6 +14,7 @@ 
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	SQLITE	"Install SQLite database engine"	on
+OPTIONS_DEFINE=	SQLITE
+OPTIONS_DEFAULT=	SQLITE
 
 .include "${MASTERDIR}/Makefile"