28 files changed, 171 insertions, 215 deletions

diff --git a/graphics/fpc-cairo/Makefile b/graphics/fpc-cairo/Makefile
index f0020ee382b7..824eec0cb6eb 100644
--- a/graphics/fpc-cairo/Makefile
+++ b/graphics/fpc-cairo/Makefile
@@ -1,15 +1,13 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-cairo
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal interface to cairo library
 
-USE_FPC=	fcl-async fcl-base fcl-image hash pasjpeg paszlib pthreads \
-		x11
+USE_FPC=	fcl-base fcl-image fcl-res pasjpeg rtl-objpas x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-cairo/pkg-plist b/graphics/fpc-cairo/pkg-plist
index 6f7afa8704f7..b1fa418972c7 100644
--- a/graphics/fpc-cairo/pkg-plist
+++ b/graphics/fpc-cairo/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/cairo.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairo.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoft.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairogobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairogobject.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/cairoxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoft.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/cairo/libpcairoxlib.a
diff --git a/graphics/fpc-graph/Makefile b/graphics/fpc-graph/Makefile
index 3100b9c05245..f53a49633c31 100644
--- a/graphics/fpc-graph/Makefile
+++ b/graphics/fpc-graph/Makefile
@@ -1,14 +1,13 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-graph
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal interface to graphical applications
 
-USE_FPC=	x11 sdl pthreads
+USE_FPC=	sdl x11 ${ARCH:Mi386:S/i386/pthreads/}
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp b/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp
new file mode 100644
index 000000000000..f40b3671e659
--- /dev/null
+++ b/graphics/fpc-graph/files/patch-packages_graph_fpmake.pp
@@ -0,0 +1,67 @@
+--- packages/graph/fpmake.pp.orig	2015-11-13 21:15:29 UTC
++++ packages/graph/fpmake.pp
+@@ -26,14 +26,14 @@ begin
+     P.NeedLibC:= false;  // true for headers that indirectly link to libc? OS specific?
+ 
+     P.CPUs:=[i386,x86_64,powerpc,i8086];
+-    P.OSes:=[go32v2,win32,win64,linux,freebsd,darwin,msdos];
++    P.OSes:=[go32v2,win32,win64,linux,dragonfly,freebsd,darwin,msdos];
+ 
+-    P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,freebsd,darwin]);
++    P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,dragonfly,freebsd,darwin]);
+     P.Dependencies.Add('ptc',[win32,win64,linux]);
+ 
+     // Dependencies for ptc, due to fpcmake bug:
+     P.Dependencies.Add('fcl-base',[win32,win64,linux]);
+-    P.Dependencies.Add('x11',[freebsd,linux]); // ptc only depends on reebsd and linux on x11
++    P.Dependencies.Add('x11',[dragonfly,freebsd,linux]); // ptc only depends on reebsd and linux on x11
+     P.Dependencies.Add('hermes',[win32,win64,linux]);
+     P.Dependencies.Add('opengl',[win32,win64,linux]);
+ 
+@@ -44,15 +44,15 @@ begin
+     P.SourcePath.Add('src/go32v2',[go32v2]);
+     P.SourcePath.Add('src/msdos',[msdos]);
+     P.SourcePath.Add('src/win32',[win32,win64]);
+-    P.SourcePath.Add('src/unix',[freebsd,linux]);  // Darwin has own.
++    P.SourcePath.Add('src/unix',[dragonfly,freebsd,linux]);  // Darwin has own.
+ 
+     P.IncludePath.Add('src/inc');
+     P.IncludePath.Add('src/go32v2',[go32v2]);
+     P.IncludePath.Add('src/msdos',[msdos]);
+-    P.IncludePath.Add('src/unix',[freebsd,linux]);  // Darwin has own.
++    P.IncludePath.Add('src/unix',[dragonfly,freebsd,linux]);  // Darwin has own.
+     P.IncludePath.Add('src/go32v2',[go32v2]);
+ 
+-    T:=P.Targets.AddUnit('ggigraph.pp',[linux,freebsd]);
++    T:=P.Targets.AddUnit('ggigraph.pp',[linux,dragonfly,freebsd]);
+       with T.Dependencies do
+         begin
+           AddInclude('graphh.inc');
+@@ -76,10 +76,10 @@ begin
+           AddInclude('modes.inc');
+           AddInclude('fills.inc');
+           AddInclude('gtext.inc');
+-          AddInclude('graph16.inc',[freebsd,linux]);
++          AddInclude('graph16.inc',[dragonfly,freebsd,linux]);
+         end;
+     // Graph unit other targets
+-    T:=P.Targets.AddUnit('graph.pp',[go32v2,amiga,win32,win64,freebsd,msdos]);
++    T:=P.Targets.AddUnit('graph.pp',[go32v2,amiga,win32,win64,dragonfly,freebsd,msdos]);
+       with T.Dependencies do
+         begin
+           AddInclude('graphh.inc');
+@@ -90,12 +90,12 @@ begin
+           AddInclude('modes.inc');
+           AddInclude('fills.inc');
+           AddInclude('gtext.inc');
+-          AddInclude('graph16.inc',[freebsd,linux]);
++          AddInclude('graph16.inc',[dragonfly,freebsd,linux]);
+           AddInclude('vesa.inc',[go32v2,msdos]);
+           AddInclude('vesah.inc',[go32v2,msdos]);
+         end;
+ 
+-    T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,freebsd,darwin]);
++    T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,dragonfly,freebsd,darwin]);
+       with T.Dependencies do
+         begin
+           AddInclude('graphh.inc');
diff --git a/graphics/fpc-graph/pkg-plist b/graphics/fpc-graph/pkg-plist
index b98a7f64be3c..9a8c50420855 100644
--- a/graphics/fpc-graph/pkg-plist
+++ b/graphics/fpc-graph/pkg-plist
@@ -1,10 +1,7 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/graph.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.ppu
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ggigraph.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/graph.ppu
 %%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpgraph.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpggigraph.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/libpsdlgraph.a
