- Add OPTIONS to some freepascal ports. Now, we can install the external libs

  optionally.[1]
- Other tiny modifications

Suggested by:	Ales Catona <almindor__at__gmail.com> [1]
Approved by:	garga(mentor, implicit)

50 files changed, 299 insertions, 120 deletions

diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index 1262e3ed1fda..4ceee037d617 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -19,6 +19,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index dfec8a73ce0b..2978718d1373 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	archivers lang
 PKGNAMESUFFIX=	-unzip
 
@@ -14,10 +14,11 @@ COMMENT=	Free Pascal routines for unzipping zip files
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	UNZIP	"Install unzip tools"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index c3511987fc31..6f98c6be1673 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm
 
@@ -14,11 +14,11 @@ COMMENT=	Free Pascal interface to the GNU database system
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	GDBM	"Install the GNU database manager"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index e5f8e8a1021f..c74642aa9239 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-ibase
 
@@ -13,11 +13,11 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to interbase
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-LIB_DEPENDS=	fbembed.1:${PORTSDIR}/databases/firebird-client
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	IBASE	"Install Interbase/Firebird client"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index cf39e3f3e4a1..7f3dc4a27b3b 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-mysql
 
@@ -14,11 +14,10 @@ COMMENT=	Free Pascal interface to MySQL
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_MYSQL=	yes
-
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	MYSQL	"Install MySQL client"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index a38d3d2f5ece..a82f3bdfea93 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-odbc
 
@@ -13,11 +13,11 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to ODBC
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	ODBC	"Install ODBC library suite for Unix"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 925e537da868..9ccd23417652 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-oracle
 
@@ -13,12 +13,9 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to Oracle
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
 
-ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 689b12624dec..35e772b7c4e0 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
@@ -14,11 +14,10 @@ COMMENT=	Free Pascal interface to PostGreSQL
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_PGSQL=	yes
-
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	PGSQL	"Install PostgreSQL client"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 026e5a761e5b..b74b40eb6cc0 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-sqlite
 
@@ -14,10 +14,10 @@ COMMENT=	Free Pascal interface to SQLite
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-USE_SQLITE=	yes
-
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	SQLITE	"Install SQLite database engine"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index fb49bcd4e38e..cac28735d032 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-bfd
 
@@ -14,10 +14,11 @@ COMMENT=	Free Pascal interface for the GNU Binary Format description
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	LIBBFD	"Install Universal BFD library from GNU binutils"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-base/fpc-fcl/Makefile b/devel/fpc-fcl-base/fpc-fcl/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-base/fpc-fcl/Makefile
+++ b/devel/fpc-fcl-base/fpc-fcl/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl/Makefile b/devel/fpc-fcl/Makefile
index 55f4c0ae3474..19228eaa498c 100644
--- a/devel/fpc-fcl/Makefile
+++ b/devel/fpc-fcl/Makefile
@@ -33,7 +33,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/rtl ${FPCSRCDIR}/packages/base
-OPT=-CX -Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index 0f6386d451e3..10a351dac40e 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -18,6 +18,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-gconf/Makefile b/devel/fpc-gconf/Makefile
index 46fe8f159f33..f50aafdf028d 100644
--- a/devel/fpc-gconf/Makefile
+++ b/devel/fpc-gconf/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-gconf
 
@@ -18,12 +18,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	gconf
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	GCONF	"Install gconf, a configuration database system"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index a0ae91dbe8a9..60c9aeac651f 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -17,6 +17,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index 5ec31ef5d0c5..790d67d0e155 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -17,6 +17,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-fpgtk/Makefile b/graphics/fpc-fpgtk/Makefile
index 375f2d193615..4a78fff84cd4 100644
--- a/graphics/fpc-fpgtk/Makefile
+++ b/graphics/fpc-fpgtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-fpgtk
 
@@ -34,11 +34,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	gtk12
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	GTK1	"Gimp Toolkit for X11 GUI (version 1.x)"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-ggi/Makefile b/graphics/fpc-ggi/Makefile
index bc528fd0c6d6..5aa0ac65e29a 100644
--- a/graphics/fpc-ggi/Makefile
+++ b/graphics/fpc-ggi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ggi
 
@@ -14,11 +14,11 @@ COMMENT=	Free Pascal interface to libggi
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	LIBGGI	"Install ggi library"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
index 1959af0991b8..8d9de11381e0 100644
--- a/graphics/fpc-imlib/Makefile
+++ b/graphics/fpc-imlib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imlib
 
@@ -18,11 +18,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	imlib
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	IMLIB	"Install imlib graphic library"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index f98116dd4dd2..d3ed1439e078 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libgd
 
