6 files changed, 18 insertions, 24 deletions

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"