+%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu
diff --git a/graphics/fpc-hermes/Makefile b/graphics/fpc-hermes/Makefile
index af6e8554c8da..1050ebb75d67 100644
--- a/graphics/fpc-hermes/Makefile
+++ b/graphics/fpc-hermes/Makefile
@@ -1,7 +1,6 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-hermes
 
diff --git a/graphics/fpc-hermes/files/patch-Makefile b/graphics/fpc-hermes/files/patch-Makefile
deleted file mode 100644
index 040a8e4a79fc..000000000000
--- a/graphics/fpc-hermes/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- packages/hermes/Makefile	2009-12-12 15:51:44.000000000 +0000
-+++ packages/hermes/Makefile	2010-04-22 21:52:27.000000000 +0100
-@@ -623,6 +623,7 @@
- ifeq ($(FULL_TARGET),armeb-embedded)
- override TARGET_LOADERS+=$(CPU_LOADERS)
- endif
-+override INSTALL_FPCPACKAGE=y
- ifeq ($(FULL_TARGET),i386-linux)
- override COMPILER_INCLUDEDIR+=src
- endif
diff --git a/graphics/fpc-hermes/pkg-plist b/graphics/fpc-hermes/pkg-plist
index fed3c802da09..21eb47511899 100644
--- a/graphics/fpc-hermes/pkg-plist
+++ b/graphics/fpc-hermes/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/hermes.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/libphermes.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/hermes/hermes.ppu
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 4c5100e70a22..5a64ef6e1260 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	5
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick
 
diff --git a/graphics/fpc-imagemagick/pkg-plist b/graphics/fpc-imagemagick/pkg-plist
index 159432168e96..592e2df612ed 100644
--- a/graphics/fpc-imagemagick/pkg-plist
+++ b/graphics/fpc-imagemagick/pkg-plist
@@ -1,10 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/buildim.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/imagemagick.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/buildim.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/imagemagick.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpbuildim.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpmagick_wand.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/libpimagemagick.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imagemagick/magick_wand.ppu
diff --git a/graphics/fpc-libgd/Makefile b/graphics/fpc-libgd/Makefile
index 00a1ded781ce..d128a4bf3011 100644
--- a/graphics/fpc-libgd/Makefile
+++ b/graphics/fpc-libgd/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libgd
 
