2 files changed, 49 insertions, 37 deletions

diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 77820d049628..3dcf135beb6f 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11 lang
 PKGNAMESUFFIX=	-x11
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 USE_XLIB=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/fpc-x11/pkg-plist b/x11/fpc-x11/pkg-plist
index e95a9be09392..41de277e0387 100644
--- a/x11/fpc-x11/pkg-plist
+++ b/x11/fpc-x11/pkg-plist
@@ -1,49 +1,61 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/cursorfont.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/cursorfont.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpcursorfont.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpkeysym.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpx.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxatom.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxcms.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxf86dga.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxf86vmode.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxi.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxinerama.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkb.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkblib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxrandr.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxrender.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxresource.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxshm.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxv.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxvlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/x.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/x.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xresource.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xcms.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xcms.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xshm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrender.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xf86dga.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xf86dga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xf86vmode.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xf86vmode.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xi.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xinerama.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xinerama.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkblib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkblib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xinerama.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xvlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/x.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrandr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrandr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrender.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrender.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xresource.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xcms.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xresource.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xshm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xrender.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/keysym.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xkblib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xatom.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xinerama.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xshm.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xutil.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xv.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xvlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxlib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxcms.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxshm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxrender.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpkeysym.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxkblib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxatom.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxinerama.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/libpxvlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11/xvlib.ppu
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/x11
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units