- Update to 2.0.4

- Add new dependencies to editors/lazarus

Approved by:	garga (mentor,implicit)

10 files changed, 100 insertions, 110 deletions

diff --git a/x11-toolkits/fpc-forms/Makefile b/x11-toolkits/fpc-forms/Makefile
index b36fda866d94..e93b3a37d005 100644
--- a/x11-toolkits/fpc-forms/Makefile
+++ b/x11-toolkits/fpc-forms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
@@ -19,7 +19,7 @@ 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/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/x11-toolkits/fpc-gnome/Makefile b/x11-toolkits/fpc-gnome/Makefile
index 50050a2f00b4..1d8a72c3ede3 100644
--- a/x11-toolkits/fpc-gnome/Makefile
+++ b/x11-toolkits/fpc-gnome/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile
index 50050a2f00b4..1d8a72c3ede3 100644
--- a/x11-toolkits/fpc-gnome1/Makefile
+++ b/x11-toolkits/fpc-gnome1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gnome
 
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index 8df9c8fa9804..f58a6878befd 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
@@ -22,14 +22,9 @@ USE_GNOME=	gtk12
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|gtk12|gtk-12|g' ${WRKDIR}/${WRKUNITDIR}/gtk/gtk.pp
-	@${REINPLACE_CMD} -e 's|glib12|glib-12|g' ${WRKDIR}/${WRKUNITDIR}/glib/glib.pp
-	@${REINPLACE_CMD} -e 's|gdk12|gdk-12|g' ${WRKDIR}/${WRKUNITDIR}/gdk/gdk.pp
-
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk/pkg-plist b/x11-toolkits/fpc-gtk/pkg-plist
index 0dd2e70bdca3..3e90a3b465d3 100644
--- a/x11-toolkits/fpc-gtk/pkg-plist
+++ b/x11-toolkits/fpc-gtk/pkg-plist
@@ -1,57 +1,57 @@
 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.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdkpixbuf.a
 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
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/clist.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/editform.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/entry.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/filesel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/list.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/notebook.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/paned.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/pixmap.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/progressbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/rulers.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/scribble.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/spinbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/statusbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tictactoe.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/toolbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/ttt_test.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/info.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut2_1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut3_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut4_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut4_5.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_2.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_4.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut8_5.pp
 @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
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk
-%%PORTDOCS%%@dirrmtry share/examples/fpc-2.0.2
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk/tutorial
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index 8df9c8fa9804..f58a6878befd 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
@@ -22,14 +22,9 @@ USE_GNOME=	gtk12
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|gtk12|gtk-12|g' ${WRKDIR}/${WRKUNITDIR}/gtk/gtk.pp
-	@${REINPLACE_CMD} -e 's|glib12|glib-12|g' ${WRKDIR}/${WRKUNITDIR}/glib/glib.pp
-	@${REINPLACE_CMD} -e 's|gdk12|gdk-12|g' ${WRKDIR}/${WRKUNITDIR}/gdk/gdk.pp
-
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk1/pkg-plist b/x11-toolkits/fpc-gtk1/pkg-plist
index 0dd2e70bdca3..3e90a3b465d3 100644
--- a/x11-toolkits/fpc-gtk1/pkg-plist
+++ b/x11-toolkits/fpc-gtk1/pkg-plist
@@ -1,57 +1,57 @@
 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.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/glib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gmodule.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdkpixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtkglarea.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgdkpixbuf.a
 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
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/clist.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/editform.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/entry.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/filesel.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/list.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/notebook.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/paned.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/pixmap.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/progressbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/rulers.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/scribble.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/spinbutton.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/statusbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tictactoe.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/toolbar.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/ttt_test.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/Makefile
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/Makefile.fpc
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/info.xpm
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut2_1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut3_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut4_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut4_5.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_1.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_2.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_3.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut6_4.pp
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gtk/tutorial/tut8_5.pp
 @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
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk
-%%PORTDOCS%%@dirrmtry share/examples/fpc-2.0.2
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk/tutorial
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 6ff08bcb075a..dc70a04b571b 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 USE_GNOME=	gtk20
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index b36fda866d94..e93b3a37d005 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-forms
 
@@ -19,7 +19,7 @@ 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/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/x11-toolkits/fpc-zvt/Makefile b/x11-toolkits/fpc-zvt/Makefile
index 82cad6d2873e..d564f7d6d1fe 100644
--- a/x11-toolkits/fpc-zvt/Makefile
+++ b/x11-toolkits/fpc-zvt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-zvt
 
@@ -23,7 +23,7 @@ USE_GNOME=	libzvt
 
 UNITSDIR=	${LOCALBASE}/lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/gnome1/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true