diff --git a/graphics/fpc-libgd/pkg-plist b/graphics/fpc-libgd/pkg-plist
index 5dc5a65eaa5f..3a33170c602b 100644
--- a/graphics/fpc-libgd/pkg-plist
+++ b/graphics/fpc-libgd/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libgd.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/libpgd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libgd/gd.ppu
diff --git a/graphics/fpc-libpng/Makefile b/graphics/fpc-libpng/Makefile
index c2553bcdc5aa..293a945bc8f4 100644
--- a/graphics/fpc-libpng/Makefile
+++ b/graphics/fpc-libpng/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-libpng
 
diff --git a/graphics/fpc-libpng/pkg-plist b/graphics/fpc-libpng/pkg-plist
index 0b39935e9e7b..2dd7c6dc6925 100644
--- a/graphics/fpc-libpng/pkg-plist
+++ b/graphics/fpc-libpng/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libpng.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/libppng.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libpng/png.ppu
diff --git a/graphics/fpc-ncurses/Makefile b/graphics/fpc-ncurses/Makefile
index 6ec75d77e6aa..656de42ee7ab 100644
--- a/graphics/fpc-ncurses/Makefile
+++ b/graphics/fpc-ncurses/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-ncurses
 
diff --git a/graphics/fpc-ncurses/pkg-plist b/graphics/fpc-ncurses/pkg-plist
index b9aa8cc7f3d3..1ec760d5e648 100644
--- a/graphics/fpc-ncurses/pkg-plist
+++ b/graphics/fpc-ncurses/pkg-plist
@@ -1,19 +1,13 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ncurses.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/form.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ncurses.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/menu.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpform.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncurses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libppanel.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpncrt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpocrt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/libpmenu.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/ocrt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ncurses/panel.ppu
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 32c2df562405..a53457f91f26 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
diff --git a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
index 07e43aa21892..4a27d7479a78 100644
--- a/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
+++ b/graphics/fpc-opengl/files/patch-packages-opengl-src-glut.pp
@@ -1,19 +1,11 @@
---- packages/opengl/src/glut.pp	2013-03-23 01:19:14.000000000 -0500
-+++ packages/opengl/src/glut.pp	2013-03-23 01:22:47.000000000 -0500
-@@ -765,13 +765,13 @@
+--- packages/opengl/src/glut.pp.orig	2015-01-05 19:27:06.000000000 +0000
++++ packages/opengl/src/glut.pp
+@@ -768,7 +768,7 @@ initialization
    {$ifdef darwin}
    LoadGlut('/System/Library/Frameworks/GLUT.framework/GLUT');
    {$else}
 -  {$IFDEF haiku}
-+  {$if defined(haiku) or defined(freebsd)}
++  {$if defined(haiku) or defined(freebsd) or defined(dragonfly)}
    LoadGlut('libglut.so');
--  {$ELSE}
-+  {$else}
+   {$ELSE}
    {$IFNDEF MORPHOS}
-   LoadGlut('libglut.so.3');
-   {$ENDIF}
--  {$ENDIF}
-+  {$endif}
-   {$endif}
-   {$ENDIF}
- 
diff --git a/graphics/fpc-opengl/pkg-plist b/graphics/fpc-opengl/pkg-plist
index b5e2f50749be..d3a58855ebdd 100644
--- a/graphics/fpc-opengl/pkg-plist
+++ b/graphics/fpc-opengl/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/opengl.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/freeglut.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/gl.o
@@ -11,18 +11,3 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glut.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/glx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpfreeglut.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpgl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglext.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglu.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglut.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/opengl/libpglx.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/radblur.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/morph3d.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemo.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glutdemova.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/glxtest.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/freeglutdemo.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/bounce.pp
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/opengl/Makefile
diff --git a/graphics/fpc-pasjpeg/Makefile b/graphics/fpc-pasjpeg/Makefile
index 5861b71c45c3..75f18c0a58d5 100644
--- a/graphics/fpc-pasjpeg/Makefile
+++ b/graphics/fpc-pasjpeg/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-pasjpeg
 
