20 files changed, 635 insertions, 16 deletions

diff --git a/x11-toolkits/fpc-forms/Makefile b/x11-toolkits/fpc-forms/Makefile
index af47ba871b22..06b68426dc47 100644
--- a/x11-toolkits/fpc-forms/Makefile
+++ b/x11-toolkits/fpc-forms/Makefile
@@ -8,12 +8,18 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	X-Forms interface for Free Pascal
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+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=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-forms/pkg-plist b/x11-toolkits/fpc-forms/pkg-plist
new file mode 100644
index 000000000000..4e73106b281f
--- /dev/null
+++ b/x11-toolkits/fpc-forms/pkg-plist
@@ -0,0 +1,70 @@
+bin/fd2pascal
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/libpxforms.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/xyplotover.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/touchbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/srs.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/sliderall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/secretinput.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushme.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pup.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/positioner.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/porsche.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objreturn.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objpos.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objinactive.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/nomail.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/newbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ndial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/multilabel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/minput.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/menu.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/longlabel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ll.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ldial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/lalign.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/invslider.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/inputall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/iconify.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/group.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/goodies.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/free1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fonts.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/flclock.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fdial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/doc2p
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/cursor.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab45.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/counter.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colbrowser.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/choice.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartstrip.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/canvas.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/butttypes.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/buttonall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserop.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/boxtype.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/borderwidth.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm2.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm1.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/arrowbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/yesno.pp
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/forms
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-gnome/Makefile b/x11-toolkits/fpc-gnome/Makefile
index 303fd3315837..725d8f6e5728 100644
--- a/x11-toolkits/fpc-gnome/Makefile
+++ b/x11-toolkits/fpc-gnome/Makefile
@@ -8,12 +8,19 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal unit to create programs for GNOME 1
 
