2 files changed, 23 insertions, 56 deletions

diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index cff108f41f84..b72c0cf0d8c1 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
-PKGNAMESUFFIX=	-gtk
+PKGNAMESUFFIX=	-gtk1
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal interface to the GTK libraries
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the GTK libraries
 USE_FPC=	gtk2 x11 opengl
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	GTK1	"Gimp Toolkit for X11 GUI (version 1.x)"	on
diff --git a/x11-toolkits/fpc-gtk1/pkg-plist b/x11-toolkits/fpc-gtk1/pkg-plist
index 3e90a3b465d3..af9f224d0387 100644
--- a/x11-toolkits/fpc-gtk1/pkg-plist
+++ b/x11-toolkits/fpc-gtk1/pkg-plist
@@ -1,57 +1,24 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gdk.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/gmodule.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/gtk.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/libpgtk.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtkglarea.a
-%%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
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gdk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gdk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gdkpixbuf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gdkpixbuf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/glib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/glib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gmodule.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gmodule.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gtk.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gtk.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gtkglarea.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/gtkglarea.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpgdk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpgdkpixbuf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpglib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpgmodule.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpgtk.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1/libpgtkglarea.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk1
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk/tutorial
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/gtk
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%