diff --git a/graphics/fpc-pasjpeg/pkg-plist b/graphics/fpc-pasjpeg/pkg-plist
index 6efa22697888..e253b9e72a5f 100644
--- a/graphics/fpc-pasjpeg/pkg-plist
+++ b/graphics/fpc-pasjpeg/pkg-plist
@@ -1,154 +1,101 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/buildpasjpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/buildpasjpeg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pasjpeg.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jctrans.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapimin.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcapistd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccoefct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jccolor.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcdctmgr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jchuff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcinit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmainct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmarker.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcmaster.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcomapi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcparam.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcphuff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcprepct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jcsample.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapimin.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdapistd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatadst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdatasrc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcoefct.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdcolor.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdct.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jddctmgr.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdeferr.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdhuff.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdinput.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmainct.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmarker.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmaster.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdmerge.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdphuff.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdpostct.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jdsample.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jerror.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctflt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctfst.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jfdctint.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctflt.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctfst.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctint.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jidctred.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jinclude.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemmgr.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmemnobs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jmorecfg.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jpeglib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant1.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jquant2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpbuildpasjpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcapimin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcapistd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjccoefct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjccolor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcdctmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjchuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcinit.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmainct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmarker.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcmaster.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcomapi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcparam.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcphuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcprepct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjctrans.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjcsample.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapimin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdapistd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdatadst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdatasrc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdcoefct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdcolor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjddctmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdeferr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdhuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdinput.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmainct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmarker.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmaster.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdmerge.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdphuff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdpostct.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjdsample.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjerror.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctflt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctfst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjfdctint.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctflt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctfst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctint.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjidctred.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjinclude.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmemmgr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmemnobs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjmorecfg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjpeglib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant1.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjquant2.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/libpjutils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pasjpeg/jutils.ppu
diff --git a/graphics/fpc-proj4/Makefile b/graphics/fpc-proj4/Makefile
index ab45082e6132..53a04984f06c 100644
--- a/graphics/fpc-proj4/Makefile
+++ b/graphics/fpc-proj4/Makefile
@@ -1,7 +1,6 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
 
-PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-proj4
 
diff --git a/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp b/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp
new file mode 100644
index 000000000000..c8b4511155cb
--- /dev/null
+++ b/graphics/fpc-proj4/files/patch-packages_proj4_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/proj4/fpmake.pp.orig	2015-01-05 19:27:06.000000000 +0000
++++ packages/proj4/fpmake.pp
+@@ -19,7 +19,7 @@ begin
+     P.Version:='3.0.1';
+     P.SourcePath.Add('src');
+     P.IncludePath.Add('src');
+-    P.OSes := [linux];
++    P.OSes := [linux,dragonfly,freebsd];
+ 
+   T:=P.Targets.AddUnit('proj.pas');
+   with T.Dependencies do
diff --git a/graphics/fpc-proj4/pkg-plist b/graphics/fpc-proj4/pkg-plist
index 44dafcd5b241..74047a33bd44 100644
--- a/graphics/fpc-proj4/pkg-plist
+++ b/graphics/fpc-proj4/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/proj4.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/libpproj.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/proj4/proj.ppu
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index 5fea747a4566..a252569f8278 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -1,14 +1,13 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-rsvg
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal interface to librsvg2 library
 
-USE_FPC=	cairo fcl-base fcl-image gtk2 hash pasjpeg paszlib x11
+USE_FPC=	cairo fcl-base fcl-image fcl-res gtk2 pasjpeg rtl-objpas x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/^/lib/}
diff --git a/graphics/fpc-rsvg/pkg-plist b/graphics/fpc-rsvg/pkg-plist
index 8f489c4b4274..1e8204347b57 100644
--- a/graphics/fpc-rsvg/pkg-plist
+++ b/graphics/fpc-rsvg/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/rsvg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/rsvg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rsvg/libprsvg.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/rsvg.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/librsvg/rsvg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/librsvg/rsvg.ppu
diff --git a/graphics/fpc-svgalib/Makefile b/graphics/fpc-svgalib/Makefile
index 00b3003caa4a..ebd60c03d1a8 100644
--- a/graphics/fpc-svgalib/Makefile
+++ b/graphics/fpc-svgalib/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-svgalib
 
diff --git a/graphics/fpc-svgalib/pkg-plist b/graphics/fpc-svgalib/pkg-plist
index 1411f60660b0..8c585f2ece74 100644
--- a/graphics/fpc-svgalib/pkg-plist
+++ b/graphics/fpc-svgalib/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/svgalib.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/svgalib.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/vgamouse.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/svgalib.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/vgamouse.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpsvgalib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/svgalib/libpvgamouse.a