-RUN_DEPENDS=	${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
+		${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
+		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl \
+		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gnome/pkg-plist b/x11-toolkits/fpc-gnome/pkg-plist
new file mode 100644
index 000000000000..2c342ae6b2e1
--- /dev/null
+++ b/x11-toolkits/fpc-gnome/pkg-plist
@@ -0,0 +1,15 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libart.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnome.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnomeui.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libart.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnome.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnomeui.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibart.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibgnome.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibgnomeui.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile
index 303fd3315837..725d8f6e5728 100644
--- a/x11-toolkits/fpc-gnome1/Makefile
+++ b/x11-toolkits/fpc-gnome1/Makefile
@@ -8,12 +8,19 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal unit to create programs for GNOME 1
 
-RUN_DEPENDS=	${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
+		${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
+		${UNITSDIR}/opengl/Package.fpc:${PORTSDIR}/graphics/fpc-opengl \
+		${UNITSDIR}/x11/Package.fpc:${PORTSDIR}/x11/fpc-x11
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gnome1/pkg-plist b/x11-toolkits/fpc-gnome1/pkg-plist
new file mode 100644
index 000000000000..2c342ae6b2e1
--- /dev/null
+++ b/x11-toolkits/fpc-gnome1/pkg-plist
@@ -0,0 +1,15 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libart.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnome.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnomeui.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libart.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnome.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libgnomeui.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibart.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibgnome.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome/libplibgnomeui.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index d50e38572579..f159156adeaf 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -8,13 +8,22 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the GTK libraries
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/gtk2/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk2 \
+		${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=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
+OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp
new file mode 100644
index 000000000000..dce7672da336
--- /dev/null
+++ b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp
@@ -0,0 +1,13 @@
+--- packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:26:06 2006
++++ packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:27:13 2006
+@@ -45,8 +45,8 @@
+   {$else}
+     const
+      {$ifdef FreeBSD}
+-      glibdll='glib12';
+-      {$linklib glib12}
++      glibdll='glib-12';
++      {$linklib glib-12}
+      {$else}
+      {$ifdef darwin}
+       glibdll='glib-1.2.0';
diff --git a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
new file mode 100644
index 000000000000..21cdfb10310a
--- /dev/null
+++ b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
@@ -0,0 +1,13 @@
+--- packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:22 2006
++++ packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:36 2006
+@@ -49,8 +49,8 @@
+   {$else}
+     const
+     {$ifdef FreeBSD}
+-      gtkdll='gtk12';
+-      {$linklib gtk12}
++      gtkdll='gtk-12';
++      {$linklib gtk-12}
+     {$else}
+     {$ifdef darwin}
+       {$define gtkdarwin}
diff --git a/x11-toolkits/fpc-gtk/pkg-plist b/x11-toolkits/fpc-gtk/pkg-plist
new file mode 100644
index 000000000000..f990a9cc7ecf
--- /dev/null
+++ b/x11-toolkits/fpc-gtk/pkg-plist
@@ -0,0 +1,67 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpglib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgmodule.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdkpixbuf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtkglarea.a
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut3_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut4_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_1.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_2.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut4_5.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_4.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut8_5.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut2_1.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/Makefile
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/info.xpm
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/ttt_test.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/toolbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tictactoe.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/statusbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/spinbutton.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/scribble.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/rulers.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/progressbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/pixmap.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/paned.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/notebook.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/list.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/filesel.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/entry.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/editform.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/clist.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/Makefile
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk
+%%PORTDOCS%%@dirrmtry share/examples/fpc-2.0.2
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index d50e38572579..f159156adeaf 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -8,13 +8,22 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the GTK libraries
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/gtk2/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk2 \
+		${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=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
+OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-glib_glib.pp b/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-glib_glib.pp
new file mode 100644
index 000000000000..dce7672da336
--- /dev/null
+++ b/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-glib_glib.pp
@@ -0,0 +1,13 @@
+--- packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:26:06 2006
++++ packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:27:13 2006
+@@ -45,8 +45,8 @@
+   {$else}
+     const
+      {$ifdef FreeBSD}
+-      glibdll='glib12';
+-      {$linklib glib12}
++      glibdll='glib-12';
++      {$linklib glib-12}
+      {$else}
+      {$ifdef darwin}
+       glibdll='glib-1.2.0';
diff --git a/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp b/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
new file mode 100644
index 000000000000..21cdfb10310a
--- /dev/null
+++ b/x11-toolkits/fpc-gtk1/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
@@ -0,0 +1,13 @@
+--- packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:22 2006
++++ packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:36 2006
+@@ -49,8 +49,8 @@
+   {$else}
+     const
+     {$ifdef FreeBSD}
+-      gtkdll='gtk12';
+-      {$linklib gtk12}
++      gtkdll='gtk-12';
++      {$linklib gtk-12}
+     {$else}
+     {$ifdef darwin}
+       {$define gtkdarwin}
diff --git a/x11-toolkits/fpc-gtk1/pkg-plist b/x11-toolkits/fpc-gtk1/pkg-plist
new file mode 100644
index 000000000000..f990a9cc7ecf
--- /dev/null
+++ b/x11-toolkits/fpc-gtk1/pkg-plist
@@ -0,0 +1,67 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpglib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgmodule.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdkpixbuf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtkglarea.a
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut3_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut4_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_1.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_2.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut4_5.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_3.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut6_4.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut8_5.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/tut2_1.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/Makefile
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tutorial/info.xpm
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/ttt_test.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/toolbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/tictactoe.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/statusbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/spinbutton.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/scribble.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/rulers.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/progressbar.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/pixmap.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/paned.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/notebook.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/list.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/filesel.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/entry.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/editform.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/clist.pp
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-2.0.2/gtk/Makefile
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial
+%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk
+%%PORTDOCS%%@dirrmtry share/examples/fpc-2.0.2
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index af4be57030cd..274742b8c436 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -8,13 +8,17 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the GTK2 libraries
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils
 
 USE_GNOME=	gtk20
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
new file mode 100644
index 000000000000..5466d818030f
--- /dev/null
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -0,0 +1,192 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpglib2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpatk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libppango.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2pixbuf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libplibglade2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkglext.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdkglext.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-calendar.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gtk-logo-rgb.gif
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-gimp.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-gsame.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/floppybuddy.gif
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnu-keys.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/alphatest.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-gmush.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/apple-red.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-foot.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/background.jpg
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/gnome-applets.png
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/appwindow.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/tree_store.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/textview.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/pixbufs.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/colorsel.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/button_box.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/drawingarea.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/item_factory.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/list_store.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/menus.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/editable_cells.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/sizegroup.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/dialog.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/init.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/gtk_demo.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/images.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/panes.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/stock_browser.inc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/plugin.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/main.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/helloworld2.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/helloworld.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/gears.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/scribble_simple.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/gettingstarted.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/beipiel.glade
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/simple.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/glade.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk2/Makefile
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/scribble_simple
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/plugins
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld2
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/helloworld
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtkglext
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/data
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gtk_demo
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/gettingstarted
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/tmp/wcprops
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/tmp/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/tmp/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/tmp/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/tmp
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/text-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/props
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn/prop-base
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser/.svn
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2/filechooser
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk2
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index af47ba871b22..06b68426dc47 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -8,12 +8,18 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	X-Forms interface for Free Pascal
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+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=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
new file mode 100644
index 000000000000..4e73106b281f
--- /dev/null
+++ b/x11-toolkits/fpc-xforms/pkg-plist
@@ -0,0 +1,70 @@
+bin/fd2pascal
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/xforms.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms/libpxforms.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/xyplotover.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/touchbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/srs.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/sliderall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/secretinput.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushme.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pushbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/pup.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/positioner.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/porsche.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objreturn.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objpos.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/objinactive.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/nomail.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/newbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ndial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/multilabel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/minput.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/menu.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/longlabel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ll.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/ldial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/lalign.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/invslider.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/inputall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/iconify.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/group.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/goodies.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/free1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fonts.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/flclock.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fdial.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/fbrowse.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/doc2p
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/cursor.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab45.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/crab.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/counter.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colsel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/colbrowser.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/choice.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartstrip.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/chartall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/canvas.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/butttypes.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/buttonall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserop.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/browserall.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/boxtype.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/borderwidth.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm2.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/bm1.xbm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/arrowbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/forms/yesno.pp
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/forms
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/forms
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-zvt/Makefile b/x11-toolkits/fpc-zvt/Makefile
index 8b8ed8881615..272ece3e2c26 100644
--- a/x11-toolkits/fpc-zvt/Makefile
+++ b/x11-toolkits/fpc-zvt/Makefile
@@ -8,13 +8,22 @@
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-zvt
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to Zed's Virtual Terminal
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils \
+		${UNITSDIR}/gtk/Package.fpc:${PORTSDIR}/x11-toolkits/fpc-gtk \
+		${UNITSDIR}/imlib/Package.fpc:${PORTSDIR}/graphics/fpc-imlib \
+		${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=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-zvt/pkg-plist b/x11-toolkits/fpc-zvt/pkg-plist
new file mode 100644
index 000000000000..8a3351075400
--- /dev/null
+++ b/x11-toolkits/fpc-zvt/pkg-plist
@@ -0,0 +1,14 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zvt/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zvt/libzvt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zvt/libzvt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zvt/libplibzvt.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/zvt/testzvt.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/zvt/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/zvt/Makefile
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zvt
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/zvt
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%