4 files changed, 20 insertions, 95 deletions

diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index ec3bf7fb8917..c479676502af 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -1,14 +1,13 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal interface to the GTK2 libraries
 
-USE_FPC=	cairo fcl-base fcl-image hash pasjpeg paszlib x11
+USE_FPC=	cairo fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
index b93a4686586f..c996052dc6b3 100644
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -1,39 +1,25 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gtk2.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/buildgtk2.o
 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/pangocairo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/glib2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.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/libppangocairo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2pixbuf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2x.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2ext.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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pangocairo.ppu
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index fccb125f9bc7..e722da0ab673 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	3
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-xforms
 
@@ -19,6 +18,5 @@ XFORMS_DESC=	Install xforms graphical user interface toolkit
 OPTIONS_DEFAULT=	XFORMS
 
 XFORMS_LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
-HAVE_EXAMPLES=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-xforms/pkg-plist b/x11-toolkits/fpc-xforms/pkg-plist
index d2dcebd663b5..4798e803448e 100644
--- a/x11-toolkits/fpc-xforms/pkg-plist
+++ b/x11-toolkits/fpc-xforms/pkg-plist
@@ -1,62 +1,4 @@
 bin/fd2pascal
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/xforms.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/libpxforms.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/xyplotover.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/touchbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/srs.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/sliderall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/secretinput.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushme.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pushbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/pup.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/positioner.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/porsche.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objreturn.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objpos.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/objinactive.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/nomail.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/newbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ndial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/multilabel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/minput.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/menu.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/longlabel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ll.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/ldial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/lalign.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/invslider.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/inputall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/iconify.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/group.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/goodies.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/free1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fonts.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/flclock.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fdial.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/fbrowse.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/cursor.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab45.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/crab.xpm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/counter.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel1.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colsel.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/colbrowser.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/choice.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartstrip.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/chartall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/canvas.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/butttypes.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/buttonall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserop.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/browserall.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/boxtype.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/borderwidth.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm2.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/bm1.xbm
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/arrowbutton.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/xforms/yesno.pp
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/xforms/xforms.ppu