@@ -14,11 +14,11 @@ COMMENT=	Free Pascal interface to libgd for producing graphics files
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	LIBGD	"Install gd graphic library"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index 5fb6bc484aa1..d4a586307a22 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libpng
 
@@ -15,11 +15,12 @@ COMMENT=	Free Pascal interface to libpng, for reading PNG image files
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${UNITSDIR}/zlib/Package.fpc:${PORTSDIR}/devel/fpc-zlib
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	LIBPNG	"Install png library for manipulating PNG images"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index a9a3412f6beb..601993edd6cb 100644
--- a/graphics/fpc-ncurses/Makefile
+++ b/graphics/fpc-ncurses/Makefile
@@ -18,6 +18,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 821c75f14ac9..20054fff5c8f 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
@@ -15,14 +15,12 @@ COMMENT=	Free Pascal interface to the OpenGL library
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
-USE_GL=	yes
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	OPENGL	"Install opengl libraries"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index 76033512fca5..ff0963414d0c 100644
--- a/graphics/fpc-pasjpeg/Makefile
+++ b/graphics/fpc-pasjpeg/Makefile
@@ -17,6 +17,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index f5fc1f47a577..513697401931 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-svgalib
 
@@ -14,11 +14,11 @@ COMMENT=	Free Pascal interface to the SVGA graphics library
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
-LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	SVGA	"Install svgalib low level console graphics library"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index 3b6715038a44..4a1ea39bae9c 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-tcl
 
@@ -30,12 +30,12 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/postgres/Package.fpc:${PORTSDIR}/databases/fpc-postgres \
 		${UNITSDIR}/regexpr/Package.fpc:${PORTSDIR}/devel/fpc-regexpr \
 		${UNITSDIR}/sqlite/Package.fpc:${PORTSDIR}/databases/fpc-sqlite
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	TCL	"Install tool commnad language"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 8d5d9be1f77f..0da2e704603f 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -34,6 +34,5 @@ UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR} ${FPCSRCDIR}/fcl/inc
-OPT=-CX -Fu../fcl/*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 21a49995ec2a..ff75044218fe 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fpc
 PORTVERSION=	2.0.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/source-${PORTVERSION}/:source \
 		ftp://planetmirror.com/pub/fpc/dist/source-${PORTVERSION}/:source \
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 1ec3e57344cd..0cd836db2af3 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -8,6 +8,8 @@ UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_S
 UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACTUNITDIR}
+OPT=-CX
+
 
 .if !exists(${LOCALBASE}/bin/fpcmake)
 EXTRACTUNITDIR+=	fpc-bin
@@ -15,11 +17,231 @@ DISTFILES+=	${DISTNAME:S/$/.bin/}${EXTRACT_SUFX}:bin
 MAKE_ENV+=	FPCMAKE=${WRKDIR}/${PORTNAME:S/$/-bin/}/bin/fpcmake
 .endif
 
+.if ${PKGNAMESUFFIX} == "-gdbint"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ibase"
+.	if defined(WITH_IBASE)
+#LIB_DEPENDS=	fbembed.1:${PORTSDIR}/databases/firebird-client
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-mysql"
+.	if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-odbc"
+.	if defined(WITH_ODBC)
+LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-oracle"
+.	if defined(WITH_ORACLE)
+ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
+RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-postgres"
+.	if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-pasjpeg"
+HAVE_EXAMPLES=  true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-paszlib"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-regexpr"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-sqlite"
+.	if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-bfd"
+.	if defined(WITH_LIBBFD)
+RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fftw"
+.	if defined(WITH_FFTW)
+LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-forms"
+.	if defined(WITH_XFORMS)
+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fcl"
+OPT+=-Fi../ -Fu${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/units/${BUILDNAME}/*
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fpgtk"
+.	if defined(WITH_GTK1)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	gtk12
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-fv"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gconf"
+.	if defined(WITH_GCONF)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=      gconf
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gdbm"
+.	if defined(WITH_GDBM)
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ggi"
+.	if defined(WITH_LIBGGI)
+LIB_DEPENDS=	ggi:${PORTSDIR}/graphics/libggi
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gtk"
+.	if defined(WITH_GTK1)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	gtk12
+.	endif
+HAVE_EXAMPLES=	true
+OPT+=-Fu${WRKDIR}/${WRKUNITDIR}/*
+.endif
+
+.if ${PKGNAMESUFFIX} == "-gtk2"
+.	if defined(WITH_GTK2)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	gtk20
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-hash"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-imlib"
+.	if defined(WITH_IMLIB)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	imlib
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libgd"
+.	if defined(WITH_LIBGD)
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-libpng"
+.	if defined(WITH_LIBPNG)
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-ncurses"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-netdb"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-opengl"
+.	if defined(WITH_OPENGL)
+USE_GL=		yes
+LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-svgalib"
+.	if defined(WITH_SVGA)
+LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-syslog"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-tcl"
+.	if defined(WITH_TCL)
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-unzip"
+.	if defined(WITH_UNZIP)
+RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-utils"
+OPT+=-Fu../fcl/*
+.endif
+
+.if ${PKGNAMESUFFIX} == "-utmp"
+HAVE_EXAMPLES=	true
+.endif
+
+.if ${PKGNAMESUFFIX} == "-x11"
+.	if defined(WITH_X11)
+USE_XLIB=	yes
+.	endif
+.endif
+
+.if ${PKGNAMESUFFIX} == "-zvt"
+.	if defined(WITH_ZVT)
+.include <${PORTSDIR}/Mk/bsd.gnome.mk>
+USE_GNOME=	libzvt
+.	endif
+HAVE_EXAMPLES=	true
+.endif
+
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
 		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
 
 do-build:
+	@${ECHO_CMD} ${MAKE_ENV}
+	@${ECHO_CMD} ""
 	@cd ${WRKDIR}/${WRKUNITDIR} && ${GMAKE} all ${MAKE_ENV}
 
 do-install:
diff --git a/math/fpc-fftw/Makefile b/math/fpc-fftw/Makefile
index 63f65098d090..e13e3032c459 100644
--- a/math/fpc-fftw/Makefile
+++ b/math/fpc-fftw/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	math lang
 PKGNAMESUFFIX=	-fftw
 
@@ -13,10 +13,11 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the FFTW3 library
 
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	FFTW3	"Install FFTW3 library"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net/fpc-netdb/Makefile b/net/fpc-netdb/Makefile
index 8b1640bf942f..fd10d8b5077b 100644
--- a/net/fpc-netdb/Makefile
+++ b/net/fpc-netdb/Makefile
@@ -17,6 +17,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/fpc-hash/Makefile b/security/fpc-hash/Makefile
index f7dfc81f096e..8279035ab1d4 100644
--- a/security/fpc-hash/Makefile
+++ b/security/fpc-hash/Makefile
@@ -17,6 +17,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index 68b037c290a2..dfecd0747b45 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -18,6 +18,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 7be1b63d56ff..187fede243ad 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -18,6 +18,5 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-forms/Makefile b/x11-toolkits/fpc-forms/Makefile
index e93b3a37d005..02dbf5bec8cd 100644
--- a/x11-toolkits/fpc-forms/Makefile
+++ b/x11-toolkits/fpc-forms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
@@ -15,12 +15,12 @@ COMMENT=	X-Forms interface for Free Pascal
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	XFORMS	"Install xforms graphical user interface toolkit"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index f58a6878befd..0a1836442ee7 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
@@ -18,13 +18,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	gtk12
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
-OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
+
+OPTIONS=	GTK1	"Gimp Toolkit for X11 GUI (version 1.x)"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index f58a6878befd..0a1836442ee7 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
@@ -18,13 +18,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	gtk12
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
-OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
+
+OPTIONS=	GTK1	"Gimp Toolkit for X11 GUI (version 1.x)"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index dc70a04b571b..26c2deebc40c 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
@@ -15,11 +15,10 @@ COMMENT=	Free Pascal interface to the GTK2 libraries
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
 
-USE_GNOME=	gtk20
-
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	GTK2	"Gimp Toolkit for X11 GUI (version 2.x)"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index e93b3a37d005..02dbf5bec8cd 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
@@ -15,12 +15,12 @@ COMMENT=	X-Forms interface for Free Pascal
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	XFORMS	"Install xforms graphical user interface toolkit"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-zvt/Makefile b/x11-toolkits/fpc-zvt/Makefile
index d564f7d6d1fe..7fbfdcb2a2bd 100644
--- a/x11-toolkits/fpc-zvt/Makefile
+++ b/x11-toolkits/fpc-zvt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-zvt
 
@@ -19,12 +19,11 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11 \
 		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl
 
-USE_GNOME=	libzvt
-
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
-HAVE_EXAMPLES=	true
+
+OPTIONS=	ZVT	"Install library components for Zed's Virtual Terminal"	on
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 3dcf135beb6f..240e3705c17a 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11 lang
 PKGNAMESUFFIX=	-x11
 
@@ -15,10 +15,10 @@ COMMENT=	Free Pascal interface to X windows server
 BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 		fpcmake:${PORTSDIR}/lang/fpc-utils
 
-USE_XLIB=	yes
-
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	X11	"Install X libraries"	on
+
 .include "${MASTERDIR}/Makefile"